pim-import 4.12.4 → 4.13.0

package/src/pim/methods/products.ts

@@ -325,19 +325,22 @@ const notVisibleToWebProduct = async (code: string): Promise<void> => {
   }
 };
 
-const setHideInRegionField = async (
-  productEntry: Entry,
+export const setHideInRegionField = async (
+  destinations: string[],
   pageData: CreateEntryProps
 ) => {
   const env = await getEnvironment();
   const defEnvLocaleCode = await getEnvironmentDefaultLocaleCode();
 
-  const productRegions = productEntry?.fields?.productFields?.[
-    defEnvLocaleCode
-  ]?.destinations
-    ?.filter((item: any) => item.code.includes("PROFESSIONAL_"))
+  const productRegions = destinations
+    ?.filter(
+      (item: any) =>
+        item?.code?.includes("PROFESSIONAL_") || item?.includes("PROFESSIONAL_")
+    )
     .map((item: any) => {
-      const region = item?.code?.replace("PROFESSIONAL_", "")?.toLowerCase();
+      const region =
+        item?.code?.replace("PROFESSIONAL_", "")?.toLowerCase() ||
+        item?.replace("PROFESSIONAL_", "")?.toLowerCase();
       return region === "china" ? "cn" : region;
     });
 
@@ -354,6 +357,7 @@ const setHideInRegionField = async (
     let count = 0;
     for (const item of items) {
       const region = item?.fields?.region?.[defEnvLocaleCode];
+
       if (!productRegions.includes(region)) {
         log(`Hide in region: ${region}`);
         pageData.fields = await addToRelationFields(
@@ -382,6 +386,7 @@ const getProductPageData = async (
   productEntry: Entry,
   productPageEntry: Entry
 ): Promise<CreateEntryProps> => {
+  const defEnvLocaleCode = await getEnvironmentDefaultLocaleCode();
   const pageData: CreateEntryProps = {
     fields: productPageEntry?.fields || {},
   };
@@ -400,7 +405,9 @@ const getProductPageData = async (
   );
 
   // hideInRegions
-  pageData.fields = await setHideInRegionField(productEntry, pageData);
+  const destinations =
+    productEntry?.fields?.productFields?.[defEnvLocaleCode]?.destinations;
+  pageData.fields = await setHideInRegionField(destinations, pageData);
   return pageData;
 };
 
@@ -1066,10 +1073,14 @@ const getProductData = async (
   );
 
   // Destinations
-  if(productDetails?.destinations?.length){
+  if (productDetails?.destinations?.length) {
     log(`set destinations`);
-    data.fields = await addFieldValue(data, "destinations", productDetails.destinations.map(item => item.code));
-  }else{
+    data.fields = await addFieldValue(
+      data,
+      "destinations",
+      productDetails.destinations.map((item) => item.code)
+    );
+  } else {
     log(`destinations not found`, "WARN");
   }
 
@@ -1631,7 +1642,15 @@ export const getAllProductEntriesByCatalog = async (
   return allItems;
 };
 
-const productAudit = async (audit: Audit, productEntries: Entry[], catalog: AvailableCatalogs, defaultEnvironmentLocaleCode: string, current: number, allAudit: Audit[], productPageEntries: Entry[]) => {
+const productAudit = async (
+  audit: Audit,
+  productEntries: Entry[],
+  catalog: AvailableCatalogs,
+  defaultEnvironmentLocaleCode: string,
+  current: number,
+  allAudit: Audit[],
+  productPageEntries: Entry[]
+) => {
   log(`Search product entry with id ${audit.product}...`);
   let productEntry = productEntries.find(
     (currentEntry) =>
@@ -1653,7 +1672,7 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
       const progress = Math.floor((++current / allAudit.length) * 100);
       serverUtils.updateProgress(progress);
     }
-    return {current, continue: true}
+    return { current, continue: true };
   }
 
   log(`Founded product with id ${productEntry.sys.id}`);
@@ -1671,17 +1690,14 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
   }
 
   log(`Get product catalogs...`);
-  const productCatalogs: AvailableCatalogs[] =
-    productEntry?.fields?.catalogs?.[defaultEnvironmentLocaleCode].map(
-      (entryCatalog: FieldItem) => {
-        return entryCatalog.sys.id;
-      }
-    );
+  const productCatalogs: AvailableCatalogs[] = productEntry?.fields?.catalogs?.[
+    defaultEnvironmentLocaleCode
+  ].map((entryCatalog: FieldItem) => {
+    return entryCatalog.sys.id;
+  });
 
   if (catalog && !productCatalogs.includes(catalog)) {
-    log(
-      `Product ${audit.product} does not belong to the ${catalog} catalog`
-    );
+    log(`Product ${audit.product} does not belong to the ${catalog} catalog`);
   } else if (["PRODUCT_UNPUBLISH", "PRODUCT_WEBOFF"].includes(audit.what)) {
     log(`Set the product status as archive...`);
     // Set the product status as archive
@@ -1699,11 +1715,7 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
           `Creating redirect from ${audit.product} to ${audit.upgradeProduct}`
         );
         const pageEntryToId = getProductPageIdByCode(audit.upgradeProduct);
-        const pageEntryTo = await getEntryByID(
-          pageEntryToId,
-          "page",
-          "sys.id"
-        );
+        const pageEntryTo = await getEntryByID(pageEntryToId, "page", "sys.id");
 
         if (pageEntryTo) {
           // Save redirect
@@ -1730,7 +1742,7 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
     for (const item of audit?.catalogs) {
       if (!item?.where) {
         log(
-          `catalogs.where field not exists. Product: ${audit.product} `, 
+          `catalogs.where field not exists. Product: ${audit.product} `,
           "WARN"
         );
       } else {
@@ -1763,8 +1775,7 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
           );
         }
         if (item?.models) {
-          const modelsFieldKey =
-            "models" + capitalizeFirstLetter(item.where);
+          const modelsFieldKey = "models" + capitalizeFirstLetter(item.where);
           productEntry.fields = await removeFromRelationFields(
             productEntry,
             modelsFieldKey,
@@ -1792,15 +1803,20 @@ const productAudit = async (audit: Audit, productEntries: Entry[], catalog: Avai
       }
     }
   } else {
-    log(
-      `It has not yet been defined how to process the state ${audit.what}`
-    );
+    log(`It has not yet been defined how to process the state ${audit.what}`);
   }
 
-  return {current, continue: false}
-}
+  return { current, continue: false };
+};
 
-const familyAudit = async (audit: Audit, familyEntries: Entry[], catalog: AvailableCatalogs, defaultEnvironmentLocaleCode: string, current: number, allAudit: Audit[]) => {
+const familyAudit = async (
+  audit: Audit,
+  familyEntries: Entry[],
+  catalog: AvailableCatalogs,
+  defaultEnvironmentLocaleCode: string,
+  current: number,
+  allAudit: Audit[]
+) => {
   log(`Search family entry with id ${audit.product}...`);
   let familyEntry = familyEntries.find(
     (currentEntry) =>
@@ -1822,35 +1838,34 @@ const familyAudit = async (audit: Audit, familyEntries: Entry[], catalog: Availa
       const progress = Math.floor((++current / allAudit.length) * 100);
       serverUtils.updateProgress(progress);
     }
-    return {current, continue: true}
+    return { current, continue: true };
   }
 
   log(`Founded family with id ${familyEntry.sys.id}`);
 
   log(`Get family catalogs...`);
-  const familyCatalogs: AvailableCatalogs[] =
-  familyEntry?.fields?.catalogs?.[defaultEnvironmentLocaleCode].map(
-      (entryCatalog: FieldItem) => {
-        return entryCatalog.sys.id;
-      }
-    );
+  const familyCatalogs: AvailableCatalogs[] = familyEntry?.fields?.catalogs?.[
+    defaultEnvironmentLocaleCode
+  ].map((entryCatalog: FieldItem) => {
+    return entryCatalog.sys.id;
+  });
 
   if (catalog && !familyCatalogs.includes(catalog)) {
-    log(
-      `Family ${audit.product} does not belong to the ${catalog} catalog`
-    );
+    log(`Family ${audit.product} does not belong to the ${catalog} catalog`);
   } else if (audit.what === "REMOVE_FAMILY_RELATIONS") {
     for (const item of audit?.catalogs) {
       if (!item?.where) {
         log(
-          `catalogs.where field not exists. Family: ${audit.product} `, 
+          `catalogs.where field not exists. Family: ${audit.product} `,
           "WARN"
         );
       } else {
-        if(item.where === "DESIGNERS" && item?.codes){
-          const designers = item.codes.split(',')
-          for(const designer of designers){
-            log(`Remove ${designer} designer to ${familyEntry.sys.id} family if exists`)
+        if (item.where === "DESIGNERS" && item?.codes) {
+          const designers = item.codes.split(",");
+          for (const designer of designers) {
+            log(
+              `Remove ${designer} designer to ${familyEntry.sys.id} family if exists`
+            );
             familyEntry.fields = await removeFromRelationFields(
               familyEntry,
               "designer",
@@ -1863,15 +1878,20 @@ const familyAudit = async (audit: Audit, familyEntries: Entry[], catalog: Availa
       }
     }
   } else {
-    log(
-      `It has not yet been defined how to process the state ${audit.what}`
-    );
+    log(`It has not yet been defined how to process the state ${audit.what}`);
   }
 
-  return {current, continue: false}
-}
+  return { current, continue: false };
+};
 
-const subFamilyAudit = async (audit: Audit, subfamilyEntries: Entry[], catalog: AvailableCatalogs, defaultEnvironmentLocaleCode: string, current: number, allAudit: Audit[]) => {
+const subFamilyAudit = async (
+  audit: Audit,
+  subfamilyEntries: Entry[],
+  catalog: AvailableCatalogs,
+  defaultEnvironmentLocaleCode: string,
+  current: number,
+  allAudit: Audit[]
+) => {
   log(`Search subFamily entry with id ${audit.product}...`);
   let subFamilyEntry = subfamilyEntries.find(
     (currentEntry) =>
@@ -1893,30 +1913,31 @@ const subFamilyAudit = async (audit: Audit, subfamilyEntries: Entry[], catalog:
       const progress = Math.floor((++current / allAudit.length) * 100);
       serverUtils.updateProgress(progress);
     }
-    return {current, continue: true}
+    return { current, continue: true };
   }
 
   log(`Founded subFamily with id ${subFamilyEntry.sys.id}`);
 
   log(`Get subFamily catalogs...`);
-  const subFamilyCatalog: AvailableCatalogs = subFamilyEntry?.fields?.catalog?.[defaultEnvironmentLocaleCode].sys.id;
+  const subFamilyCatalog: AvailableCatalogs =
+    subFamilyEntry?.fields?.catalog?.[defaultEnvironmentLocaleCode].sys.id;
 
   if (catalog && subFamilyCatalog !== catalog) {
-    log(
-      `SubFamily ${audit.product} does not belong to the ${catalog} catalog`
-    );
+    log(`SubFamily ${audit.product} does not belong to the ${catalog} catalog`);
   } else if (audit.what === "REMOVE_SUBFAMILY_RELATIONS") {
     for (const item of audit?.catalogs) {
       if (!item?.where) {
         log(
-          `catalogs.where field not exists. SubFamily: ${audit.product} `, 
+          `catalogs.where field not exists. SubFamily: ${audit.product} `,
           "WARN"
         );
       } else {
-        if(item.where === "DESIGNERS" && item?.codes){
-          const designers = item.codes.split(',')
-          for(const designer of designers){
-            log(`Remove ${designer} designer to ${subFamilyEntry.sys.id} subFamily if exists`)
+        if (item.where === "DESIGNERS" && item?.codes) {
+          const designers = item.codes.split(",");
+          for (const designer of designers) {
+            log(
+              `Remove ${designer} designer to ${subFamilyEntry.sys.id} subFamily if exists`
+            );
             subFamilyEntry.fields = await removeFromRelationFields(
               subFamilyEntry,
               "designer",
@@ -1929,13 +1950,11 @@ const subFamilyAudit = async (audit: Audit, subfamilyEntries: Entry[], catalog:
       }
     }
   } else {
-    log(
-      `It has not yet been defined how to process the state ${audit.what}`
-    );
+    log(`It has not yet been defined how to process the state ${audit.what}`);
   }
 
-  return {current, continue: false}
-}
+  return { current, continue: false };
+};
 
 /**
  *
@@ -2002,10 +2021,20 @@ export const audit = async (
     const defaultEnvironmentLocaleCode =
       await getEnvironmentDefaultLocaleCode();
 
-    const productAuditWhat = ["PRODUCT_UNPUBLISH", "PRODUCT_WEBOFF","REMOVE_PRODUCT_RELATIONS"]
-    const productCodes = allAudit.filter(item => productAuditWhat.includes(item.what)).map((audit) => audit.product);
-    const familyCodes = allAudit.filter(item => item.what === "REMOVE_FAMILY_RELATIONS").map((audit) => audit.product);
-    const subFamilyCodes = allAudit.filter(item => item.what === "REMOVE_SUBFAMILY_RELATIONS").map((audit) => audit.product);
+    const productAuditWhat = [
+      "PRODUCT_UNPUBLISH",
+      "PRODUCT_WEBOFF",
+      "REMOVE_PRODUCT_RELATIONS",
+    ];
+    const productCodes = allAudit
+      .filter((item) => productAuditWhat.includes(item.what))
+      .map((audit) => audit.product);
+    const familyCodes = allAudit
+      .filter((item) => item.what === "REMOVE_FAMILY_RELATIONS")
+      .map((audit) => audit.product);
+    const subFamilyCodes = allAudit
+      .filter((item) => item.what === "REMOVE_SUBFAMILY_RELATIONS")
+      .map((audit) => audit.product);
     const otherFilters = [];
     if (catalog) {
       otherFilters.push({ key: "fields.catalogs.sys.id[in]", value: catalog });
@@ -2020,8 +2049,8 @@ export const audit = async (
     );
     log(`Founded ${productEntries.length} topicProduct`);
 
-    let familyEntries: Entry[] = []
-    if(familyCodes.length){
+    let familyEntries: Entry[] = [];
+    if (familyCodes.length) {
       familyEntries = await getAllEntriesByCodes(
         familyCodes,
         "topicFamily",
@@ -2032,8 +2061,8 @@ export const audit = async (
     }
     log(`Founded ${familyEntries.length} topicFamily`);
 
-    let subFamilyEntries: Entry[] = []
-    if(subFamilyCodes.length){
+    let subFamilyEntries: Entry[] = [];
+    if (subFamilyCodes.length) {
       subFamilyEntries = await getAllEntriesByCodes(
         subFamilyCodes,
         "topicSubFamily",
@@ -2044,7 +2073,11 @@ export const audit = async (
     }
     log(`Founded ${subFamilyEntries.length} topicSubFamily`);
 
-    if (!productEntries.length && !familyEntries.length && !subFamilyEntries.length) {
+    if (
+      !productEntries.length &&
+      !familyEntries.length &&
+      !subFamilyEntries.length
+    ) {
       log(
         `No items found between offset: ${offset} and limit: ${limit}. Total: ${total}`
       );
@@ -2092,23 +2125,45 @@ export const audit = async (
       log(`${++count} of ${total}`);
       log(`I process the item ${audit.product} with status ${audit.what}`);
 
-      if(productAuditWhat.includes(audit.what)){
-        const result = await productAudit(audit, productEntries, catalog, defaultEnvironmentLocaleCode, current, allAudit, productPageEntries)
-        current = result.current
-        if(result.continue){
-          continue
+      if (productAuditWhat.includes(audit.what)) {
+        const result = await productAudit(
+          audit,
+          productEntries,
+          catalog,
+          defaultEnvironmentLocaleCode,
+          current,
+          allAudit,
+          productPageEntries
+        );
+        current = result.current;
+        if (result.continue) {
+          continue;
         }
-      }else if(audit.what === "REMOVE_FAMILY_RELATIONS"){
-        const result = await familyAudit(audit, familyEntries, catalog, defaultEnvironmentLocaleCode, current, allAudit)
-        current = result.current
-        if(result.continue){
-          continue
+      } else if (audit.what === "REMOVE_FAMILY_RELATIONS") {
+        const result = await familyAudit(
+          audit,
+          familyEntries,
+          catalog,
+          defaultEnvironmentLocaleCode,
+          current,
+          allAudit
+        );
+        current = result.current;
+        if (result.continue) {
+          continue;
         }
-      }else if(audit.what === "REMOVE_SUBFAMILY_RELATIONS"){
-        const result = await subFamilyAudit(audit, subFamilyEntries, catalog, defaultEnvironmentLocaleCode, current, allAudit)
-        current = result.current
-        if(result.continue){
-          continue
+      } else if (audit.what === "REMOVE_SUBFAMILY_RELATIONS") {
+        const result = await subFamilyAudit(
+          audit,
+          subFamilyEntries,
+          catalog,
+          defaultEnvironmentLocaleCode,
+          current,
+          allAudit
+        );
+        current = result.current;
+        if (result.continue) {
+          continue;
         }
       }
 
@@ -2130,7 +2185,8 @@ export const audit = async (
       completed: limit === -1 || count >= total,
       s3FilePath,
       total,
-      processedEntries: productEntries.length + familyEntries.length + subFamilyEntries.length,
+      processedEntries:
+        productEntries.length + familyEntries.length + subFamilyEntries.length,
     };
   } else {
     log(`Execution completed`);
@@ -2890,44 +2946,52 @@ export const reimportAuditProducts = async (
   };
 };
 
-
 export const populateDestinations = async (offset: number, limit: number) => {
   const env = await getEnvironment();
   const defEnvLocaleCode = await getEnvironmentDefaultLocaleCode();
 
   const opts = {
-    content_type: 'topicProduct',
+    content_type: "topicProduct",
     skip: offset,
     limit,
     locale: defEnvLocaleCode,
     // select: 'sys.id,fields',
     "sys.archivedAt[exists]": false,
+    // "fields.destinations[exists]": false,
   };
-  const {items, total} = await env.getEntries(opts);
+
+  const { items, total } = await env.getEntries(opts);
 
   let count: number = offset;
   for (let productEntry of items) {
-      log(`${++count} of ${total}`);
-      log(`Product: ${productEntry.sys.id}`);
-     const destinations = productEntry.fields.productFields[defEnvLocaleCode]?.destinations?.map((destination:any) => destination.code) || []
-
-     if(destinations.length){
-     log(`Set destinations: ${destinations.join(', ')}`)
-     productEntry.fields = await addFieldValue(productEntry, "destinations", destinations)
-     productEntry = await productEntry.update();
-    }else{
-      log(`No destinations found.`, "WARN")
+    log(`${++count} of ${total}`);
+    log(`Product: ${productEntry.sys.id}`);
+    const destinations =
+      productEntry.fields.productFields[defEnvLocaleCode]?.destinations?.map(
+        (destination: any) => destination.code
+      ) || [];
+
+    if (destinations.length) {
+      log(`Set destinations: ${destinations.join(", ")}`);
+      productEntry.fields = await addFieldValue(
+        productEntry,
+        "destinations",
+        destinations
+      );
+      productEntry = await productEntry.update();
+    } else {
+      log(`No destinations found.`, "WARN");
     }
 
-     if (productEntry.isPublished()) {
-       try {
-         productEntry = await productEntry.publish();
-       } catch (err) {
-         log(`Cannot publish entry.`);
-         log(err);
-       }
-     }
+    if (productEntry.isPublished()) {
+      try {
+        productEntry = await productEntry.publish();
+      } catch (err) {
+        log(`Cannot publish entry.`);
+        log(err);
+      }
     }
+  }
 
-    return {completed: total === count + offset, offset, limit}
-}
+  return { completed: !total || total === count + offset, offset, limit };
+};

package/src/pim/methods/subfamilies.ts

@@ -37,6 +37,7 @@ import {
 import { updateSubFamiliesRelToEntry, getCategoryTopicCode } from "./catalogs";
 import { pageResponse } from "../../algolia/families";
 import { addDesignerData } from "./designers";
+import { setHideInRegionField } from "./products";
 
 const getComponentModelPagesData = async (
   componentID: string,
@@ -116,6 +117,7 @@ const getSubFamilyPageData = async (
   subFamilyEntry: Entry,
   subFamilyPageEntry: Entry
 ): Promise<CreateEntryProps> => {
+  const defEnvLocaleCode = await getEnvironmentDefaultLocaleCode();
   const pageData: CreateEntryProps = {
     fields: subFamilyPageEntry?.fields || {},
   };
@@ -142,6 +144,10 @@ const getSubFamilyPageData = async (
     true
   );
 
+  const destinations =
+    subFamilyEntry?.fields?.destinations?.[defEnvLocaleCode] || [];
+  pageData.fields = await setHideInRegionField(destinations, pageData);
+
   return pageData;
 };
 
@@ -397,18 +403,20 @@ const getTopicSubFamilyData = async (
   }
 
   // Destinations
-  if(subFamily?.destinations?.length){
+  if (subFamily?.destinations?.length) {
     log(`set destinations`);
-    data.fields = await addFieldValue(data, "destinations", subFamily.destinations);
-  }else{
+    data.fields = await addFieldValue(
+      data,
+      "destinations",
+      subFamily.destinations
+    );
+  } else {
     log(`destinations not found`, "WARN");
   }
 
   // lastPimSyncDate
   data.fields = await addFieldValue(data, "lastPimSyncDate", getLocalISOTime());
 
-
-
   return data;
 };
 

package/types/algolia/families.d.ts

@@ -17,6 +17,7 @@ export declare type AlgoliaFamilyRecord = {
     productFields: TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
+    destinations?: string[];
     lastSyncDate: string;
 };
 export declare const reindexFamilies: (offset?: number, limit?: number, catalogCode?: AvailableCatalogs | undefined) => Promise<{
@@ -42,6 +43,7 @@ export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<fals
     productFields: TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
+    destinations?: string[] | undefined;
     lastSyncDate: string;
     taskID: number;
 }>;

package/types/algolia/models.d.ts

@@ -18,6 +18,7 @@ export declare const reindexModel: (topicModelId: string) => Promise<{
     colors?: string[] | undefined;
     designer?: TopicDetailsResponse | undefined;
     lastSyncDate?: string | undefined;
+    destinations?: string[] | undefined;
     taskID: number;
 }>;
 export declare const reindexModels: (offset?: number, limit?: number, catalogCode?: AvailableCatalogs | undefined) => Promise<{

package/types/algolia/subFamilies.d.ts

@@ -22,6 +22,7 @@ export declare const reindexSubFamily: (topicSubFamilyEntryId: string) => Promis
     productFields: import("../types").TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
+    destinations?: string[] | undefined;
     lastSyncDate: string;
     taskID: number;
 }>;

package/types/algolia/subModels.d.ts

@@ -13,6 +13,7 @@ export declare const reindexSubModel: (topicSubModelId: string) => Promise<{
     isNew?: boolean | undefined;
     priority?: number | undefined;
     productCounter?: number | undefined;
+    destinations?: string[] | undefined;
     lastSyncDate?: string | undefined;
     taskID: number;
 }>;

package/types/pim/methods/products.d.ts

@@ -1,8 +1,10 @@
 import { ProductDetails } from "../../resources/ProductDetails";
 import { AvailableCatalogs } from "../../types";
-import type { Entry } from "contentful-management/dist/typings/entities/entry";
+import type { Entry, CreateEntryProps } from "contentful-management/dist/typings/entities/entry";
+import { KeyValueMap } from "contentful-management/dist/typings/common-types";
 export declare type AvailableProductStatus = "To be review" | "Published" | "Unpublished";
 export declare type AvailableRelationFieldKeys = "accessories" | "accessoryOf" | "bulbOf" | "sparepartOf" | "bulbs" | "spareparts";
+export declare const setHideInRegionField: (destinations: string[], pageData: CreateEntryProps) => Promise<KeyValueMap>;
 export declare const certificationFields: string[];
 export declare const excludeCertificationFieldsKeys: string[];
 export declare const getProductPageIdByCode: (productCode: string) => string;