pim-import 6.4.0 → 6.7.0

package/dist/algolia/clean.d.ts

@@ -10,4 +10,5 @@ export declare const removeRecordsByStatus: (indexKey: AvailableIndicesKey, offs
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;

package/dist/algolia/downloads.d.ts

@@ -41,5 +41,6 @@ export declare const reindexDownloads: (offset?: number, limit?: number, filterK
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeDownloadObject: (objectId: string) => Promise<void>;

package/dist/algolia/families.d.ts

@@ -38,6 +38,7 @@ export declare const reindexFamilies: (offset?: number, limit?: number, catalogC
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const reindexFamily: (topicFamilyEntryId: string) => Promise<{
     taskID: number;

package/dist/algolia/inspirations.d.ts

@@ -40,5 +40,6 @@ export declare const reindexInspirations: (offset?: number, limit?: number, filt
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeInspirationObject: (objectId: string) => Promise<void>;

package/dist/algolia/models.d.ts

@@ -35,5 +35,6 @@ export declare const reindexModels: (offset?: number, limit?: number, catalogCod
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeModelObject: (topicModelId: string) => Promise<void>;

package/dist/algolia/news.d.ts

@@ -36,5 +36,6 @@ export declare const reindexPosts: (offset?: number, limit?: number, filterKey?:
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removePostObject: (objectId: string) => Promise<void>;

package/dist/algolia/pressRelease.d.ts

@@ -34,5 +34,6 @@ export declare const reindexPressReleases: (offset?: number, limit?: number, fil
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removePressReleaseObject: (objectId: string) => Promise<void>;

package/dist/algolia/pressReview.d.ts

@@ -34,5 +34,6 @@ export declare const reindexPressReviews: (offset?: number, limit?: number, filt
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removePressReviewObject: (objectId: string) => Promise<void>;

package/dist/algolia/products.d.ts

@@ -89,5 +89,6 @@ export declare const reindexProducts: (filterKey: string, filterValue: string, o
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeProductObject: (topicProductId: string) => Promise<void>;

package/dist/algolia/projects.d.ts

@@ -52,5 +52,6 @@ export declare const reindexProjects: (offset?: number, limit?: number, filterKe
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeProjectObject: (objectId: string) => Promise<void>;

package/dist/algolia/stories.d.ts

@@ -48,5 +48,6 @@ export declare const reindexStories: (offset?: number, limit?: number, filterKey
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeStoryObject: (objectId: string) => Promise<void>;

package/dist/algolia/subFamilies.d.ts

@@ -11,6 +11,7 @@ export declare const reindexSubFamilies: (offset?: number, limit?: number, catal
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const reindexSubFamily: (topicSubFamilyEntryId: string) => Promise<{
     taskID: number;

package/dist/algolia/subModels.d.ts

@@ -29,5 +29,6 @@ export declare const reindexSubModels: (offset?: number, limit?: number, catalog
     s3FilePath?: string | undefined;
     total?: number | undefined;
     nextPage?: number | null | undefined;
+    totalPages?: number | null | undefined;
 }>;
 export declare const removeSubModelObject: (topicSubModelId: string) => Promise<void>;

package/dist/libs/s3.js

@@ -153,9 +153,9 @@ const saveCatalogToS3 = async (catalog) => {
     const timeStart = new Date();
     const dateNow = new Date();
     const dateDirName = dateNow.toISOString().split("T")[0];
-    const path = `pim/${dateDirName}/catalog/`;
+    const path = `pim/${dateDirName}/catalog/${process.env.FPI_CTF_ENVIRONMENT ? process.env.FPI_CTF_ENVIRONMENT + "/" : ""}`;
     const fileName = `catalogs-${catalog}.json`;
-    const fileUrl = `${config_1.config.baseURL}catalogs?onlyweb=true&catalog=${catalog}`;
+    const fileUrl = `${config_1.config.baseURL}micro-service/dictionary/get/catalogs?onlyWeb=true&catalog=${catalog}`;
     (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`);

package/dist/pim/endpoints.js

@@ -21,8 +21,8 @@ const getCatalogTaxonomiesHierarchy = async (catalogCode, jsonFile) => {
         const timeStart = new Date();
         let data;
         if (!jsonFile) {
-            const res = await (0, request_1.getRequest)("catalogs", {
-                params: { onlyweb: true, catalog: catalogCode },
+            const res = await (0, request_1.getRequest)("micro-service/dictionary/get/catalogs", {
+                params: { onlyWeb: true, catalog: catalogCode },
             });
             data = res.data;
         }
@@ -32,7 +32,7 @@ const getCatalogTaxonomiesHierarchy = async (catalogCode, jsonFile) => {
         const catalogData = data.find((item) => item.data.code === catalogCode);
         const timeEnd = new Date();
         const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
-        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: catalogs`);
+        (0, logs_1.log)(`Request time: ${seconds} seconds - endpoint: micro-service/dictionary/get/catalogs`);
         if (!catalogData) {
             throw new Error(`No catalog data found. Catalog code: ${catalogCode}`);
         }
@@ -88,7 +88,7 @@ const getLatestProducts = async (catalogCode, lastModified, offset = 0, limit =
     try {
         const timeStart = new Date();
         const opts = {
-            onlyweb: true,
+            onlyWeb: true,
             lastModified,
             catalog: catalogCode,
             page: offset,

package/dist/pim/methods/latestProducts.js

@@ -36,6 +36,7 @@ const importLatestProducts = async (catalog, lastModified, page = 0, limit = 100
         limit,
         completed,
         total,
+        totalPages: data.totalPages,
     };
 };
 exports.importLatestProducts = importLatestProducts;

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

@@ -1,2 +1,2 @@
 import { PaginationResults } from "../../types";
-export declare const importModels: (offset?: number, limit?: number) => Promise<PaginationResults>;
+export declare const importModels: (page?: number, size?: number) => Promise<PaginationResults>;

package/dist/pim/methods/models.js

@@ -87,7 +87,7 @@ const getTopicModelData = async (model, topicModel) => {
             (0, logs_1.log)(`topicProductLine with code ${model.productLineCode} not found`, "WARN");
         }
     }
-    if (model.designers.length) {
+    if (model?.designers?.length) {
         const designerCode = model.designers[0].code;
         const designerEntry = await (0, contentful_1.getEntryByCode)(designerCode, "topicDesigner", "sys,fields.code");
         if (designerEntry) {
@@ -139,25 +139,25 @@ const importModel = async (model) => {
     }
     return topicModel;
 };
-const importModels = async (offset = 0, limit = 40) => {
-    (0, logs_1.log)(`importModels - offset: ${offset}, limit: ${limit}`, "INFO");
-    const models = await (0, endpoints_1.getOtherCatalogData)("models", offset, limit);
-    const total = models?.pagedCollection?.length || 0;
-    if (models?.pagedCollection?.length) {
+const importModels = async (page = 0, size = 40) => {
+    (0, logs_1.log)(`importModels - page: ${page}, size: ${size}`, "INFO");
+    const models = await (0, endpoints_1.getOtherCatalogData)("models", page, size, true);
+    const total = models?.content?.length || 0;
+    if (models?.content?.length) {
         (0, logs_1.log)(`Founded ${total} models`);
-        let count = offset;
+        let count = page * size;
         let current = 0;
-        for (const model of models.pagedCollection) {
-            (0, logs_1.log)(`${++count} of ${models.totalCount}`);
+        for (const model of models.content) {
+            (0, logs_1.log)(`${++count} of ${models.totalElements}`);
             const topicModel = await importModel(model);
             await createOrUpdatePage(topicModel);
             await updateComponentModelOfSubFamilyPages(topicModel);
             if (logs_1.serverUtils) {
                 logs_1.serverUtils.log(model.code);
-                const progress = Math.floor((++current / models.pagedCollection.length) * 100);
+                const progress = Math.floor((++current / models.content.length) * 100);
                 logs_1.serverUtils.updateProgress(progress);
             }
-            if (count % 2 === 0 && count < models.totalCount) {
+            if (count % 2 === 0 && count < models.totalElements) {
                 await (0, utils_1.sleep)(1000);
             }
         }
@@ -165,12 +165,13 @@ const importModels = async (offset = 0, limit = 40) => {
     else {
         (0, logs_1.log)(`No models found`);
     }
-    const nextOffset = Number(offset) + Number(limit);
+    const nextPage = Number(page) + 1;
     return {
-        offset: nextOffset,
-        limit: Number(limit),
-        completed: nextOffset >= models.totalCount,
-        total: models.totalCount,
+        page: nextPage,
+        size: Number(size),
+        completed: nextPage >= models.totalPages,
+        total: models.totalElements,
+        totalPages: models.totalPages,
     };
 };
 exports.importModels = importModels;

package/dist/pim/methods/subfamilies.js

@@ -252,6 +252,7 @@ const importSubFamilies = async (page = 0, size = 50, catalog) => {
         size: Number(size),
         completed: nextPage >= subFamilies.totalPages,
         total: subFamilies.totalElements,
+        totalPages: subFamilies.totalPages,
     };
 };
 exports.importSubFamilies = importSubFamilies;

package/dist/resources/CatalogDetails.d.ts

@@ -5,6 +5,7 @@ export interface CatalogDetails {
 export interface Data {
     code: string;
     value_en: string;
+    value_en_US: string;
     value_it: string;
     value_es: string;
     value_de: string;
@@ -13,34 +14,22 @@ export interface Data {
     value_no: string;
     value_da: string;
     value_ru: string;
-    othersData: OthersData;
-}
-export interface OthersData {
+    value_zh: string;
+    value_ja: string;
+    value_ko: string;
 }
 export interface CategoriesEntity {
     data: Data;
-    subfamilies?: (SubfamiliesEntity | null)[] | null;
+    subfamilies?: SubfamiliesEntity[] | null;
 }
 export interface SubfamiliesEntity {
-    data: FamilyData;
-    childfamilies?: (ChildfamiliesEntity | null)[] | null;
-    designers?: null[] | null;
-    parentFamily?: FamilyData | null;
-}
-export interface FamilyData {
-    code: string;
-    value_en: string;
-    value_en_US?: string | null;
-    value_it: string;
-    value_es: string;
-    value_de: string;
-    value_fr: string;
-    value_sv: string;
-    value_no: string;
-    value_da: string;
-    value_ru: string;
-    othersData: OthersData;
+    data: Data;
+    parentFamily?: ParentFamily | null;
+    designers?: Data[] | null;
+    destinations?: string[] | null;
 }
-export interface ChildfamiliesEntity {
+export interface ParentFamily {
     data: Data;
+    designers?: Data[] | null;
+    destinations?: string[] | null;
 }

package/dist/resources/CollectionModels.d.ts

@@ -1,29 +1,32 @@
 export interface CollectionModels {
-    totalCount: number;
-    pageSize: number;
-    pageOffset: number;
-    pagedCollection?: PagedCollectionEntity[] | null;
+    content: ModelEntity[];
+    page: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
 }
-export interface PagedCollectionEntity {
-    designers: Data[];
-    relatedProducts?: string[] | null;
+export interface ModelEntity {
     data: Data;
-    priority?: number | null;
+    destinations?: string[] | null;
+    relatedProducts?: string[] | null;
     subFamilyCode: string;
     productLineCode: string;
+    designers?: Data[] | null;
+    priority?: number | null;
     code: string;
-    othersData: OthersData;
-    description1_en?: string;
-    description1_en_us?: string;
-    description1_it?: string;
-    description1_es?: string;
-    description1_de?: string;
-    description1_fr?: string;
-    description1_sv?: string;
-    description1_no?: string;
-    description1_da?: string;
-    description1_ru?: string;
-    destinations?: string[];
+    description1_en?: string | null;
+    description1_en_us?: string | null;
+    description1_it?: string | null;
+    description1_es?: string | null;
+    description1_de?: string | null;
+    description1_fr?: string | null;
+    description1_sv?: string | null;
+    description1_no?: string | null;
+    description1_da?: string | null;
+    description1_ru?: string | null;
+    description1_zh?: string | null;
+    description1_ja?: string | null;
+    description1_ko?: string | null;
 }
 export interface Data {
     code: string;
@@ -37,7 +40,7 @@ export interface Data {
     value_no: string;
     value_da: string;
     value_ru: string;
-    othersData: OthersData;
-}
-export interface OthersData {
+    value_zh: string;
+    value_ja: string;
+    value_ko: string;
 }

package/dist/types.d.ts

@@ -69,6 +69,7 @@ export type PaginationResults = {
     s3FilePath?: string;
     total?: number;
     nextPage?: number | null;
+    totalPages?: number | null;
 };
 export type CfLocalizedEntryField = Partial<Record<ContentfulLocale, string | null>>;
 export type TopicDetailsResponse = {

package/package.json

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