pim-import 2.5.0 → 2.7.0

package/src/pim/methods/products.ts

@@ -6,6 +6,7 @@ import {
 import { AllProductsEntry } from "../../resources/AllProducts";
 import { ProductRelation } from "../../resources/ProductRelation";
 import { FieldItem } from "../../resources/cfFields";
+import { Audit } from "../../resources/Audit";
 import {
   AvailableCatalogs,
   CfLocalizedEntryField,
@@ -1585,51 +1586,106 @@ export const setProductsColorRelationships = async (
 };
 
 /**
- * Audit - Checks if there are products to publish or unpublish
  *
- * TODO: È uno dei punti critici dell'import, in quanto dovento interrogare tutti i topicProduct che hanno
- * un code presente tra quelli restituiti dall'endpoint audit/?fromDate=20200228T01:01:00 (no filtro per catalogo ne per famiglia)
- * la query di Contenful richiede parecchio tempo e può capitare che ritorni error 429 "Too Many Request"
+ * Audit - Checks if there are products to publish or unpublish
  *
  * @param {string} lastModified The last modified data. Format: 20200426T07:50:00 - yearmonthdayThour:minute:second
  * @param {string} catalog
  */
 export const audit = async (
   lastModified: string,
-  catalog?: AvailableCatalogs
+  catalog: AvailableCatalogs,
+  offset: number = 0,
+  limit: number = 150,
+  s3FilePath: string = ""
 ) => {
   const timeStart = new Date();
   log(`audit - lastModified: ${lastModified} catalog: ${catalog}`, "INFO");
-  const allAudit = await getAudit(lastModified);
+
+  // if not exists save data to s3
+  if (!s3FilePath) {
+    const allAudit = await getAudit(lastModified);
+    if (!allAudit) {
+      log(`No audits were found to process for the date ${lastModified}`);
+      return {
+        offset: Number(offset),
+        limit: Number(limit),
+        completed: true,
+        s3FilePath: "",
+      };
+    }
+
+    const filename = `${lastModified}-all-audit.json`;
+    const path = `audit`;
+    await saveJsonToS3(allAudit, filename, path);
+    const s3Path = `${path}/${filename}`;
+
+    return {
+      offset: Number(offset),
+      limit: Number(limit),
+      completed: false,
+      s3FilePath: s3Path,
+    };
+  }
+
+  // get data from s3
+  let allAudit: Audit[] = await getFileFromS3(s3FilePath);
+  const total: number = allAudit.length;
+  allAudit = allAudit.slice(offset, offset + limit);
 
   if (allAudit) {
     const defaultEnvironmentLocaleCode =
       await getEnvironmentDefaultLocaleCode();
-    const total = allAudit.length;
-    let count = 0;
 
     const productCodes = allAudit.map((audit) => audit.product);
+    const otherFilters = [];
+    if (catalog) {
+      otherFilters.push({ key: "fields.catalogs.sys.id[in]", value: catalog });
+    }
     const entries = await getAllEntriesByCodes(
       productCodes,
       "topicProduct",
-      "sys,fields.code,fields.catalogs,fields.pimStatus"
+      "sys,fields",
+      "fields.code",
+      otherFilters
     );
 
-    await sleep(2000, true);
+    if (!entries.length) {
+      log(
+        `No products found between offset: ${offset} and limit: ${limit}. Total: ${total}`
+      );
+      const nextOffset = Number(offset) + Number(limit);
+      const completed = limit === -1 || nextOffset >= total;
+      if (completed) {
+        log(`Audit completed`);
+      }
 
-    const pageCodes = allAudit.map((audit) =>
-      getProductPageIdByCode(audit.product)
+      const tEnd = new Date();
+      const secs = secondBetweenTwoDate(timeStart, tEnd);
+      log(`Execution time: ${secs} seconds`);
+
+      return {
+        offset: nextOffset,
+        limit: Number(limit),
+        completed,
+        s3FilePath,
+      };
+    }
+
+    const pageCodes = entries.map((entry: Entry) =>
+      getProductPageIdByCode(entry.fields.code[defaultEnvironmentLocaleCode])
     );
+
     const entriesPage = await getAllEntriesByCodes(
       pageCodes,
       "page",
-      "sys",
+      "sys,fields",
       "sys.id"
     );
 
+    let count: number = offset;
     for (const audit of allAudit) {
-      ++count;
-      log(`${count} of ${total}`);
+      log(`${++count} of ${total}`);
       log(`I process the product ${audit.product} with status ${audit.what}`);
 
       log(`Search product entry...`);
@@ -1642,11 +1698,11 @@ export const audit = async (
       if (!productEntry) {
         if (catalog) {
           log(
-            `The product was not found in the CMS with catalog ${catalog}`,
+            `The ${audit.product} product was not found in the CMS with catalog ${catalog}`,
             "WARN"
           );
         } else {
-          log(`The product was not found in the CMS`, "WARN");
+          log(`The ${audit.product} product was not found in the CMS`, "WARN");
         }
         continue;
       }
@@ -1660,9 +1716,9 @@ export const audit = async (
       }
 
       log(`Search product page entry...`);
-      let pageEntry = entriesPage.find(
-        (currentEntry) =>
-          currentEntry.sys.id === getProductPageIdByCode(audit.product)
+      const pageEntryFromId = getProductPageIdByCode(audit.product);
+      let pageEntryFrom = entriesPage.find(
+        (currentEntry) => currentEntry.sys.id === pageEntryFromId
       );
 
       log(`Get product catalogs...`);
@@ -1700,31 +1756,40 @@ export const audit = async (
           );
         }
 
-        if (pageEntry) {
-          if (pageEntry.isPublished()) {
-            log(`Unpublish page ${pageEntry.sys.id}`);
-            pageEntry = await pageEntry.unpublish(); // AUDIT_PRODUCT_STATUS
-          } else {
-            log(`The page ${pageEntry.sys.id} is already unpublish`);
-          }
-        } else {
-          log(`Page PAGE_${audit.product} not found`);
-        }
-        if (audit.upgradeProduct && audit.upgradeProduct !== "0") {
-          log(
-            `Creating redirect from ${audit.product} to ${audit.upgradeProduct}`
-          );
-          const upgradeProductEntry: Entry = await getEntryByCode(
-            audit.upgradeProduct,
-            "topicProduct"
-          );
-          if (upgradeProductEntry) {
-            // TODO: Creare redirect
-          } else {
+        if (pageEntryFrom?.fields) {
+          if (audit.upgradeProduct && audit.upgradeProduct !== "0") {
             log(
-              `Can't create redirect ${audit.product} to ${audit.upgradeProduct} because the topicProduct ${audit.upgradeProduct} not found.`
+              `Creating redirect from ${audit.product} to ${audit.upgradeProduct}`
             );
+            const pageEntryToId = getProductPageIdByCode(audit.upgradeProduct);
+            const pageEntryTo = await getEntryByID(
+              pageEntryToId,
+              "page",
+              "sys.id"
+            );
+
+            if (pageEntryTo) {
+              // Save redirect
+              pageEntryFrom.fields = await addToRelationFields(
+                pageEntryFrom,
+                "redirectTo",
+                pageEntryTo.sys.id
+              );
+              pageEntryFrom = await pageEntryFrom.update();
+            } else {
+              log(
+                `Can't create redirect ${audit.product} to ${audit.upgradeProduct} because the page ${pageEntryToId} not found.`
+              );
+              if (pageEntryFrom.isPublished()) {
+                pageEntryFrom = await pageEntryFrom.unpublish(); // AUDIT_PRODUCT_STATUS
+                log(`${pageEntryFrom.sys.id} page unpublished`);
+              } else {
+                log(`${pageEntryFrom.sys.id} page is already unpublish`);
+              }
+            }
           }
+        } else {
+          log(`${pageEntryFromId} page from not found`);
         }
       } else {
         log(
@@ -1732,12 +1797,32 @@ export const audit = async (
         );
       }
     }
+
+    const nextOffset = Number(offset) + Number(limit);
+
+    const tEnd = new Date();
+    const secs = secondBetweenTwoDate(timeStart, tEnd);
+    log(`Execution time: ${secs} seconds`);
+
+    return {
+      offset: nextOffset,
+      limit: Number(limit),
+      completed: limit === -1 || count >= total,
+      s3FilePath,
+    };
   } else {
-    log(`No audits were found to process for the date ${lastModified}`);
+    log(`Execution completed`);
   }
   const tEnd = new Date();
   const secs = secondBetweenTwoDate(timeStart, tEnd);
   log(`Request time: ${secs} seconds`);
+
+  return {
+    offset: Number(offset),
+    limit: Number(limit),
+    completed: true,
+    s3FilePath,
+  };
 };
 
 export const importProductByCode = async (

package/src/pim/methods/subfamilies.ts

@@ -526,7 +526,7 @@ export const getSubFamilyPageSlugWithDetails = async (
 ): Promise<pageResponse> => {
   const subFamilyEntryId = subFamilyEntry?.sys?.id;
   if (!subFamilyEntryId) {
-    log(`Invalid subFamilyEntry`, "WARN");
+    log(`Invalid subFamilyEntry`, "ERROR");
   }
   const defaultEnvironmentLocaleCode = await getEnvironmentDefaultLocaleCode();
   const catalogEntryId =

package/src/types.ts

@@ -147,6 +147,29 @@ export type AssetPropFields = {
   };
 };
 
+export type AssetPropFieldsWithoutLocaleKey = {
+  /** Title for this asset */
+  title: {
+    [key: string]: string;
+  };
+  /** Description for this asset */
+  description?: {
+    [key: string]: string;
+  };
+  /** File object for this asset */
+  file: {
+    fileName: string;
+    contentType: string;
+    /** Url where the file is available to be downloaded from, into the Contentful asset system. After the asset is processed this field is gone. */
+    upload?: string;
+    /** Url where the file is available at the Contentful media asset system. This field won't be available until the asset is processed. */
+    url?: string;
+    /** Details for the file, depending on file type (example: image size in bytes, etc) */
+    details?: Record<string, any>;
+    uploadFrom?: Record<string, any>;
+  };
+};
+
 export type TopicProductFieldsResponse = {
   names: CfLocalizedEntryField;
   code: string;

package/src/utils.ts

@@ -144,7 +144,7 @@ export const getPimTranslations = (
  * @returns
  */
 export const getUnwantedValues = (): (string | number)[] => {
-  return ["N/C", "N/A", "N/S", "-1", -1];
+  return ["N/C", "N/A", "N/S", "-1", -1, "-1.00"];
 };
 
 /**