Merge pull request #261 from alkem-io/develop

Release: Fixes
alkem-io · Sep 27, 2023 · 3fdeddd · 3fdeddd
2 parents 88b853f + f6192e7
commit 3fdeddd
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 11 deletions.
diff --git a/service/package-lock.json b/service/package-lock.json
diff --git a/service/package.json b/service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alkemio-notifications",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "Alkemio notifications service",
   "author": "Alkemio Foundation",
   "private": false,

diff --git a/...in/builders/collaboration-post-created/collaboration.post.created.notification.builder.ts b/...in/builders/collaboration-post-created/collaboration.post.created.notification.builder.ts
@@ -42,9 +42,19 @@ export class CollaborationPostCreatedNotificationBuilder
       },
     ];
 
+    const spaceIDTemplateVar =
+      !payload.journey?.challenge?.opportunity?.id &&
+      !payload.journey?.challenge?.id
+        ? payload.journey.spaceID
+        : '';
+
+    const challengeIDTemplateVar = !payload.journey?.challenge?.opportunity?.id
+      ? payload.journey?.challenge?.id
+      : undefined;
+
     const templateVariables = {
-      spaceID: payload.journey.spaceID,
-      challengeID: payload.journey?.challenge?.id ?? '',
+      spaceID: spaceIDTemplateVar,
+      challengeID: challengeIDTemplateVar ?? '',
       opportunityID: payload.journey?.challenge?.opportunity?.id ?? '',
       journeyID:
         payload.journey?.challenge?.opportunity?.id ??

diff --git a/...collaboration-whiteboard-created/collaboration.whiteboard.created.notification.builder.ts b/...collaboration-whiteboard-created/collaboration.whiteboard.created.notification.builder.ts
@@ -42,9 +42,19 @@ export class CollaborationWhiteboardCreatedNotificationBuilder
       },
     ];
 
+    const spaceIDTemplateVar =
+      !payload.journey?.challenge?.opportunity?.id &&
+      !payload.journey?.challenge?.id
+        ? payload.journey.spaceID
+        : '';
+
+    const challengeIDTemplateVar = !payload.journey?.challenge?.opportunity?.id
+      ? payload.journey?.challenge?.id
+      : undefined;
+
     const templateVariables = {
-      spaceID: payload.journey.spaceID,
-      challengeID: payload.journey?.challenge?.id ?? '',
+      spaceID: spaceIDTemplateVar,
+      challengeID: challengeIDTemplateVar ?? '',
       opportunityID: payload.journey?.challenge?.opportunity?.id ?? '',
       journeyID:
         payload.journey?.challenge?.opportunity?.id ??

diff --git a/...lders/community-application-created/community.application.created.notification.builder.ts b/...lders/community-application-created/community.application.created.notification.builder.ts
@@ -42,11 +42,20 @@ export class CommunityApplicationCreatedNotificationBuilder
         preferenceType: UserPreferenceType.NotificationApplicationSubmitted,
       },
     ];
+    const spaceIDTemplateVar =
+      !payload.journey?.challenge?.opportunity?.id &&
+      !payload.journey?.challenge?.id
+        ? payload.journey.spaceID
+        : '';
+
+    const challengeIDTemplateVar = !payload.journey?.challenge?.opportunity?.id
+      ? payload.journey?.challenge?.id
+      : undefined;
 
     const templateVariables = {
       applicantID: payload.applicantID,
-      spaceID: payload.journey.spaceID,
-      challengeID: payload.journey.challenge?.id ?? '',
+      spaceID: spaceIDTemplateVar,
+      challengeID: challengeIDTemplateVar ?? '',
       opportunityID: payload.journey.challenge?.opportunity?.id ?? '',
     };
 

diff --git a/...ervices/domain/builders/community-new-member/community.new.member.notification.builder.ts b/...ervices/domain/builders/community-new-member/community.new.member.notification.builder.ts
@@ -43,10 +43,20 @@ export class CommunityNewMemberNotificationBuilder
       },
     ];
 
+    const spaceIDTemplateVar =
+      !payload.journey?.challenge?.opportunity?.id &&
+      !payload.journey?.challenge?.id
+        ? payload.journey.spaceID
+        : '';
+
+    const challengeIDTemplateVar = !payload.journey?.challenge?.opportunity?.id
+      ? payload.journey?.challenge?.id
+      : undefined;
+
     const templateVariables = {
       memberID: payload.userID,
-      spaceID: payload.journey.spaceID,
-      challengeID: payload.journey.challenge?.id ?? '',
+      spaceID: spaceIDTemplateVar,
+      challengeID: challengeIDTemplateVar ?? '',
       opportunityID: payload.journey.challenge?.opportunity?.id ?? '',
     };