Merge branch 'hotfix/fix_sf_duplicate_errors'

ReseauEntourage · Oct 17, 2023 · c14d77b · c14d77b
2 parents 28c7236 + 9186b8d
commit c14d77b
Show file tree

Hide file tree

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

diff --git a/src/external-services/salesforce/salesforce.service.ts b/src/external-services/salesforce/salesforce.service.ts
@@ -1013,31 +1013,34 @@ export class SalesforceService {
     leadOrContactId: { leadId?: string; contactId?: string },
     infoCoId: string
   ) {
-    const campaignMemberId = await this.findCampaignMember(
-      leadOrContactId,
-      infoCoId
-    );
-    const { leadId, contactId } = leadOrContactId;
-    if (!campaignMemberId) {
-      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;
+    try {
+      let campaignMemberId = await this.findCampaignMember(
+        leadOrContactId,
+        infoCoId
+      );
+      const { leadId, contactId } = leadOrContactId;
+      if (!campaignMemberId) {
+        campaignMemberId = (await this.createRecord(
+          ObjectNames.CAMPAIGN_MEMBER,
+          {
+            ...(leadId
+              ? {
+                  LeadId: leadId,
+                }
+              : { ContactId: contactId }),
+            CampaignId: infoCoId,
+            Status: 'Inscrit',
+          }
+        )) as string;
       }
       return campaignMemberId;
+    } 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;
     }
   }