Merge pull request #450 from contentstack/feature/bug-test-mig

bug fixes

Author: RohitKini

api/package-lock.json

@@ -224,25 +224,25 @@ const startTestMigration = async (req: Request): Promise<any> => {
       case CMS.SITECORE_V8:
       case CMS.SITECORE_V9:
       case CMS.SITECORE_V10: {
-      if (packagePath) {
-            await siteCoreService?.createEntry({ packagePath, contentTypes, destinationStackId: project?.current_test_stack_id, projectId,keyMapper: project?.mapperKeys });
-            await siteCoreService?.createLocale(req, project?.current_test_stack_id, projectId);
-            await siteCoreService?.createVersionFile(project?.current_test_stack_id);
-          } 
-          break;
+        if (packagePath) {
+          await siteCoreService?.createEntry({ packagePath, contentTypes, master_locale: project?.stackDetails?.master_locale, destinationStackId: project?.current_test_stack_id, projectId, keyMapper: project?.mapperKeys });
+          await siteCoreService?.createLocale(req, project?.current_test_stack_id, projectId);
+          await siteCoreService?.createVersionFile(project?.current_test_stack_id);
+        }
+        break;
       }
       case CMS.WORDPRESS: {
         if (packagePath) {
           await wordpressService?.getAllAssets(file_path, packagePath, project?.current_test_stack_id, projectId)
           await wordpressService?.createAssetFolderFile(file_path, project?.current_test_stack_id, projectId)
           await wordpressService?.getAllreference(file_path, packagePath, project?.current_test_stack_id, projectId)
           await wordpressService?.extractChunks(file_path, packagePath, project?.current_test_stack_id, projectId)
-          await wordpressService?.getAllAuthors(file_path, packagePath,project?.current_test_stack_id, projectId,contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllAuthors(file_path, packagePath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys)
           //await wordpressService?.extractContentTypes(projectId, project?.current_test_stack_id, contentTypes)
-          await wordpressService?.getAllTerms(file_path, packagePath,project?.current_test_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.getAllTags(file_path, packagePath,project?.current_test_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.getAllCategories(file_path, packagePath,project?.current_test_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.extractPosts( packagePath,project?.current_test_stack_id, projectId,contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllTerms(file_path, packagePath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllTags(file_path, packagePath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllCategories(file_path, packagePath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.extractPosts(packagePath, project?.current_test_stack_id, projectId, contentTypes, project?.mapperKeys)
           await wordpressService?.extractGlobalFields(project?.current_test_stack_id, projectId)
           await wordpressService?.createVersionFile(project?.current_test_stack_id, projectId);
         }
@@ -312,12 +312,12 @@ const startMigration = async (req: Request): Promise<any> => {
           await wordpressService?.createAssetFolderFile(file_path, project?.destination_stack_id, projectId)
           await wordpressService?.getAllreference(file_path, packagePath, project?.destination_stack_id, projectId)
           await wordpressService?.extractChunks(file_path, packagePath, project?.destination_stack_id, projectId)
-          await wordpressService?.getAllAuthors(file_path, packagePath,project?.destination_stack_id, projectId,contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllAuthors(file_path, packagePath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys)
           //await wordpressService?.extractContentTypes(projectId, project?.destination_stack_id)
-          await wordpressService?.getAllTerms(file_path, packagePath,project?.destination_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.getAllTags(file_path, packagePath,project?.destination_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.getAllCategories(file_path, packagePath,project?.destination_stack_id, projectId,contentTypes, project?.mapperKeys)
-          await wordpressService?.extractPosts( packagePath,project?.destination_stack_id, projectId,contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllTerms(file_path, packagePath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllTags(file_path, packagePath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.getAllCategories(file_path, packagePath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys)
+          await wordpressService?.extractPosts(packagePath, project?.destination_stack_id, projectId, contentTypes, project?.mapperKeys)
           await wordpressService?.extractGlobalFields(project?.destination_stack_id, projectId)
           await wordpressService?.createVersionFile(project?.destination_stack_id, projectId);
 

api/src/services/migration.service.ts

@@ -630,7 +630,7 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
           title: extractValue(element?.contentstackField, item?.contentstackField, ' >')?.trim(),
         }
         const schema: any = convertToSchemaFormate({ field });
-        if (typeof schema === 'object' && Array.isArray(group?.schema)) {
+        if (typeof schema === 'object' && Array.isArray(group?.schema) && element?.isDeleted === false) {
           group.schema.push(schema);
         }
       })
@@ -643,7 +643,7 @@ export const contenTypeMaker = async ({ contentType, destinationStackId, project
           uid: item?.contentstackFieldUid
         }
       });
-      if (dt) {
+      if (dt && item?.isDeleted === false) {
         ct?.schema?.push(dt);
       }
     }

api/src/utils/content-type-creator.utils.ts

@@ -224,15 +224,15 @@ const writeGlobalField = async (schema: any, globalSave: string, filePath: strin
 const sortGlobalField = async (baseDir: string, finalData: any) => {
   const globalSave = path.join(process.cwd(), baseDir, GLOBAL_FIELDS_DIR_NAME);
   const globalPath = path.join(globalSave, GLOBAL_FIELDS_FILE_NAME);
-  if(fs.existsSync(globalPath)){
+  if (fs.existsSync(globalPath)) {
     const globalData = await JSON.parse(await fs.promises.readFile(globalPath, 'utf8'));
-  const globalResult = [];
-  for await (const ct of globalData) {
-    await lookForReference(ct, finalData);
-    globalResult?.push(ct);
+    const globalResult = [];
+    for await (const ct of globalData) {
+      await lookForReference(ct, finalData);
+      globalResult?.push(ct);
+    }
+    await writeGlobalField(globalResult, globalPath, globalPath);
   }
-  await writeGlobalField(globalResult, globalPath, globalPath);
-}
 }
 
 const sortContentType = async (baseDir: string, finalData: any) => {
@@ -271,12 +271,12 @@ export const testFolderCreator = async ({ destinationStackId }: any) => {
       }
     }
   }
-  const sortData = allData.sort((a, b) => b?.count - a?.count).slice?.(1, 4);
+  const sortData = allData?.length > 3 ? allData.sort((a, b) => b?.count - a?.count).slice?.(1, 4) : allData;
   const finalData: any = [];
   sortData.forEach((et: any) => {
     const entryObj: any = {};
-    const ctData = Object?.values?.(et?.entryData)?.splice?.(0, 5);
-    ctData?.forEach((entItem: any) => {
+    const ctData = et?.count > 4 ? Object?.values?.(et?.entryData)?.splice?.(0, 5) : et?.entryData;
+    ctData?.forEach?.((entItem: any) => {
       entryObj[entItem?.uid] = entItem;
     })
     finalData?.push({ contentType: et?.contentType, entryObj, locale: et?.locale });