Release: User notifications received only by the direct community (#126)

* fixed wrong field name in notification email template * Only the direct community to receive the aspect created notification for users Co-authored-by: Valentin Yanakiev <[email protected]> Co-authored-by: Neil Smyth <[email protected]>
alkem-io · Jun 3, 2022 · 2173ca8 · 2173ca8
1 parent b2e29f1
commit 2173ca8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/notifications.yml b/notifications.yml
@@ -134,15 +134,15 @@ recipients:
             resource_id:
     - name: member
       rules:
+        - rule:
+            type: HUB_MEMBER
+            resource_id: <entityID>
         - rule:
             type: CHALLENGE_MEMBER
-            resource_id: <challengeID>
+            resource_id: <entityID>
         - rule:
             type: OPPORTUNITY_MEMBER
-            resource_id: <opportunityID>
-        - rule:
-            type: HUB_MEMBER
-            resource_id: <hubID>
+            resource_id: <entityID>
   communication_discussion_created:
     - name: admin
       rules:
@@ -154,15 +154,15 @@ recipients:
             resource_id:
     - name: member
       rules:
+        - rule:
+            type: HUB_MEMBER
+            resource_id: <entityID>
         - rule:
             type: CHALLENGE_MEMBER
-            resource_id: <challengeID>
+            resource_id: <entityID>
         - rule:
             type: OPPORTUNITY_MEMBER
-            resource_id: <opportunityID>
-        - rule:
-            type: HUB_MEMBER
-            resource_id: <hubID>
+            resource_id: <entityID>
   community_review_submitted:
     - name: admin
       rules:
@@ -207,13 +207,13 @@ recipients:
       rules:
         - rule:
             type: HUB_MEMBER
-            resource_id: <hubID>
+            resource_id: <entityID>
         - rule:
             type: CHALLENGE_MEMBER
-            resource_id: <challengeID>
+            resource_id: <entityID>
         - rule:
             type: OPPORTUNITY_MEMBER
-            resource_id: <opportunityID>
+            resource_id: <entityID>
   aspect_comment_created:
     - name: owner
       rules:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alkemio-notifications",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Alkemio notifications service",
   "author": "Alkemio Foundation",
   "private": false,

diff --git a/src/services/domain/builders/aspect-created/aspect.created.notification.builder.ts b/src/services/domain/builders/aspect-created/aspect.created.notification.builder.ts
@@ -39,6 +39,10 @@ export class AspectCreatedNotificationBuilder implements INotificationBuilder {
       hubID: payload.hub.id,
       challengeID: payload.hub?.challenge?.id ?? '',
       opportunityID: payload.hub?.challenge?.opportunity?.id ?? '',
+      entityID:
+        payload.hub?.challenge?.opportunity?.id ??
+        payload.hub?.challenge?.id ??
+        payload.hub.id,
     };
 
     return this.notificationBuilder.build({

diff --git a/...communication-discussion-created/communication.discussion.created.notification.builder.ts b/...communication-discussion-created/communication.discussion.created.notification.builder.ts
@@ -47,6 +47,10 @@ export class CommunicationDiscussionCreatedNotificationBuilder
       hubID: payload.hub.id,
       challengeID: payload.hub.challenge?.id ?? '',
       opportunityID: payload.hub.challenge?.opportunity?.id ?? '',
+      entityID:
+        payload.hub?.challenge?.opportunity?.id ??
+        payload.hub?.challenge?.id ??
+        payload.hub.id,
     };
 
     return this.notificationBuilder.build({

diff --git a/...uilders/communication-update-created/communication.update.created.notification.builder.ts b/...uilders/communication-update-created/communication.update.created.notification.builder.ts
@@ -43,6 +43,10 @@ export class CommunicationUpdateCreatedNotificationBuilder
       hubID: payload.hub.id,
       challengeID: payload.hub.challenge?.id ?? '',
       opportunityID: payload.hub.challenge?.opportunity?.id ?? '',
+      entityID:
+        payload.hub?.challenge?.opportunity?.id ??
+        payload.hub?.challenge?.id ??
+        payload.hub.id,
     };
 
     return this.notificationBuilder.build({

diff --git a/src/templates/community.new.member.admin.js b/src/templates/community.new.member.admin.js
@@ -14,7 +14,7 @@ module.exports = () => ({
         {% block content %}
           Hi {{recipient.firstname}},<br><br>
 
-          User {{member.displayName}} joined the {{community.name}} community
+          User {{member.name}} joined the {{community.name}} community
           <br/>
           Sincerely yours,
         {% endblock %}