Merge pull request #119 from Giveth/supportQaccOnOrtto

support Qacc on Ortto

config/example.env

@@ -14,6 +14,7 @@ REDIS_PASSWORD=
 
 SEGMENT_API_KEY=FAKE_API_KEY
 ORTTO_API_KEY=FAKE_API_KEY
+QACC_ORTTO_API_KEY=FAKE_API_KEY
 ORTTO_ACTIVITY_API=https://api-us.ortto.app/v1/activities/create
 
 #JWT_AUTHORIZATION_ADAPTER=siweMicroservice

src/adapters/emailAdapter/orttoAdapter.ts

@@ -1,19 +1,24 @@
 import axios from 'axios';
 import { logger } from '../../utils/logger';
 import { OrttoAdapterInterface } from './orttoAdapterInterface';
+import { MICRO_SERVICES } from '../../utils/utils';
 
 export class OrttoAdapter implements OrttoAdapterInterface {
-  async callOrttoActivity(data: any): Promise<void> {
+  async callOrttoActivity(data: any, microService: string): Promise<void> {
     try {
       if (!data) {
         throw new Error('callOrttoActivity input data is empty');
       }
+      const apiKey =
+        microService === MICRO_SERVICES.qacc
+          ? process.env.QACC_ORTTO_API_KEY
+          : process.env.ORTTO_API_KEY;
       const config = {
         method: 'post',
         maxBodyLength: Infinity,
         url: process.env.ORTTO_ACTIVITY_API,
         headers: {
-          'X-Api-Key': process.env.ORTTO_API_KEY as string,
+          'X-Api-Key': apiKey as string,
           'Content-Type': 'application/json',
         },
         data,

src/adapters/emailAdapter/orttoAdapterInterface.ts

@@ -1,3 +1,3 @@
 export interface OrttoAdapterInterface {
-  callOrttoActivity(data: any): Promise<void>;
+  callOrttoActivity(data: any, microService: string): Promise<void>;
 }

src/adapters/emailAdapter/orttoMockAdapter.ts

@@ -2,7 +2,7 @@ import { logger } from '../../utils/logger';
 import { OrttoAdapterInterface } from './orttoAdapterInterface';
 
 export class OrttoMockAdapter implements OrttoAdapterInterface {
-  async callOrttoActivity(data: any): Promise<void> {
-    logger.debug('OrttoMockAdapter has been called', data);
+  async callOrttoActivity(data: any, microService: string): Promise<void> {
+    logger.debug('OrttoMockAdapter has been called', data, microService);
   }
 }

src/services/notificationService.test.ts

@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import { activityCreator } from './notificationService';
 import { NOTIFICATIONS_EVENT_NAMES } from '../types/notifications';
+import { MICRO_SERVICES } from '../utils/utils';
 
 describe('activityCreator', () => {
   it('should create attributes for NOTIFY_REWARD_AMOUNT', () => {
@@ -19,6 +20,7 @@ describe('activityCreator', () => {
     const result = activityCreator(
       payload,
       NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT,
+      MICRO_SERVICES.givethio,
     );
     expect(JSON.stringify(result)).equal(
       JSON.stringify({

src/services/notificationService.ts

@@ -18,10 +18,12 @@ import {
 } from '../types/notifications';
 import { getEmailAdapter } from '../adapters/adapterFactory';
 import { NOTIFICATION_CATEGORY } from '../types/general';
+import { MICRO_SERVICES } from '../utils/utils';
 
 export const activityCreator = (
   payload: any,
   orttoEventName: NOTIFICATIONS_EVENT_NAMES,
+  microService: string,
 ): any => {
   let attributes;
   let date;
@@ -213,7 +215,8 @@ export const activityCreator = (
   if (
     process.env.ENVIRONMENT === 'production' &&
     orttoEventName !== NOTIFICATIONS_EVENT_NAMES.SEND_EMAIL_CONFIRMATION &&
-    orttoEventName !== NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT
+    orttoEventName !== NOTIFICATIONS_EVENT_NAMES.NOTIFY_REWARD_AMOUNT &&
+    microService !== MICRO_SERVICES.qacc
   ) {
     fields['str:cm:user-id'] = payload.userId?.toString();
     merge_by.push('str:cm:user-id');
@@ -314,9 +317,10 @@ export const sendNotification = async (
     const data = activityCreator(
       emailData,
       body.eventName as NOTIFICATIONS_EVENT_NAMES,
+      microService,
     );
     if (data) {
-      await getEmailAdapter().callOrttoActivity(data);
+      await getEmailAdapter().callOrttoActivity(data, microService);
     }
     emailStatus = EMAIL_STATUSES.SENT;
   }

src/utils/utils.ts

@@ -20,6 +20,7 @@ export const MICRO_SERVICES = {
   givEconomyNotificationMicroService: 'giveconomy-notification-service',
   trace: 'trace',
   notifyReward: 'notifyreward',
+  qacc: 'qacc',
 };
 
 // Need to define trace, blockchain and miscellaneos events