Merge branch 'hotfix/fix_sf_duplicate_errors'

ReseauEntourage · Oct 16, 2023 · 28c7236 · 28c7236
2 parents b278d9f + 334d5b5
commit 28c7236
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "linkedout-backend",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "license": "ISC",
   "engines": {
     "node": "16.x"

diff --git a/src/external-services/salesforce/salesforce.service.ts b/src/external-services/salesforce/salesforce.service.ts
@@ -162,7 +162,7 @@ export class SalesforceService {
       if (
         (err as SalesforceError).errorCode === ErrorCodes.DUPLICATES_DETECTED
       ) {
-        return (err as SalesforceError).duplicateResut.matchResults[0]
+        return (err as SalesforceError).duplicateResult.matchResults[0]
           .matchRecords[0].record.Id;
       }
       console.error(err);
@@ -206,7 +206,7 @@ export class SalesforceService {
       if (
         (err as SalesforceError).errorCode === ErrorCodes.DUPLICATES_DETECTED
       ) {
-        return (err as SalesforceError).duplicateResut.matchResults[0]
+        return (err as SalesforceError).duplicateResult.matchResults[0]
           .matchRecords[0].record.Id;
       }
       if (
@@ -280,7 +280,7 @@ export class SalesforceService {
       if (
         (err as SalesforceError).errorCode === ErrorCodes.DUPLICATES_DETECTED
       ) {
-        return (err as SalesforceError).duplicateResut.matchResults[0]
+        return (err as SalesforceError).duplicateResult.matchResults[0]
           .matchRecords[0].record.Id;
       }
       console.error(err);
@@ -1019,17 +1019,26 @@ export class SalesforceService {
     );
     const { leadId, contactId } = leadOrContactId;
     if (!campaignMemberId) {
-      return this.createRecord(ObjectNames.CAMPAIGN_MEMBER, {
-        ...(leadId
-          ? {
-              LeadId: leadId,
-            }
-          : { ContactId: contactId }),
-        CampaignId: infoCoId,
-        Status: 'Inscrit',
-      });
+      try {
+        return this.createRecord(ObjectNames.CAMPAIGN_MEMBER, {
+          ...(leadId
+            ? {
+                LeadId: leadId,
+              }
+            : { ContactId: contactId }),
+          CampaignId: infoCoId,
+          Status: 'Inscrit',
+        });
+      } catch (err) {
+        // Case where the flow is not as fast as the api call
+        if ((err as SalesforceError).errorCode === ErrorCodes.DUPLICATE_VALUE) {
+          return this.findCampaignMember(leadOrContactId, infoCoId);
+        }
+        console.error(err);
+        throw err;
+      }
+      return campaignMemberId;
     }
-    return campaignMemberId;
   }
 
   async createCandidateLead(

diff --git a/src/external-services/salesforce/salesforce.types.ts b/src/external-services/salesforce/salesforce.types.ts
@@ -39,6 +39,7 @@ import { AnyCantFix } from 'src/utils/types';
 
 export const ErrorCodes = {
   DUPLICATES_DETECTED: 'DUPLICATES_DETECTED',
+  DUPLICATE_VALUE: 'DUPLICATE_VALUE',
   CANNOT_UPDATE_CONVERTED_LEAD: 'CANNOT_UPDATE_CONVERTED_LEAD',
   FIELD_INTEGRITY_EXCEPTION: 'FIELD_INTEGRITY_EXCEPTION',
   FIELD_FILTER_VALIDATION_EXCEPTION: 'FIELD_FILTER_VALIDATION_EXCEPTION',
@@ -50,7 +51,7 @@ export type ErrorCode = typeof ErrorCodes[keyof typeof ErrorCodes];
 export interface SalesforceError {
   errorCode: ErrorCode;
   message: string;
-  duplicateResut: {
+  duplicateResult: {
     matchResults: {
       matchRecords: {
         record: {