Merge pull request #51 from Giveth/staging

Next release
Giveth · Mar 15, 2023 · 965e811 · 965e811
2 parents b553289 + 5f37891
commit 965e811
Show file tree

Hide file tree

Showing 8 changed files with 388 additions and 37 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v16.16.0
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This is a microservice for managing notifications for both https://giveth.io and
 [References](#References)
 
 ### Used_Technologies
-* Nodejs **v16**
+* Nodejs **v16** (You can use `nvm use` command to load appropriate Node version by `nvm`)
 * Typescript **v4.5.2**
 * DB: postgres **v14.2**
 * DB ORM: TypeORM **v0.3.6**

diff --git a/migrations/1660539945623-createThirdParty.ts b/migrations/1660539945623-createThirdParty.ts
@@ -17,6 +17,7 @@ export class createThirdParty1660539945623 implements MigrationInterface {
             name: 'microService',
             type: 'text',
             isNullable: false,
+            isUnique: true,
           },
           {
             name: 'secret',

diff --git a/migrations/1660716115917-seedNotificationType.ts b/migrations/1660716115917-seedNotificationType.ts
@@ -243,12 +243,10 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content:
-          ', which you supported, is now listed on the Giveth projects page.',
+        content: ' is now listed on the Giveth projects page.',
       },
     ],
-    content:
-      '{project name}, which you supported, is now listed on the Giveth projects page',
+    content: '{project name} is now listed on the Giveth projects page',
   },
   PROJECT_UNLISTED: {
     name: NOTIFICATION_TYPE_NAMES.PROJECT_UNLISTED_OWNER,
@@ -307,7 +305,7 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content: ', which you supported, did not meet our ',
+        content: ' did not meet our ',
       },
       {
         type: 'a',
@@ -426,7 +424,7 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         content:
-          ', which you supported, has been canceled by an admin because it failed to adhere to our ',
+          ' has been canceled by an admin because it failed to adhere to our ',
       },
       {
         type: 'a',
@@ -492,10 +490,10 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content: ' , which you supported, has been reactivated.',
+        content: ' has been reactivated.',
       },
     ],
-    content: '{project name}, which you supported, has been reactivated',
+    content: '{project name} has been reactivated',
   },
 
   PROJECT_DEACTIVATED: {
@@ -548,10 +546,10 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content: ', which you supported, has been deactivated.',
+        content: ' has been deactivated.',
       },
     ],
-    content: '{project name}, which you supported, has been deactivated.',
+    content: '{project name} has been deactivated.',
   },
   PROJECT_VERIFIED: {
     name: NOTIFICATION_TYPE_NAMES.PROJECT_VERIFIED_OWNER,
@@ -624,8 +622,7 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content:
-          'which you supported, is now verified. You can now donate and receive ',
+        content: ' is now verified. You can now donate and receive ',
       },
       {
         type: 'a',
@@ -698,7 +695,7 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         content:
-          'has not been approved for verification. Learn more about our verification requirements ',
+          ' has not been approved for verification. Learn more about our verification requirements ',
       },
       {
         type: 'a',
@@ -886,10 +883,11 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         //TODO Carlos please check this copy with existing autopilot emails
-        content: ' would lose verification badge soon',
+        content: ' will lose its verification badge soon',
       },
     ],
-    content: 'You project {project name} would lose verification badge soon',
+    content:
+      'Your project {project name} will lose its verification badge soon',
   },
   PROJECT_BADGE_REVOKE_WARNING: {
     name: 'Project badge revoke warning',
@@ -915,10 +913,11 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         //TODO Carlos please check this copy with existing autopilot emails
-        content: ' would lose verification badge soon.',
+        content: ' will lose its verification badge soon.',
       },
     ],
-    content: 'You project {project name} would lose verification badge soon.',
+    content:
+      'Your project {project name} will lose its verification badge soon.',
   },
   PROJECT_BADGE_REVOKE_LAST_WARNING: {
     name: 'Project badge revoke last warning',
@@ -944,11 +943,12 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         //TODO Carlos please check this copy with existing autopilot emails
-        content: ' would lose verification badge soon. this is last warning.',
+        content:
+          ' will lose its verification badge soon. this is the last warning.',
       },
     ],
     content:
-      'You project {project name} would lose verification badge soon, this is last warning.',
+      'Your project {project name} will lose its verification badge soon, this is the last warning.',
   },
   PROJECT_BADGE_UP_FOR_REVOKING: {
     name: 'Project badge up for revoking',
@@ -974,10 +974,11 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         //TODO Carlos please check this copy with existing autopilot emails
-        content: ' would lose verification badge soon.',
+        content: ' will lose its verification badge soon.',
       },
     ],
-    content: 'You project {project name} would lose verification badge soon.',
+    content:
+      'Your project {project name} will lose its verification badge soon.',
   },
   PROJECT_UNVERIFIED: {
     name: NOTIFICATION_TYPE_NAMES.PROJECT_UNVERIFIED_OWNER,
@@ -1035,7 +1036,7 @@ export const GivethNotificationTypes = {
       {
         type: 'p',
         content:
-          ', which you supported, has lost its verification status. Learn more about our verification requirements',
+          ' has lost its verification status. Learn more about our verification requirements',
       },
       {
         type: 'a',
@@ -1049,7 +1050,7 @@ export const GivethNotificationTypes = {
       },
     ],
     content:
-      '{project name}, which you supported, has lost its verification status. Learn more about our verification requirements here.',
+      '{project name} has lost its verification status. Learn more about our verification requirements here.',
   },
   MADE_DONATION: {
     name: 'Made donation',
@@ -1206,8 +1207,8 @@ export const GivethNotificationTypes = {
   },
 
   VERIFICATION_FORM_GOT_DRAFT_BY_ADMIN: {
-    name: 'Verification form got draft by admin',
-    description: 'Verification form got drafted by admin',
+    name: NOTIFICATION_TYPE_NAMES.VERIFICATION_FORM_GOT_DRAFT_BY_ADMIN,
+    description: 'Verification form was drafted by an admin',
     microService: MICRO_SERVICES.givethio,
     category: NOTIFICATION_CATEGORY.PROJECT_RELATED,
     icon: '',
@@ -1229,10 +1230,10 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content: ' got draft by admin.',
+        content: ' was drafted by an admin.',
       },
     ],
-    content: 'Your project {project name} got draft by admin.',
+    content: 'Your project {project name} was drafted by an admin.',
   },
   PROJECT_RECEIVED_LIKE: {
     name: 'project liked',
@@ -1292,10 +1293,10 @@ export const GivethNotificationTypes = {
       },
       {
         type: 'p',
-        content: ', which you supported, has a new update!',
+        content: ' has a new update!',
       },
     ],
-    content: '{Project name} , which you supported, has a new update!',
+    content: '{Project name}  has a new update!',
   },
   YOU_BOOSTED: {
     name: 'You boosted',