Merge branch 'staging' into add-badge-revoke-events

# Conflicts: # src/types/notifications.ts
Giveth · Feb 29, 2024 · 997822e · 997822e
2 parents b925592 + 05a9322
commit 997822e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
@@ -80,6 +80,14 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:verified-status": 'verified',
       };
       break
+    case NOTIFICATIONS_EVENT_NAMES.VERIFICATION_FORM_REJECTED:
+      attributes = {
+        "str:cm:projecttitle": payload.title,
+        "str:cm:email": payload.email,
+        "str:cm:projectlink": payload.projectLink,
+        "str:cm:verified-status": 'rejected',
+      };
+      break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_UNVERIFIED:
       attributes = {
         "str:cm:projecttitle": payload.title,
@@ -114,6 +122,11 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
       break
     default:
       logger.debug('activityCreator() invalid event name', orttoEventName)
+      return;
+  }
+  if (!ORTTO_EVENT_NAMES[orttoEventName]) {
+    logger.debug('activityCreator() invalid ORTTO_EVENT_NAMES', orttoEventName)
+    return;
   }
   return {
     activities: [
@@ -174,6 +187,9 @@ export const sendNotification = async (
     },
     trackId: body.trackId,
     metadata: body.metadata,
+    payload: body.segment?.payload,
+    sendEmail: body.sendEmail,
+    sendSegment: body.sendSegment,
   });
 
   const shouldSendEmail =
@@ -188,12 +204,12 @@ export const sendNotification = async (
     ]?.segment;
 
   if (shouldSendEmail && body.sendSegment && segmentValidator) {
-    //TODO Currently sending email and segment event are tightly coupled, we can't send segment event without sending email
-    // And it's not good, we should find another solution to separate sending segment and email
     const emailData = body.segment?.payload;
     validateWithJoiSchema(emailData, segmentValidator);
     const data = activityCreator(emailData, body.eventName as NOTIFICATIONS_EVENT_NAMES);
-    await getEmailAdapter().callOrttoActivity(data);
+    if (data) {
+      await getEmailAdapter().callOrttoActivity(data);
+    }
     emailStatus = EMAIL_STATUSES.SENT;
   }
 

diff --git a/src/types/notifications.ts b/src/types/notifications.ts
@@ -56,6 +56,7 @@ export const ORTTO_EVENT_NAMES = {
   [NOTIFICATIONS_EVENT_NAMES.PROJECT_UNVERIFIED]: 'project-verification',
   [NOTIFICATIONS_EVENT_NAMES.PROJECT_VERIFIED]: 'project-verification',
   [NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKED]: 'project-verification',
+  [NOTIFICATIONS_EVENT_NAMES.VERIFICATION_FORM_REJECTED]: 'project-verification',
   [NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKE_WARNING]: 'first-update-warning',
   [NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKE_LAST_WARNING]: 'second-update-warning',
 }
diff --git a/src/utils/validators/segmentAndMetadataValidators.ts b/src/utils/validators/segmentAndMetadataValidators.ts
@@ -261,7 +261,7 @@ export const SEGMENT_METADATA_SCHEMA_VALIDATOR: {
   },
   verificationFormRejected: {
     metadata: projectTitleProjectLinkReasonSchema,
-    segment: null,
+    segment: projectRelatedTrackerSchema,
   },
   verificationFormReapplyReminder: {
     metadata: verificationFormReapplyReminderSchema,

diff --git a/src/validators/schemaValidators.ts b/src/validators/schemaValidators.ts
@@ -22,6 +22,7 @@ const throwHttpErrorIfJoiValidatorFails = (
     throw error;
   }
 };
+
 export const countUnreadValidator = Joi.object({
   walletAddress: Joi.alternatives().try(
     Joi.string().required().pattern(ethereumWalletAddressRegex),