Merge pull request #317 from alkem-io/develop

Release: Fixes
alkem-io · May 28, 2024 · 5d58a82 · 5d58a82
2 parents cdaf2f9 + 1786f3f
commit 5d58a82
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 43 deletions.
diff --git a/lib/package-lock.json b/lib/package-lock.json
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/notifications-lib",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Library for interacting with Alkemio notifications service",
   "author": "Alkemio Foundation",
   "private": false,

diff --git a/lib/src/dto/community.invitation.created.event.payload.ts b/lib/src/dto/community.invitation.created.event.payload.ts
@@ -4,4 +4,5 @@ import { SpaceBaseEventPayload } from './space.base.event.payload';
 export interface CommunityInvitationCreatedEventPayload
   extends SpaceBaseEventPayload {
   invitee: ContributorPayload;
+  welcomeMessage?: string;
 }
diff --git a/service/notifications.yml b/service/notifications.yml
@@ -92,11 +92,6 @@ recipients:
         - rule:
             type: SPACE_ADMIN
             resource_id: <spaceID>
-        # We don't have SUBSPACE_ADMIN any more. We have SPACE_SUBSPACE_ADMIN, but it's different payload that needs to be provided for this to work (the resource_id should be the parent of the entity).
-        # toDo - clarify this rule
-        # - rule:
-        #     type: SUBSPACE_ADMIN
-        #     resource_id: <spaceID>
         - rule:
             type: GLOBAL_COMMUNITY_READ
             resource_id:
@@ -114,9 +109,6 @@ recipients:
         - rule:
             type: SPACE_ADMIN
             resource_id: <spaceID>
-        # - rule:
-        #     type: SUBSPACE_ADMIN
-        #     resource_id: <spaceID>
     - name: member
       rules:
         - rule:
@@ -150,9 +142,6 @@ recipients:
         - rule:
             type: SPACE_MEMBER
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_MEMBER
-            resource_id: <spaceID>
   communication_user_message:
     - name: sender
       rules:
@@ -186,9 +175,6 @@ recipients:
         - rule:
             type: SPACE_LEAD
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_LEAD
-            resource_id: <spaceID>
   communication_user_mention:
     - name: receiver
       rules:
@@ -207,34 +193,24 @@ recipients:
         - rule:
             type: SPACE_ADMIN
             resource_id: <spaceID>
-        # - rule:
-        #     type: SUBSPACE_ADMIN
-        #     resource_id: <spaceID>
     - name: user
       rules:
         - rule:
             type: SPACE_MEMBER
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_MEMBER
-            resource_id: <spaceID>
+
   collaboration_whiteboard_created:
     - name: admin
       rules:
         - rule:
             type: SPACE_ADMIN
             resource_id: <spaceID>
-        # - rule:
-        #     type: SUBSPACE_ADMIN
-        #     resource_id: <spaceID>
+
     - name: user
       rules:
         - rule:
             type: SPACE_MEMBER
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_MEMBER
-            resource_id: <spaceID>
   collaboration_post_comment:
     - name: owner
       rules:
@@ -247,18 +223,12 @@ recipients:
         - rule:
             type: SPACE_MEMBER
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_MEMBER
-            resource_id: <spaceID>
   collaboration_callout_published:
     - name: user
       rules:
         - rule:
             type: SPACE_MEMBER
             resource_id: <spaceID>
-        - rule:
-            type: SUBSPACE_MEMBER
-            resource_id: <spaceID>
   platform_user_registered:
     - name: admin
       rules:

diff --git a/service/package-lock.json b/service/package-lock.json
diff --git a/service/package.json b/service/package.json
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@alkemio/client-lib": "^0.29.4",
-    "@alkemio/notifications-lib": "^0.8.2",
+    "@alkemio/notifications-lib": "^0.8.3",
     "@nestjs/common": "^8.0.5",
     "@nestjs/config": "^1.0.1",
     "@nestjs/core": "^8.0.5",

diff --git a/service/src/common/email-template-payload/community.invitation.created.email.payload.ts b/service/src/common/email-template-payload/community.invitation.created.email.payload.ts
@@ -8,5 +8,6 @@ export interface CommunityInvitationCreatedEmailPayload
     email: string;
     profile: string;
   };
+  welcomeMessage?: string;
   spaceAdminURL: string;
 }
diff --git a/...uilders/community-invitation-created/community.invitation.created.notification.builder.ts b/...uilders/community-invitation-created/community.invitation.created.notification.builder.ts
@@ -77,6 +77,7 @@ export class CommunityInvitationCreatedNotificationBuilder
         email: recipient.email,
         notificationPreferences: notificationPreferenceURL,
       },
+      welcomeMessage: eventPayload.welcomeMessage,
       space: {
         displayName: eventPayload.space.profile.displayName,
         type: eventPayload.space.type,