pim-import 5.12.4 → 6.0.0

package/dist/algolia/clean.d.ts

@@ -2,9 +2,10 @@ import { AvailableCatalogs, AvailableEntryStatus } from "../types";
 import { AvailableIndicesKey } from "./config";
 export declare const removeRecordsByStatus: (indexKey: AvailableIndicesKey, offset?: number, limit?: number, status?: AvailableEntryStatus, catalogCode?: AvailableCatalogs) => Promise<false | {
     objectIds: string[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;

package/dist/algolia/downloads.d.ts

@@ -33,10 +33,11 @@ export declare const reindexDownloads: (offset?: number, limit?: number, filterK
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeDownloadObject: (objectId: string) => Promise<void>;

package/dist/algolia/families.d.ts

@@ -30,11 +30,12 @@ export declare const reindexFamilies: (offset?: number, limit?: number, catalogC
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<{
     taskID: number;

package/dist/algolia/inspirations.d.ts

@@ -32,10 +32,11 @@ export declare const reindexInspirations: (offset?: number, limit?: number, filt
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeInspirationObject: (objectId: string) => Promise<void>;

package/dist/algolia/models.d.ts

@@ -27,10 +27,11 @@ export declare const reindexModels: (offset?: number, limit?: number, catalogCod
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeModelObject: (topicModelId: string) => Promise<void>;

package/dist/algolia/news.d.ts

@@ -28,10 +28,11 @@ export declare const reindexPosts: (offset?: number, limit?: number, filterKey?:
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removePostObject: (objectId: string) => Promise<void>;

package/dist/algolia/pressRelease.d.ts

@@ -26,10 +26,11 @@ export declare const reindexPressReleases: (offset?: number, limit?: number, fil
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removePressReleaseObject: (objectId: string) => Promise<void>;

package/dist/algolia/pressReview.d.ts

@@ -26,10 +26,11 @@ export declare const reindexPressReviews: (offset?: number, limit?: number, filt
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removePressReviewObject: (objectId: string) => Promise<void>;

package/dist/algolia/products.d.ts

@@ -81,10 +81,11 @@ export declare const reindexProducts: (filterKey: string, filterValue: string, o
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeProductObject: (topicProductId: string) => Promise<void>;

package/dist/algolia/projects.d.ts

@@ -44,10 +44,11 @@ export declare const reindexProjects: (offset?: number, limit?: number, filterKe
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeProjectObject: (objectId: string) => Promise<void>;

package/dist/algolia/stories.d.ts

@@ -40,10 +40,11 @@ export declare const reindexStories: (offset?: number, limit?: number, filterKey
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeStoryObject: (objectId: string) => Promise<void>;

package/dist/algolia/subFamilies.d.ts

@@ -3,11 +3,12 @@ export declare const reindexSubFamilies: (offset?: number, limit?: number, catal
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const reindexSubFamily: (topicSubFamilyEntryId: string) => Promise<{
     taskID: number;

package/dist/algolia/subModels.d.ts

@@ -21,10 +21,11 @@ export declare const reindexSubModels: (offset?: number, limit?: number, catalog
     savedObjectIDs: string[];
     deletedObjectIDs: string[];
     objects: Readonly<Record<string, any>>[];
-    offset: number;
+    offset?: number | undefined;
     limit: number;
     completed: boolean;
     s3FilePath?: string | undefined;
     total?: number | undefined;
+    nextPage?: number | null | undefined;
 }>;
 export declare const removeSubModelObject: (topicSubModelId: string) => Promise<void>;

package/dist/pim/config.js

@@ -50,7 +50,7 @@ const init = (providedConfig) => {
     else if (!providedConfig) {
         throw new Error("Configuration params not found");
     }
-    exports.config.baseURL = providedConfig.baseURL;
+    exports.config.baseURL = providedConfig.baseURL.replace(/^["']|["']$/g, "");
     exports.config.username =
         typeof providedConfig.username !== "undefined"
             ? providedConfig.username

package/dist/pim/data/productFields.json

@@ -706,13 +706,6 @@
         "dictionary": "",
         "type": "string"
     },
-    {
-        "key": "dynamicLoad_us",
-        "parent": "marking",
-        "icon": false,
-        "dictionary": "",
-        "type": "string"
-    },
     {
         "key": "staticLoad",
         "parent": "marking",

package/dist/pim/endpoints.js

@@ -91,16 +91,16 @@ const getLatestProducts = async (catalogCode, lastModified, offset = 0, limit =
             onlyweb: true,
             lastModified,
             catalog: catalogCode,
-            offset: offset,
-            limit: limit,
+            page: offset,
+            size: limit,
             lastModifiedTo,
         };
-        const { data } = await (0, request_1.getRequest)("latest-products/full", {
+        const { data } = await (0, request_1.getRequest)("micro-service/product/paged/search", {
             params: opts,
         });
         const timeEnd = new Date();
         const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
-        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: latest-products/full`);
+        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: micro-service/product/paged/search`);
         return data;
     }
     catch (err) {
@@ -111,10 +111,10 @@ exports.getLatestProducts = getLatestProducts;
 const getProductDetails = async (code) => {
     try {
         const timeStart = new Date();
-        const { data } = await (0, request_1.getRequest)(`product/full/${code}`);
+        const { data } = await (0, request_1.getRequest)(`micro-service/product/get/${code}`);
         const timeEnd = new Date();
         const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
-        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: product/full/${code}`);
+        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: micro-service/product/get/${code}`);
         return data;
     }
     catch (err) {

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

@@ -1,2 +1,2 @@
 import { AvailableCatalogs, PaginationResults } from "../../types";
-export declare const importLatestProducts: (catalog: AvailableCatalogs, lastModified: string, offset?: number, limit?: number, lastModifiedTo?: string) => Promise<PaginationResults>;
+export declare const importLatestProducts: (catalog: AvailableCatalogs, lastModified: string, page?: number, limit?: number, lastModifiedTo?: string) => Promise<PaginationResults>;

package/dist/pim/methods/latestProducts.js

@@ -5,20 +5,20 @@ const endpoints_1 = require("../endpoints");
 const logs_1 = require("../../libs/logs");
 const products_1 = require("./products");
 const utils_1 = require("../../utils");
-const importLatestProducts = async (catalog, lastModified, offset = 0, limit = 100, lastModifiedTo = "") => {
+const importLatestProducts = async (catalog, lastModified, page = 0, limit = 100, lastModifiedTo = "") => {
     const timeStart = new Date();
-    offset = Number(offset);
+    page = Number(page);
     limit = Number(limit);
-    (0, logs_1.log)(`importLatestProducts - catalog: ${catalog} lastModified: ${lastModified} offset: ${offset} limit: ${limit} lastModifiedTo: ${lastModifiedTo}`, "INFO");
-    const data = await (0, endpoints_1.getLatestProducts)(catalog, lastModified, offset, limit, lastModifiedTo);
-    const total = data.totalCount;
-    const products = data.pagedCollection;
+    (0, logs_1.log)(`importLatestProducts - catalog: ${catalog} lastModified: ${lastModified} page: ${page} limit: ${limit} lastModifiedTo: ${lastModifiedTo}`, "INFO");
+    const data = await (0, endpoints_1.getLatestProducts)(catalog, lastModified, page, limit, lastModifiedTo);
+    const total = data.totalElements;
+    const products = data.content;
     (0, logs_1.log)(`${total} products founded`);
-    let count = offset + 1;
+    let count = page * limit + 1;
     let current = 0;
     for (const product of products) {
         (0, logs_1.log)(`${count} of ${total}`);
-        const productDetails = product.content;
+        const productDetails = product;
         await (0, products_1.importProduct)(productDetails, catalog);
         count++;
         if (logs_1.serverUtils) {
@@ -30,9 +30,9 @@ const importLatestProducts = async (catalog, lastModified, offset = 0, limit = 1
     const timeEnd = new Date();
     const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
     (0, logs_1.log)(`Request time: ${seconds} seconds`);
-    const completed = limit === -1 || offset >= total;
+    const completed = count >= total;
     return {
-        offset: completed ? offset : offset + limit,
+        nextPage: completed ? null : page + 1,
         limit,
         completed,
         total,

package/dist/pim/methods/products.js

@@ -93,7 +93,7 @@ const isTermsToAdd = async (productDetails, catalog) => {
     const modelsFieldKey = "models" + (0, utils_1.capitalizeFirstLetter)(catalog);
     if (productDetails.models) {
         for (const model of productDetails.models) {
-            const modelCode = model.data.code;
+            const modelCode = model.code;
             if (modelCode) {
                 (0, logs_1.log)(`Get model entry with id ${modelCode}`);
                 const modelEntry = await (0, contentful_1.getEntryByID)(modelCode, "topicModel", "sys");
@@ -116,7 +116,7 @@ const isTermsToAdd = async (productDetails, catalog) => {
     const subModelsFieldKey = "subModels" + (0, utils_1.capitalizeFirstLetter)(catalog);
     if (productDetails.submodels) {
         for (const submodel of productDetails.submodels) {
-            const subModelCode = submodel.data.code;
+            const subModelCode = submodel.code;
             if (subModelCode) {
                 (0, logs_1.log)(`Get subModel entry with id ${subModelCode}`);
                 const subModelEntry = await (0, contentful_1.getEntryByID)(subModelCode, "topicSubModel", "sys");
@@ -529,7 +529,7 @@ const getProductData = async (productEntry, productDetails) => {
     if (productDetails?.models) {
         (0, logs_1.log)(`Set ${productDetails.models.length} model relations`);
         const modelCodes = productDetails.models.map((model) => {
-            return model.data.code;
+            return model.code;
         });
         const topicModelEntries = await (0, contentful_1.getAllEntriesByCodes)(modelCodes, "topicModel", "sys,fields.catalog");
         if (topicModelEntries.length) {
@@ -553,7 +553,7 @@ const getProductData = async (productEntry, productDetails) => {
     if (productDetails?.submodels) {
         (0, logs_1.log)(`Set ${productDetails.submodels.length} subModels relations`);
         const subModelsCodes = productDetails.submodels.map((subModel) => {
-            return subModel.data.code;
+            return subModel.code;
         });
         const topicSubModelEntries = await (0, contentful_1.getAllEntriesByCodes)(subModelsCodes, "topicSubModel", "sys,fields.catalog");
         if (topicSubModelEntries.length) {
@@ -682,7 +682,46 @@ const getProductColourVariantsData = async (topicProductColourVariantsCode, prod
     data.fields.lastPimSyncDate[defaultEnvironmentLocaleCode] = (0, utils_1.getLocalISOTime)();
     return data;
 };
+const removeProductColourVariants = async (productEntryId) => {
+    (0, logs_1.log)(`Remove product from all topicProductColourVariants`);
+    const env = await (0, contentful_1.getEnvironment)();
+    const defEnvLocaleCode = await (0, contentful_1.getEnvironmentDefaultLocaleCode)();
+    const { items: allTopicProductColourVariants } = await env.getEntries({
+        content_type: "topicProductColourVariants",
+        locale: defEnvLocaleCode,
+        include: 1,
+        links_to_entry: productEntryId,
+        limit: 1000,
+    });
+    (0, logs_1.log)(`Found ${allTopicProductColourVariants.length} topicProductColourVariants`);
+    for (let topicProductColourVariants of allTopicProductColourVariants) {
+        topicProductColourVariants.fields = await (0, contentful_1.removeFromRelationFields)(topicProductColourVariants, "products", productEntryId, true);
+        try {
+            topicProductColourVariants = await topicProductColourVariants.update();
+            if (topicProductColourVariants.isPublished()) {
+                try {
+                    topicProductColourVariants =
+                        await topicProductColourVariants.publish();
+                }
+                catch (err) {
+                    const message = `addProductColourVariants - Cannot publish entry. ${topicProductColourVariants.sys.id}`;
+                    await (0, notifications_1.notify)(message, false);
+                    (0, logs_1.log)(message);
+                    (0, logs_1.log)(err);
+                }
+            }
+        }
+        catch (err) {
+            const message = `addProductColourVariants - Cannot update entry. ${topicProductColourVariants.sys.id}`;
+            await (0, notifications_1.notify)(message, false);
+            (0, logs_1.log)(message);
+            (0, logs_1.log)(err);
+        }
+    }
+};
 const addProductColourVariants = async (colourVariants, productEntryId) => {
+    await removeProductColourVariants(productEntryId);
+    (0, logs_1.log)(`Add product to the topicProductColourVariants of the ${colourVariants.length} colour variants`);
     for (const colourVariant of colourVariants) {
         const topicId = `PCV_${colourVariant.code}`;
         let topicProductColourVariants = await (0, contentful_1.getEntryByID)(topicId, "topicProductColourVariants");
@@ -1509,11 +1548,9 @@ const generateTechSpecPdf = async (topicProductId, country = "global", locale =
     const fileName = (pageSlug.length >= 170
         ? `tech-spec-${topicProductId}`
         : `tech-spec-${pageSlug}`) + `_${country}-${locale}`;
-    let baseUrl = country === "cn"
-        ? process.env.FPI_TECH_SPEC_BASE_URL_CN ?? ""
-        : process.env.FPI_TECH_SPEC_BASE_URL ?? "";
+    let baseUrl = process.env.FPI_TECH_SPEC_BASE_URL ?? "";
     if (!baseUrl) {
-        (0, logs_1.log)(`FPI_TECH_SPEC_BASE_URL process env not found for country ${country}`, "ERROR");
+        (0, logs_1.log)(`FPI_TECH_SPEC_BASE_URL process env not found`, "ERROR");
     }
     baseUrl = baseUrl.replace(/\/?(\?|#|$)/, "/$1");
     let footerBaseUrl = country === "cn"

package/dist/resources/ProductDetails.d.ts

@@ -265,8 +265,7 @@ export interface CatalogsEntity {
     familyCode?: string | null;
     childFamilyCode?: null;
 }
-export interface ModelsEntityOrParentModel {
-    data: GenericData;
+export interface ModelsEntityOrParentModel extends GenericData {
     priority: number;
     subFamilyCode: string;
     productLineCode: string;
@@ -290,23 +289,11 @@ export interface ModelsEntityOrParentModel {
     description2_da?: null;
     description2_ru?: null;
     description2_en_us?: null;
-    code?: null;
     image?: null;
     imageAlternative?: null;
-    value_en?: null;
-    value_en_US?: null;
-    value_it?: null;
-    value_es?: null;
-    value_de?: null;
-    value_fr?: null;
-    value_sv?: null;
-    value_no?: null;
-    value_da?: null;
-    value_ru?: null;
     othersData: OthersData;
 }
-export interface SubmodelsEntity {
-    data: GenericData;
+export interface SubmodelsEntity extends GenericData {
     priority: number;
     subFamilyCode?: null;
     productLineCode?: null;
@@ -331,19 +318,7 @@ export interface SubmodelsEntity {
     description2_da?: null;
     description2_ru?: null;
     description2_en_us?: null;
-    code?: null;
-    image?: null;
     imageAlternative?: null;
-    value_en?: null;
-    value_en_US?: null;
-    value_it?: null;
-    value_es?: null;
-    value_de?: null;
-    value_fr?: null;
-    value_sv?: null;
-    value_no?: null;
-    value_da?: null;
-    value_ru?: null;
     othersData: OthersData;
 }
 export interface ColourVariant {

package/dist/types.d.ts

@@ -61,11 +61,12 @@ export type CfSys = {
     };
 };
 export type PaginationResults = {
-    offset: number;
+    offset?: number;
     limit: number;
     completed: boolean;
     s3FilePath?: string;
     total?: number;
+    nextPage?: number | null;
 };
 export type CfLocalizedEntryField = Partial<Record<ContentfulLocale, string | null>>;
 export type TopicDetailsResponse = {

package/package.json

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