Merge pull request #671 from contentstack/feature/rohit-contentful

Feature/rohit contentful

Author: sayalijoshi27

upload-api/migration-contentful/libs/contentTypeMapper.js

@@ -23,7 +23,7 @@ const appDetails = require('../utils/apps/appDetails.json')
  */
 const uidCorrector = (uid, affix) => {
   let newId = uid;
-  if (restrictedUid?.includes?.(uid)) {
+  if (restrictedUid?.includes?.(uid) || uid?.startsWith?.('_ids') || uid?.endsWith?.('_ids')) {
     newId = uid?.replace?.(uid, `${affix}_${uid}`);
     newId = newId?.replace?.(/[^a-zA-Z0-9]+/g, '_');
   }

upload-api/migration-contentful/libs/createInitialMapper.js

@@ -36,7 +36,7 @@ const idArray = require('../utils/restrictedKeyWords');
  */
 const uidCorrector = (uid, prefix) => {
   let newId = uid;
-  if (idArray.includes(uid)) {
+  if (idArray.includes(uid) || uid.startsWith('_ids') || uid.endsWith('_ids')) {
     newId = uid.replace(uid, `${prefix}_${uid}`);
     newId = newId.replace(/[^a-zA-Z0-9]+/g, '_');
   }
@@ -62,7 +62,7 @@ const uidCorrector = (uid, prefix) => {
  *
  * // Outputs: an array of content type objects, each containing metadata and field mappings.
  */
-const createInitialMapper = async () => {
+const createInitialMapper = async (affix="") => {
   try {
     const initialMapper = [];
     const files = await fs.readdir(
@@ -82,7 +82,7 @@ const createInitialMapper = async () => {
         otherCmsTitle: title,
         otherCmsUid: data[0]?.contentfulID,
         contentstackTitle: title.charAt(0).toUpperCase() + title.slice(1),
-        contentstackUid: uidCorrector(data[0]?.contentUid),
+        contentstackUid: uidCorrector(data[0]?.contentUid,affix),
         type: 'content_type',
         fieldMapping: []
       };

upload-api/src/services/contentful/index.ts

@@ -19,7 +19,7 @@ const createContentfulMapper = async (
     const fetchedLocales: [] = await extractLocale(cleanLocalPath);
 
     await extractContentTypes(cleanLocalPath, affix);
-    const initialMapper = await createInitialMapper();
+    const initialMapper = await createInitialMapper(affix);
     const req = {
       method: 'post',
       maxBodyLength: Infinity,