Merge pull request #599 from contentstack/bugfix/CMG-589

Bugfix/cmg 589

Author: RohitKini

api/src/services/contentful.service.ts

@@ -939,16 +939,16 @@ const createLocale = async (packagePath: string, destination_stack_id: string, p
     }
     const fallbackMapLocales: any = { ...project?.master_locale ?? {}, ...project?.locales ?? {} }
     await Promise?.all(locales?.map?.(async (localeData: any) => {
-      const currentMapLocale = getKeyByValue?.(fallbackMapLocales, localeData?.code) ?? `${localeData.code.toLowerCase()}`;
+      const currentMapLocale = getKeyByValue?.(fallbackMapLocales, localeData?.code) ?? `${localeData?.code?.toLowerCase?.()}`;
       const title = localeData?.sys?.id;
       const newLocale: Locale = {
         code: currentMapLocale,
         name: localeCodes?.[currentMapLocale] || "English - United States",
         fallback_locale: getKeyByValue(fallbackMapLocales, localeData?.fallbackCode) ?? '',
         uid: `${title}`,
       };
-
-      if (localeData.default === true) {
+      const masterLocaleCode = getKeyByValue(project?.master_locale, localeData?.code);
+      if (masterLocaleCode !== undefined) {
         msLocale[title] = newLocale;
         const message = getLogMessage(
           srcFunc,
@@ -957,16 +957,26 @@ const createLocale = async (packagePath: string, destination_stack_id: string, p
         )
         await customLogger(projectId, destination_stack_id, 'info', message);
       } else {
-        allLocales[title] = newLocale;
-        const message = getLogMessage(
-          srcFunc,
-          `Locale ${newLocale?.code} has been successfully transformed.`,
-          {}
-        )
-        await customLogger(projectId, destination_stack_id, 'info', message);
+        if (project?.locales?.[localeData?.code]) {
+          allLocales[title] = newLocale;
+          const message = getLogMessage(
+            srcFunc,
+            `Locale ${newLocale?.code} has been successfully transformed.`,
+            {}
+          )
+          await customLogger(projectId, destination_stack_id, 'info', message);
+        }
       }
       localeList[title] = newLocale;
     }));
+    const masterLocaleData = Object?.values(msLocale)?.[0];
+    if (masterLocaleData) {
+      for (const [key, value] of Object.entries(allLocales) ?? {}) {
+        if (value?.code === masterLocaleData?.fallback_locale) {
+          allLocales[key].fallback_locale = masterLocaleData?.code
+        }
+      }
+    }
     await writeFile(localeSave, LOCALE_FILE_NAME, allLocales)
     await writeFile(localeSave, LOCALE_MASTER_LOCALE, msLocale)
     await writeFile(localeSave, LOCALE_CF_LANGUAGE, localeList)

upload-api/src/config/index.ts

@@ -2,7 +2,7 @@ export default {
   plan: {
     dropdown: { optionLimit: 100 }
   },
-  cmsType: 'sitecore',
+  cmsType: 'contentful',
   isLocalPath: true,
   awsData: {
     awsRegion: 'us-east-2',
@@ -13,5 +13,5 @@ export default {
     bucketKey: ''
   },
   // localPath: '/Users/sayali.joshi/Downloads/contentfulDummyEmbedData.json' //package 45.zip'
-  localPath: '/Users/umesh.more/Documents/ui-migration/migration-v2-node-server/upload-api/extracted_files/package 45.zip'
+  localPath: '/Users/umesh.more/Documents/contentful-export-4lcqjk0mwjez-master-2025-03-29T10-14-24.json'
 };