Merge pull request #1099 from contentstack/fix/CS-41904

fixed entry overwrite issues
contentstack · Oct 11, 2023 · b7d4074 · b7d4074
2 parents e4090f8 + 32d300f
commit b7d4074
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/packages/contentstack-export/src/export/module-exporter.ts b/packages/contentstack-export/src/export/module-exporter.ts
@@ -37,6 +37,7 @@ class ModuleExporter {
       try {
         this.exportConfig.branchName = branch.uid;
         this.exportConfig.branchDir = path.join(this.exportConfig.exportDir, branch.uid);
+        log(this.exportConfig, `Exporting content from branch ${branch.uid}`, 'success');
         await this.export();
         log(this.exportConfig, `The content of branch ${branch.uid} has been exported successfully!`, 'success');
       } catch (error) {

diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts
@@ -333,14 +333,24 @@ export default class EntriesImport extends BaseClass {
     const onReject = ({ error, apiData: entry, additionalInfo }: any) => {
       const { title, uid } = entry;
       //Note: write existing entries into files to handler later
-      if (error?.errors?.title) {
-        if (this.importConfig.replaceExisting) {
-          entry.entryOldUid = uid;
-          entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
-          existingEntriesFileHelper.writeIntoFile({ [uid]: entry } as any, { mapKeyVal: true });
-        }
-        if (!this.importConfig.skipExisting) {
-          log(this.importConfig, `Entry '${title}' already exists`, 'info');
+      if (error.errorCode === 119) {
+        if (error?.errors?.title || error?.errors?.uid) {
+          if (this.importConfig.replaceExisting) {
+            entry.entryOldUid = uid;
+            entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
+            existingEntriesFileHelper.writeIntoFile({ [uid]: entry } as any, { mapKeyVal: true });
+          }
+          if (!this.importConfig.skipExisting) {
+            log(this.importConfig, `Entry '${title}' already exists`, 'info');
+          }
+        } else {
+          log(
+            this.importConfig,
+            `${title} entry of content type ${cTUid} in locale ${locale} failed to create`,
+            'error',
+          );
+          log(this.importConfig, formatError(error), 'error');
+          this.failedEntries.push({ content_type: cTUid, locale, entry: { uid, title } });
         }
       } else {
         log(this.importConfig, `${title} entry of content type ${cTUid} in locale ${locale} failed to create`, 'error');
@@ -518,18 +528,19 @@ export default class EntriesImport extends BaseClass {
   }) {
     const { additionalInfo: { cTUid, locale } = {} } = apiParams;
     return new Promise(async (resolve, reject) => {
-      const { items: [entryInStack] = [] }: any = await this.stack
-        .contentType(cTUid)
-        .entry()
-        .query({ query: { title: entry.title, locale } })
-        .findOne()
-        .catch((error: Error) => {
-          apiParams.reject({
-            error,
-            apiData: entry,
-          });
-          reject(true);
-        });
+      const { items: [entryInStack] = [] }: any =
+        (await this.stack
+          .contentType(cTUid)
+          .entry()
+          .query({ query: { title: entry.title, locale } })
+          .findOne()
+          .catch((error: Error) => {
+            apiParams.reject({
+              error,
+              apiData: entry,
+            });
+            reject(true);
+          })) || {};
       if (entryInStack) {
         const entryPayload = this.stack.contentType(cTUid).entry(entryInStack.uid);
         Object.assign(entryPayload, entryInStack, cloneDeep(entry), {
@@ -539,7 +550,7 @@ export default class EntriesImport extends BaseClass {
           _version: entryInStack._version,
         });
         return entryPayload
-          .update()
+          .update({ locale })
           .then((response: any) => {
             apiParams.resolve({
               response,
@@ -556,7 +567,7 @@ export default class EntriesImport extends BaseClass {
           });
       } else {
         apiParams.reject({
-          error: new Error(`Extension with title ${entry.title} not found in the stack`),
+          error: new Error(`Entry with title ${entry.title} not found in the stack`),
           apiData: entry,
         });
         reject(true);