Merge pull request #803 from Badsender-com/staging

Release production
Badsender-com · May 21, 2024 · db75fe3 · db75fe3
2 parents 2d26812 + 2ee18dd
commit db75fe3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/packages/editor/src/js/vue/components/esp/esp-send-mail.js b/packages/editor/src/js/vue/components/esp/esp-send-mail.js
@@ -114,6 +114,18 @@ const EspComponent = Vue.component('EspForm', {
         .catch((error) => {
           // handle error
           console.log(error);
+
+          /*
+            If the campaign for this profile should exist but was not found on DSC,
+            Then it was probably deleted on DSC's side.
+            So we allow the user to create a new one
+          */
+          if(error.response.status === 404) {
+            this.type = SEND_MODE.CREATION;
+            this.fetchProfileData(message);
+            return;
+          }
+
           this.vm.notifier.error(this.vm.t('error-server'));
         })
         .finally(() => {

diff --git a/packages/server/esp/dsc/dscProvider.js b/packages/server/esp/dsc/dscProvider.js
@@ -4,7 +4,12 @@ const mailingService = require('../../mailing/mailing.service.js');
 const ERROR_CODES = require('../../constant/error-codes.js');
 const config = require('../../node.config.js');
 const axios = require('../../config/axios');
-const { InternalServerError, Conflict, BadRequest } = require('http-errors');
+const {
+  InternalServerError,
+  Conflict,
+  BadRequest,
+  NotFound,
+} = require('http-errors');
 
 class DscProvider {
   constructor({ apiKey, ...data }) {
@@ -85,6 +90,10 @@ class DscProvider {
       throw new BadRequest(message);
     }
 
+    if (status === 409) {
+      throw new Conflict(message);
+    }
+
     // Log the error and throw a generic error if it doesn't match specific cases
     logger.error('Error in API call:', error);
     throw new Error('An error occurred while communicating with the API.');
@@ -124,6 +133,10 @@ class DscProvider {
     } catch (e) {
       logger.error({ error: e });
 
+      if (e?.status === 404) {
+        throw new NotFound('Campaign not found on DSC');
+      }
+
       throw e;
     }
   }

diff --git a/packages/server/profile/profile.service.js b/packages/server/profile/profile.service.js
@@ -202,7 +202,13 @@ async function sendEspCampaign({
   const { subject, campaignMailName, planification } = espSendingMailData;
   const profile = await findOne(profileId);
 
-  await checkIfMailAlreadySentToProfile({ profileId, mailingId });
+  /*
+    For DSC, creating a new campaign from the same profile is allowed 
+    if the campaign was deleted on DSC's side
+  */
+  if (type !== 'DSC') {
+    await checkIfMailAlreadySentToProfile({ profileId, mailingId });
+  }
 
   const {
     apiKey,