Merge pull request #108 from Giveth/4194-make-orto-schema-compatible

Change date schema to be compatible with ortto schema
Giveth · Jul 22, 2024 · aa3423a · aa3423a
2 parents 3a8e70b + 5eab9eb
commit aa3423a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/services/notificationService.test.ts b/src/services/notificationService.test.ts
@@ -6,7 +6,7 @@ describe('activityCreator', () => {
   it('should create attributes for NOTIFY_REWARD_AMOUNT', () => {
     const payload = {
       round: 1,
-      date: '2024-06-01',
+      date: '1721668910580',
       amount: '1000',
       contractAddress: '0x123',
       farm: 'Test Farm',
@@ -24,10 +24,15 @@ describe('activityCreator', () => {
       JSON.stringify({
         activities: [
           {
-            activity_id: 'act:cm:notify-reward-amount',
+            activity_id: 'act:cm:notify-reward',
             attributes: {
+              'dtz:cm:date': {
+                year: 2024,
+                month: 7,
+                day: 22,
+                timezone: 'UTC',
+              },
               'int:cm:round': payload.round,
-              'str:cm:date': payload.date,
               'str:cm:amount': payload.amount,
               'str:cm:contractaddress': payload.contractAddress,
               'str:cm:farm': payload.farm,

diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
@@ -24,6 +24,7 @@ export const activityCreator = (
   orttoEventName: NOTIFICATIONS_EVENT_NAMES,
 ): any => {
   let attributes;
+  let date;
   switch (orttoEventName) {
     case NOTIFICATIONS_EVENT_NAMES.SUBSCRIBE_ONBOARDING:
       attributes = {
@@ -179,9 +180,15 @@ export const activityCreator = (
       };
       break;
     case NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT:
+      date = new Date(Number(payload.date));
       attributes = {
+        'dtz:cm:date': {
+          year: date.getUTCFullYear(),
+          month: date.getUTCMonth() + 1, // JavaScript's months are zero-indexed
+          day: date.getUTCDate(),
+          timezone: 'UTC',
+        },
         'int:cm:round': payload.round,
-        'str:cm:date': payload.date,
         'str:cm:amount': payload.amount,
         'str:cm:contractaddress': payload.contractAddress,
         'str:cm:farm': payload.farm,

diff --git a/src/types/notifications.ts b/src/types/notifications.ts
@@ -79,6 +79,6 @@ export const ORTTO_EVENT_NAMES = {
   [NOTIFICATIONS_EVENT_NAMES.CREATE_ORTTO_PROFILE]: 'created-profile',
   [NOTIFICATIONS_EVENT_NAMES.SEND_EMAIL_CONFIRMATION]:
     'verification-form-email-verification',
-  [NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT]: 'notify-reward-amount',
+  [NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT]: 'notify-reward',
   [NOTIFICATIONS_EVENT_NAMES.SUBSCRIBE_ONBOARDING]: 'onboarding-form',
 };