From 6adfef7c525b2e3a6793555ecda2ed67f941f613 Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Fri, 24 May 2024 17:41:33 +0530
Subject: [PATCH 1/4] added variant success file

---
 packages/contentstack-export/src/config/index.ts  |  2 +-
 packages/contentstack-import/src/config/index.ts  |  2 +-
 .../src/import/variant-entries.ts                 | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/contentstack-export/src/config/index.ts b/packages/contentstack-export/src/config/index.ts
index d6e23f4c7d..f880a3da26 100644
--- a/packages/contentstack-export/src/config/index.ts
+++ b/packages/contentstack-export/src/config/index.ts
@@ -146,7 +146,7 @@ const config: DefaultConfig = {
     },
     personalization: {
       baseURL: {
-        NA: 'https://personalization-api.contentstack.com',
+        dev11: 'https://dev-personalization-api.csnonprod.com',
       },
       dirName: 'personalization',
       exportOrder: ['attributes', 'audiences', 'events', 'experiences'],
diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts
index 37ab06b5ca..e6dab761b3 100644
--- a/packages/contentstack-import/src/config/index.ts
+++ b/packages/contentstack-import/src/config/index.ts
@@ -153,7 +153,7 @@ const config: DefaultConfig = {
     },
     personalization: {
       baseURL: {
-        NA: 'https://personalization-api.contentstack.com',
+        dev11: 'https://dev-personalization-api.csnonprod.com',
       },
       importData: true,
       dirName: 'personalization',
diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts
index 6f446017f1..09d50af3dd 100644
--- a/packages/contentstack-variants/src/import/variant-entries.ts
+++ b/packages/contentstack-variants/src/import/variant-entries.ts
@@ -36,7 +36,8 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
   public assetUidMapper!: Record<string, any>;
   public entriesUidMapper!: Record<string, any>;
   private installedExtensions!: Record<string, any>[];
-  private variantUidMapperPath!: string;
+  private variantSuccessPath!: string;
+  private createdVariantEntries: Record<string, string> = {};
   private environments!: Record<string, any>;
 
   constructor(readonly config: ImportConfig & { helpers?: ImportHelperMethodsConfig }) {
@@ -57,6 +58,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     this.entriesMapperPath = resolve(config.backupDir, config.branchName || '', 'mapper', 'entries');
     this.personalizationConfig = this.config.modules.personalization;
     this.entriesDirPath = resolve(config.backupDir, config.branchName || '', config.modules.entries.dirName);
+    this.variantSuccessPath = resolve(this.entriesMapperPath, 'variant-entries-success.json');
   }
 
   /**
@@ -189,6 +191,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       for (let [, variantEntry] of entries(batch)) {
         const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
           log(this.config, `Created variant entry: '${variantUid}' of entry uid ${entryUid}`, 'info');
+          this.createdVariantEntries[entryUid] = variantUid;
         };
 
         const onReject = ({ error, apiData: { entryUid, variantUid }, log }: any) => {
@@ -236,6 +239,8 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       const exeTime = end - start;
       this.variantInstance.delay(1000 - exeTime);
     }
+
+    fsUtil.writeFile(this.variantSuccessPath, this.createdVariantEntries);
   }
 
   /**
@@ -335,8 +340,12 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     for (let [, variantEntry] of entries(batch)) {
       const oldVariantUid = variantEntry.variant_id || '';
       const newVariantUid = this.variantIdList[oldVariantUid] as string;
-      if (!newVariantUid) {
-        log(this.config, `Variant UID not found for entry '${variantEntry?.uid}'`, 'error');
+      if (!newVariantUid || this.createdVariantEntries[entryUid] !== newVariantUid) { 
+        log(
+          this.config,
+          `${this.messages.VARIANT_ID_NOT_FOUND}. Skipping variant publish for ${newVariantUid}`,
+          'info',
+        );
         continue;
       }
       if (this.environments?.length) {

From d6df85b67e16c9063bb0a26a73280422226e95f5 Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Fri, 24 May 2024 17:44:18 +0530
Subject: [PATCH 2/4] revert dev url

---
 packages/contentstack-export/src/config/index.ts | 2 +-
 packages/contentstack-import/src/config/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/contentstack-export/src/config/index.ts b/packages/contentstack-export/src/config/index.ts
index f880a3da26..d6e23f4c7d 100644
--- a/packages/contentstack-export/src/config/index.ts
+++ b/packages/contentstack-export/src/config/index.ts
@@ -146,7 +146,7 @@ const config: DefaultConfig = {
     },
     personalization: {
       baseURL: {
-        dev11: 'https://dev-personalization-api.csnonprod.com',
+        NA: 'https://personalization-api.contentstack.com',
       },
       dirName: 'personalization',
       exportOrder: ['attributes', 'audiences', 'events', 'experiences'],
diff --git a/packages/contentstack-import/src/config/index.ts b/packages/contentstack-import/src/config/index.ts
index e6dab761b3..37ab06b5ca 100644
--- a/packages/contentstack-import/src/config/index.ts
+++ b/packages/contentstack-import/src/config/index.ts
@@ -153,7 +153,7 @@ const config: DefaultConfig = {
     },
     personalization: {
       baseURL: {
-        dev11: 'https://dev-personalization-api.csnonprod.com',
+        NA: 'https://personalization-api.contentstack.com',
       },
       importData: true,
       dirName: 'personalization',

From 2da78b53540cb2a2db853d36d31ceb3ecdc31068 Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Mon, 27 May 2024 19:17:03 +0530
Subject: [PATCH 3/4] handle failed entry variant case

---
 .../src/import/variant-entries.ts             | 54 ++++++++++---------
 .../src/messages/index.ts                     |  1 +
 .../src/utils/variant-api-adapter.ts          |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts
index 09d50af3dd..16cce99b41 100644
--- a/packages/contentstack-variants/src/import/variant-entries.ts
+++ b/packages/contentstack-variants/src/import/variant-entries.ts
@@ -36,8 +36,8 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
   public assetUidMapper!: Record<string, any>;
   public entriesUidMapper!: Record<string, any>;
   private installedExtensions!: Record<string, any>[];
-  private variantSuccessPath!: string;
-  private createdVariantEntries: Record<string, string> = {};
+  private failedVariantPath!: string;
+  private failedVariantEntries!: Record<string, any>;
   private environments!: Record<string, any>;
 
   constructor(readonly config: ImportConfig & { helpers?: ImportHelperMethodsConfig }) {
@@ -58,7 +58,8 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     this.entriesMapperPath = resolve(config.backupDir, config.branchName || '', 'mapper', 'entries');
     this.personalizationConfig = this.config.modules.personalization;
     this.entriesDirPath = resolve(config.backupDir, config.branchName || '', config.modules.entries.dirName);
-    this.variantSuccessPath = resolve(this.entriesMapperPath, 'variant-entries-success.json');
+    this.failedVariantPath = resolve(this.entriesMapperPath, 'failed-entry-variants.json');
+    this.failedVariantEntries = new Map()
   }
 
   /**
@@ -127,7 +128,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     for (const entriesForVariant of entriesForVariants) {
       await this.importVariantEntries(entriesForVariant);
     }
-    log(this.config, 'All the variant-entries have been imported & published successfully', 'success');
+    log(this.config, 'All the entries variants have been imported & published successfully', 'success');
   }
 
   /**
@@ -190,12 +191,13 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
 
       for (let [, variantEntry] of entries(batch)) {
         const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
-          log(this.config, `Created variant entry: '${variantUid}' of entry uid ${entryUid}`, 'info');
-          this.createdVariantEntries[entryUid] = variantUid;
+          log(this.config, `Created entry variant: '${variantUid}' of entry uid ${entryUid}`, 'info');
         };
 
-        const onReject = ({ error, apiData: { entryUid, variantUid }, log }: any) => {
-          log(this.config, `Failed to create variant entry: '${variantUid}' of entry uid ${entryUid}`, 'error');
+        const onReject = ({ error, apiData, log }: any) => {
+          const { entryUid, variantUid } = apiData;
+          this.failedVariantEntries.set(variantUid, apiData);
+          log(this.config, `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
           log(this.config, error, 'error');
         };
         // NOTE Find new variant Id by old Id
@@ -220,7 +222,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
             {
               reject: onReject.bind(this),
               resolve: onSuccess.bind(this),
-              variantUid: variant_id,
+              variantUid: variantEntry.uid,
               log: log,
             },
           );
@@ -240,12 +242,12 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       this.variantInstance.delay(1000 - exeTime);
     }
 
-    fsUtil.writeFile(this.variantSuccessPath, this.createdVariantEntries);
+    fsUtil.writeFile(this.failedVariantPath, this.failedVariantEntries);
   }
 
   /**
-   * Serializes the change set of a variant entry.
-   * @param variantEntry - The variant entry to serialize.
+   * Serializes the change set of a entry variant.
+   * @param variantEntry - The entry variant to serialize.
    * @returns The serialized change set as a record.
    */
   serializeChangeSet(variantEntry: VariantEntryStruct) {
@@ -261,14 +263,14 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
   }
 
   /**
-   * The function `handleVariantEntryRelationalData` processes relational data for a variant entry
+   * The function `handleVariantEntryRelationalData` processes relational data for a entry variant
    * based on the provided content type and configuration helpers.
    * @param {ContentTypeStruct} contentType - The `contentType` parameter in the
    * `handleVariantEntryRelationalData` function is of type `ContentTypeStruct`. It is used to define
    * the structure of the content type being processed within the function. This parameter likely
    * contains information about the schema and configuration of the content type.
    * @param {VariantEntryStruct} variantEntry - The `variantEntry` parameter in the
-   * `handleVariantEntryRelationalData` function is a data structure that represents a variant entry.
+   * `handleVariantEntryRelationalData` function is a data structure that represents a entry variant.
    * It is of type `VariantEntryStruct` and contains information related to a specific entry variant.
    * This function is responsible for performing various operations on the `variantEntry`
    * @returns The function `handleVariantEntryRelationalData` returns the `variantEntry` after
@@ -338,26 +340,30 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
   async publishVariantEntries(batch: VariantEntryStruct[], entryUid: string, content_type: string) {
     const allPromise = [];
     for (let [, variantEntry] of entries(batch)) {
+      const variantUid = variantEntry.uid;
       const oldVariantUid = variantEntry.variant_id || '';
       const newVariantUid = this.variantIdList[oldVariantUid] as string;
-      if (!newVariantUid || this.createdVariantEntries[entryUid] !== newVariantUid) { 
-        log(
-          this.config,
-          `${this.messages.VARIANT_ID_NOT_FOUND}. Skipping variant publish for ${newVariantUid}`,
-          'info',
-        );
+
+      if (!newVariantUid) {
+        log(this.config, `${this.messages.VARIANT_ID_NOT_FOUND}. Skipping entry variant publish for ${variantUid}`, 'info');
         continue;
       }
+
+      if (this.failedVariantEntries.has(variantUid)) {
+        log(this.config, `${this.messages.VARIANT_UID_NOT_FOUND}. Skipping entry variant publish for ${variantUid}`, 'info');
+        continue;
+      }
+
       if (this.environments?.length) {
-        log(this.config, 'No environment found! Skipping variant entry publishing...', 'info');
+        log(this.config, 'No environment found! Skipping entry variant publishing...', 'info');
         return;
       }
 
       const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
-        log(this.config, `Variant entry: '${variantUid}' of entry uid ${entryUid} published successfully!`, 'info');
+        log(this.config, `Entry variant: '${variantUid}' of entry uid ${entryUid} published successfully!`, 'info');
       };
       const onReject = ({ error, apiData: { entryUid, variantUid }, log }: any) => {
-        log(this.config, `Failed to publish variant entry: '${variantUid}' of entry uid ${entryUid}`, 'error');
+        log(this.config, `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
         log(this.config, error, 'error');
       };
 
@@ -396,7 +402,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
 
   /**
    * Serializes the publish entries of a variant.
-   * @param variantEntry - The variant entry to serialize.
+   * @param variantEntry - The entry variant to serialize.
    * @returns An object containing the serialized publish entries.
    */
   serializePublishEntries(variantEntry: VariantEntryStruct): {
diff --git a/packages/contentstack-variants/src/messages/index.ts b/packages/contentstack-variants/src/messages/index.ts
index 4439565169..b79e89ec8c 100644
--- a/packages/contentstack-variants/src/messages/index.ts
+++ b/packages/contentstack-variants/src/messages/index.ts
@@ -16,6 +16,7 @@ const variantEntry = {
   IMPORT_ENTRY_NOT_FOUND: 'Entries data not found to import variant entries',
   EMPTY_VARIANT_UID_DATA: 'Empty variants entry mapper found!',
   VARIANT_ID_NOT_FOUND: 'Variant ID not found',
+  VARIANT_UID_NOT_FOUND: 'Entry Variant UID not found',
 };
 
 const expImportMsg = {
diff --git a/packages/contentstack-variants/src/utils/variant-api-adapter.ts b/packages/contentstack-variants/src/utils/variant-api-adapter.ts
index aeb1f73f22..1c4416be83 100644
--- a/packages/contentstack-variants/src/utils/variant-api-adapter.ts
+++ b/packages/contentstack-variants/src/utils/variant-api-adapter.ts
@@ -255,7 +255,7 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
 
     const errorMsg = data?.errors
       ? formatErrors(data.errors)
-      : data?.error_message || data?.message || 'Something went wrong while processing variant entries request!';
+      : data?.error_message || data?.message || 'Something went wrong while processing entry variant request!';
 
     throw errorMsg;
   }

From 2de74647f8c9e8e3d8296bd0cfcb4827e104b4fd Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Mon, 27 May 2024 20:01:23 +0530
Subject: [PATCH 4/4] added variant uid in publish logger msg

---
 .../contentstack-variants/src/import/variant-entries.ts     | 1 +
 .../contentstack-variants/src/utils/variant-api-adapter.ts  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/contentstack-variants/src/import/variant-entries.ts b/packages/contentstack-variants/src/import/variant-entries.ts
index 16cce99b41..97d8feb695 100644
--- a/packages/contentstack-variants/src/import/variant-entries.ts
+++ b/packages/contentstack-variants/src/import/variant-entries.ts
@@ -392,6 +392,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
           reject: onReject.bind(this),
           resolve: onSuccess.bind(this),
           log: log,
+          variantUid
         },
       );
 
diff --git a/packages/contentstack-variants/src/utils/variant-api-adapter.ts b/packages/contentstack-variants/src/utils/variant-api-adapter.ts
index 1c4416be83..89d46c5c7f 100644
--- a/packages/contentstack-variants/src/utils/variant-api-adapter.ts
+++ b/packages/contentstack-variants/src/utils/variant-api-adapter.ts
@@ -210,16 +210,16 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     options: PublishVariantEntryOptions,
     apiParams: Record<string, any>,
   ) {
-    const { reject, resolve, log } = apiParams;
+    const { reject, resolve, log, variantUid } = apiParams;
     const { entry_uid, content_type_uid } = options;
     let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/publish`;
 
     const onSuccess = (response: any) =>
-      resolve({ response, apiData: { entryUid: entry_uid, variantUid: input.entry.variants[0].uid }, log });
+      resolve({ response, apiData: { entryUid: entry_uid, variantUid }, log });
     const onReject = (error: any) =>
       reject({
         error,
-        apiData: { entryUid: entry_uid, variantUid: input.entry.variants[0].uid },
+        apiData: { entryUid: entry_uid, variantUid },
         log,
       });