Merge pull request #1085 from HDRUK/dev

Dev to Release GAT 2500

Chart.yaml

@@ -1 +1 @@
-v5.0.5
+v5.0.6

src/resources/message/message.controller.js

@@ -131,16 +131,25 @@ module.exports = {
 							[constants.teamNotificationTypes.DATAACCESSREQUEST]
 						);
 						if (!_.isEmpty(subscribedMembersByType)) {
+
 							// build cleaner array of memberIds from subscribedMembersByType
 							if (topicObj.topicMessages !== undefined) {
-								const memberIds = [...subscribedMembersByType.map(m => m.memberid.toString()), ...topicObj.createdBy._id.toString()];
+								const memberIds = [...subscribedMembersByType.map(m => {
+									if (m.roles.includes('custodian.dar.manager')) {
+										return m.memberid.toString();
+									}
+								}), ...topicObj.createdBy._id.toString()].filter(elem => elem);
 								// returns array of objects [{email: '[email protected] '}] for members in subscribed emails users is list of full user object
 								const { memberEmails } = teamController.getMemberDetails([...memberIds], [...messageRecipients]);
 								messageRecipients = [...teamNotificationEmails, ...memberEmails];
 							} else {
-								const memberIds = [...subscribedMembersByType.map(m => m.memberid.toString())].filter(
+								const memberIds = [...subscribedMembersByType.map(m => {
+									if (m.roles.includes('custodian.dar.manager')) {
+										return m.memberid.toString();
+									}
+								})].filter(
 									ele => ele !== topicObj.createdBy.toString()
-								);
+								).filter(elem => elem);
 								const creatorObjectId = topicObj.createdBy.toString();
 								// returns array of objects [{email: '[email protected] '}] for members in subscribed emails users is list of full user object
 								const { memberEmails } = teamController.getMemberDetails([...memberIds], [...messageRecipients]);