pim-import 6.13.1 → 6.15.0

package/dist/algolia/families.d.ts

@@ -1,14 +1,10 @@
-import { CfLocalizedEntryField, TopicDetailsResponse, TopicProductFieldsResponse, WrapperImageFields, AvailableCatalogs } from "../types";
+import { CfLocalizedEntryField, TopicDetailsResponse, TopicProductFieldsResponse, WrapperImageFields, AvailableCatalogs, SubFamiliyDownloadButtons } from "../types";
 export type pageResponse = {
     slugs: {};
     type: string;
     details?: {};
+    downloadButtons?: SubFamiliyDownloadButtons;
 } | null;
-type downloadButton = {
-    key: string;
-    to: string;
-    downloadType: string;
-};
 export type AlgoliaFamilyRecord = {
     objectID: string;
     names: CfLocalizedEntryField;
@@ -28,7 +24,7 @@ export type AlgoliaFamilyRecord = {
     productFieldsCn: TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
-    downloadButtons?: downloadButton[];
+    downloadButtons?: SubFamiliyDownloadButtons;
     destinations?: string[];
     lastSyncDate: string;
 };
@@ -67,10 +63,9 @@ export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<{
     productFieldsCn: TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
-    downloadButtons?: downloadButton[] | undefined;
+    downloadButtons?: SubFamiliyDownloadButtons | undefined;
     destinations?: string[] | undefined;
     lastSyncDate: string;
     taskID: number;
 }>;
 export declare const removeFamilyObject: (objectId: string) => Promise<void>;
-export {};

package/dist/algolia/families.js

@@ -6,6 +6,7 @@ const logs_1 = require("../libs/logs");
 const config_1 = require("./config");
 const utils_1 = require("../utils");
 const subfamilies_1 = require("../pim/methods/subfamilies");
+const subFamilies_1 = require("./subFamilies");
 const imgix_1 = require("../libs/imgix");
 const indexKey = "families";
 const getFamilyPage = async (topicFamily) => {
@@ -45,11 +46,14 @@ const getFamilyPage = async (topicFamily) => {
                 (0, logs_1.log)(`The modelPage with id "${modelPageId}" not found`, "WARN");
             }
         }
-        const subFamilyEntry = await (0, contentful_cda_1.getEntryByID)(subFamilyPageId.replace("_PAGE", ""), "topicSubFamily", "sys,fields.catalog,fields.category,fields.parentFamily");
+        const subFamilyEntry = await (0, contentful_cda_1.getEntryByID)(subFamilyPageId.replace("_PAGE", ""), "topicSubFamily", "sys,fields.catalog,fields.category,fields.parentFamily,fields.leaflet,fields.datasheet,fields.specsheet_us");
         if (subFamilyEntry) {
             const subFamilyPageSlugWithDetails = await (0, subfamilies_1.getSubFamilyPageSlugWithDetails)(subFamilyEntry);
             if (subFamilyPageSlugWithDetails) {
-                return subFamilyPageSlugWithDetails;
+                return {
+                    ...subFamilyPageSlugWithDetails,
+                    downloadButtons: (0, subFamilies_1.getDownloadButtons)(subFamilyEntry, defaultEnvironmentLocaleCode),
+                };
             }
         }
         else {
@@ -196,6 +200,7 @@ const getObject = async (topicFamily) => {
         productFieldsCn,
         priority,
         isNew,
+        downloadButtons: page?.downloadButtons || {},
         destinations: topicFamilyWithFields?.fields?.destinations?.[defaultEnvironmentLocaleCode] || [],
         lastSyncDate: (0, utils_1.getLocalISOTime)(),
     };

package/dist/algolia/subFamilies.d.ts

@@ -1,4 +1,6 @@
-import { AvailableCatalogs } from "../types";
+import { AvailableCatalogs, SubFamiliyDownloadButtons } from "../types";
+import type { Entry } from "contentful-management/dist/typings/entities/entry";
+export declare const getDownloadButtons: (topicSubFamily: Entry, defaultEnvironmentLocaleCode: string) => SubFamiliyDownloadButtons;
 export declare const reindexSubFamilies: (offset?: number, limit?: number, catalogCode?: AvailableCatalogs) => Promise<{
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
@@ -34,11 +36,7 @@ export declare const reindexSubFamily: (topicSubFamilyEntryId: string) => Promis
     productFieldsCn: import("../types").TopicProductFieldsResponse[];
     isNew: boolean;
     priority: number;
-    downloadButtons?: {
-        key: string;
-        to: string;
-        downloadType: string;
-    }[] | undefined;
+    downloadButtons?: SubFamiliyDownloadButtons | undefined;
     destinations?: string[] | undefined;
     lastSyncDate: string;
     taskID: number;

package/dist/algolia/subFamilies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSubFamilyObject = exports.reindexSubFamily = exports.reindexSubFamilies = void 0;
+exports.removeSubFamilyObject = exports.reindexSubFamily = exports.reindexSubFamilies = exports.getDownloadButtons = void 0;
 const contentful_cda_1 = require("../libs/contentful-cda");
 const logs_1 = require("../libs/logs");
 const config_1 = require("./config");
@@ -144,37 +144,35 @@ const isObjectToDelete = (object, defaultEnvironmentLocaleCode) => {
     return (!object?.productFields || !object?.slugs?.[defaultEnvironmentLocaleCode]);
 };
 const getDownloadButtons = (topicSubFamily, defaultEnvironmentLocaleCode) => {
-    const downloadButtons = [];
+    const downloadButtons = {};
     const topicSubFamilyFields = topicSubFamily?.fields;
     if (topicSubFamilyFields?.leaflet?.[defaultEnvironmentLocaleCode]?.fields
         ?.file?.[defaultEnvironmentLocaleCode]?.url) {
-        downloadButtons.push({
-            key: "leaflet",
+        downloadButtons.leaflet = {
             to: topicSubFamilyFields.leaflet?.[defaultEnvironmentLocaleCode]?.fields
                 ?.file?.[defaultEnvironmentLocaleCode]?.url,
             downloadType: "pdf",
-        });
+        };
     }
     if (topicSubFamilyFields?.datasheet?.[defaultEnvironmentLocaleCode]?.fields
         ?.file?.[defaultEnvironmentLocaleCode]?.url) {
-        downloadButtons.push({
-            key: "datasheet",
+        downloadButtons.datasheet = {
             to: topicSubFamilyFields.datasheet?.[defaultEnvironmentLocaleCode]?.fields
                 ?.file?.[defaultEnvironmentLocaleCode]?.url,
             downloadType: "pdf",
-        });
+        };
     }
     if (topicSubFamilyFields?.specsheet_us?.[defaultEnvironmentLocaleCode]?.fields
         ?.file?.[defaultEnvironmentLocaleCode]?.url) {
-        downloadButtons.push({
-            key: "specsheet_us",
+        downloadButtons.specsheet_us = {
             to: topicSubFamilyFields.specsheet_us?.[defaultEnvironmentLocaleCode]
                 ?.fields?.file?.[defaultEnvironmentLocaleCode]?.url,
             downloadType: "pdf",
-        });
+        };
     }
     return downloadButtons;
 };
+exports.getDownloadButtons = getDownloadButtons;
 const getObject = async (topicSubFamily) => {
     const defaultEnvironmentLocaleCode = await (0, contentful_cda_1.getEnvironmentDefaultLocaleCode)();
     (0, logs_1.log)(`Get details of the ${topicSubFamily.sys.id} topicSubFamily`);
@@ -248,7 +246,7 @@ const getObject = async (topicSubFamily) => {
     (0, logs_1.log)(`Get priority details...`);
     const priority = topicSubFamilyWithFields?.fields?.priority?.[defaultEnvironmentLocaleCode] || 0;
     (0, logs_1.log)(`Get download buttons details...`);
-    const downloadButtons = getDownloadButtons(topicSubFamilyWithFields, defaultEnvironmentLocaleCode);
+    const downloadButtons = (0, exports.getDownloadButtons)(topicSubFamilyWithFields, defaultEnvironmentLocaleCode);
     const record = {
         objectID: topicSubFamilyWithFields.sys.id,
         names: await (0, utils_1.getAllTranslations)(topicSubFamilyWithFields?.fields?.name || {}),

package/dist/libs/s3.d.ts

@@ -17,7 +17,6 @@ export declare const upload: (url: string, fileName?: string, path?: string, met
 export declare const fileExistsOnS3: (path: string) => Promise<boolean>;
 export declare const getFileFromS3: (path: string, returnUrl?: boolean) => Promise<any>;
 export declare const saveCatalogToS3: (catalog: AvailableCatalogs) => Promise<string>;
-export declare const saveAllProductsToS3: (catalog: AvailableCatalogs, lastModified: string) => Promise<string>;
 export declare const saveJsonToS3: (obj: any, fileName?: string, path?: string) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
 export declare const savePDFToS3: (pdf: any, fileName: string, path?: string) => Promise<string | undefined>;
 export {};

package/dist/libs/s3.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savePDFToS3 = exports.saveJsonToS3 = exports.saveAllProductsToS3 = exports.saveCatalogToS3 = exports.getFileFromS3 = exports.fileExistsOnS3 = exports.upload = exports.listObjects = exports.init = exports.checkConfig = exports.s3Client = exports.config = void 0;
+exports.savePDFToS3 = exports.saveJsonToS3 = exports.saveCatalogToS3 = exports.getFileFromS3 = exports.fileExistsOnS3 = exports.upload = exports.listObjects = exports.init = exports.checkConfig = exports.s3Client = exports.config = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const axios_1 = __importDefault(require("@atoms-studio/axios"));
 const client_s3_1 = require("@aws-sdk/client-s3");
@@ -165,24 +165,6 @@ const saveCatalogToS3 = async (catalog) => {
     return `${path}${fileName}`;
 };
 exports.saveCatalogToS3 = saveCatalogToS3;
-const saveAllProductsToS3 = async (catalog, lastModified) => {
-    (0, config_1.checkConfig)();
-    (0, exports.checkConfig)();
-    const timeStart = new Date();
-    const dateNow = new Date();
-    const dateDirName = dateNow.toISOString().split("T")[0];
-    const path = `pim/${dateDirName}/all-products/`;
-    const fileName = `all-products-${catalog}-${lastModified}.json`;
-    const fileUrl = `${config_1.config.baseURL}products/?onlyweb=true&catalog=${catalog}&lastModified=${lastModified}`;
-    (0, logs_1.log)(`Uploading "${fileName}" to S3 path "${path}"`, "INFO");
-    await (0, exports.upload)(fileUrl, fileName, path);
-    (0, logs_1.log)(`"${fileName}" saved to S3`);
-    const timeEnd = new Date();
-    const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
-    (0, logs_1.log)(`Request time: ${seconds} seconds - saveAllProductsToS3`);
-    return `${path}${fileName}`;
-};
-exports.saveAllProductsToS3 = saveAllProductsToS3;
 const saveJsonToS3 = async (obj, fileName = "", path = "") => {
     (0, exports.checkConfig)();
     const timeStart = new Date();

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

@@ -11,18 +11,12 @@ export declare const getProductPageIdByCode: (productCode: string) => string;
 export declare const importProduct: (productDetails: ProductDetails, catalog: AvailableCatalogs, familyCodeIn?: string[], subFamilyCodeIn?: string[]) => Promise<boolean>;
 export declare const pimKeyRenamedCheck: (key: string) => string;
 export declare const setProductRelationships: (code: string, fieldKey?: AvailableRelationFieldKeys | null) => Promise<void>;
-export declare const setProductsRelationships: (catalog: AvailableCatalogs, lastModified: string, fieldKey: AvailableRelationFieldKeys | null, offset?: number, limit?: number, s3FilePath?: string) => Promise<{
-    offset: number;
-    limit: number;
-    completed: boolean;
-    s3FilePath: string;
-    total?: undefined;
-} | {
-    offset: number;
-    limit: number;
+export declare const setProductsRelationships: (catalog: AvailableCatalogs, lastModified: string, fieldKey: AvailableRelationFieldKeys | null, page: number | undefined, size: number | undefined, lastModifiedTo: string) => Promise<{
+    page: number;
+    size: number;
     completed: boolean;
-    s3FilePath: string;
-    total: number;
+    totalElements: number;
+    totalPages: any;
 }>;
 export declare const getAllProductEntriesByCatalog: (catalog: AvailableCatalogs, limit?: number, select?: string) => Promise<Entry[]>;
 export declare const audit: (lastModified: string, catalog: AvailableCatalogs, offset?: number, limit?: number, s3FilePath?: string) => Promise<{

package/dist/pim/methods/products.js

@@ -928,46 +928,26 @@ const setProductRelationships = async (code, fieldKey = null) => {
     }
 };
 exports.setProductRelationships = setProductRelationships;
-const setProductsRelationships = async (catalog, lastModified, fieldKey, offset = 0, limit = 150, s3FilePath = "") => {
+const setProductsRelationships = async (catalog, lastModified, fieldKey, page = 0, size = 150, lastModifiedTo) => {
     const timeStart = new Date();
-    (0, logs_1.log)(`setProductsRelationships - catalog: ${catalog} lastModified: ${lastModified} fieldKey: ${fieldKey} offset: ${offset} limit: ${limit} s3FilePath: ${s3FilePath}`, "INFO");
-    if (!s3FilePath) {
-        const s3Path = await (0, s3_1.saveAllProductsToS3)(catalog, lastModified);
-        const tEnd = new Date();
-        const secs = (0, utils_1.secondBetweenTwoDate)(timeStart, tEnd);
-        (0, logs_1.log)(`Request time: ${secs} seconds`);
-        return {
-            offset: Number(offset),
-            limit: Number(limit),
-            completed: false,
-            s3FilePath: s3Path,
-        };
-    }
-    const JSONData = await (0, s3_1.getFileFromS3)(s3FilePath);
-    const total = JSONData.length;
-    (0, logs_1.log)(`${total} products founded`);
-    let count = 0;
+    (0, logs_1.log)(`setProductsRelationships - catalog: ${catalog} lastModified: ${lastModified} fieldKey: ${fieldKey} page: ${page} size: ${size}`, "INFO");
+    const data = await (0, endpoints_1.getLatestProducts)(catalog, lastModified, page, size, lastModifiedTo);
+    const totalElements = data.totalElements;
+    (0, logs_1.log)(`${totalElements} products founded`);
     let updated = 0;
     let current = 0;
-    for (const product of JSONData) {
-        if (offset <= count || limit === -1) {
-            (0, logs_1.log)(`${count + 1} of ${JSONData.length}`);
-            await (0, exports.setProductRelationships)(product.code, fieldKey);
-            updated++;
-            if (logs_1.serverUtils) {
-                logs_1.serverUtils.log(product.code);
-                const currentTotal = JSONData.length > limit && limit !== -1 ? limit : JSONData.length;
-                const progress = Math.floor((++current / currentTotal) * 100);
-                logs_1.serverUtils.updateProgress(progress);
-            }
-            if (updated % 7 === 0) {
-                await (0, utils_1.sleep)(500);
-            }
-            if (limit !== -1 && count + 1 - offset >= limit) {
-                break;
-            }
+    for (const product of data.content) {
+        (0, logs_1.log)(`${++current + page * size} of ${totalElements} - Set relationships for product ${product.code}`);
+        await (0, exports.setProductRelationships)(product.code, fieldKey);
+        updated++;
+        if (logs_1.serverUtils) {
+            logs_1.serverUtils.log(product.code);
+            const progress = Math.floor((current / data.content.length) * 100);
+            logs_1.serverUtils.updateProgress(progress);
+        }
+        if (updated % 7 === 0) {
+            await (0, utils_1.sleep)(500);
         }
-        count++;
     }
     const timeEnd = new Date();
     const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
@@ -975,12 +955,13 @@ const setProductsRelationships = async (catalog, lastModified, fieldKey, offset
     if (logs_1.serverUtils) {
         logs_1.serverUtils.updateProgress(100);
     }
+    const nextPage = Number(page) + 1;
     return {
-        offset: Number(offset) + Number(limit),
-        limit: Number(limit),
-        completed: limit === -1 || limit > updated,
-        s3FilePath,
-        total: JSONData.length,
+        page: nextPage,
+        size,
+        completed: nextPage >= data.totalPages,
+        totalElements,
+        totalPages: data.totalPages,
     };
 };
 exports.setProductsRelationships = setProductsRelationships;

package/dist/types.d.ts

@@ -196,3 +196,17 @@ export type AlgoliaObjectFilter = {
     key: string;
     value: string;
 };
+export type SubFamiliyDownloadButtons = {
+    leaflet?: {
+        to: string;
+        downloadType: string;
+    };
+    datasheet?: {
+        to: string;
+        downloadType: string;
+    };
+    specsheet_us?: {
+        to: string;
+        downloadType: string;
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pim-import",
-  "version": "6.13.1",
+  "version": "6.15.0",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",