diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts index c712ec2..98f41c8 100644 --- a/src/services/notificationService.ts +++ b/src/services/notificationService.ts @@ -21,6 +21,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES } if (process.env.ENVIRONMENT === 'production') { fields['str:cm:user-id'] = payload.userId?.toString() + fields['str:cm:userid'] = payload.userId?.toString() } let attributes; switch (orttoEventName) { @@ -60,6 +61,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projectlink": payload.projectLink, "bol:cm:verified": payload.verified, "str:cm:transactionlink": payload.transactionLink, + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.DRAFTED_PROJECT_ACTIVATED: @@ -69,6 +71,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projectlink": payload.projectLink, "str:cm:firstname": payload.firstName, "str:cm:lastname": payload.lastName, + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_LISTED: @@ -76,6 +79,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projecttitle": payload.title, "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_UNLISTED: @@ -83,6 +87,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projecttitle": payload.title, "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_CANCELLED: @@ -90,6 +95,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projecttitle": payload.title, "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_UPDATE_ADDED_OWNER: @@ -97,6 +103,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:projecttitle": payload.title, "str:cm:email": payload.email, "str:cm:projectupdatelink": payload.projectLink + '?tab=updates', + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_VERIFIED: @@ -105,6 +112,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, "str:cm:verified-status": 'verified', + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.VERIFICATION_FORM_REJECTED: @@ -113,6 +121,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, "str:cm:verified-status": 'rejected', + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_UNVERIFIED: @@ -121,6 +130,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES "str:cm:email": payload.email, "str:cm:projectlink": payload.projectLink, "str:cm:verified-status": 'rejected', + "str:cm:userid": payload.userId?.toString(), }; break case NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKED: @@ -156,6 +166,12 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES logger.debug('activityCreator() invalid ORTTO_EVENT_NAMES', orttoEventName) return; } + const merge_by = []; + if (process.env.ENVIRONMENT === 'production') { + merge_by.push("str:cm:userid") + } else { + merge_by.push("str::email") + } return { activities: [ { @@ -163,7 +179,8 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES attributes, fields, } - ] + ], + merge_by }; }