pim-import 6.7.0 → 6.9.0

package/dist/pim/endpoints.d.ts

@@ -12,7 +12,7 @@ export declare const getDictionary: () => Promise<any>;
 export declare const getAllProducts: (lastModified?: string | null, catalogCode?: AvailableCatalogs | null) => Promise<any>;
 export declare const getLatestProducts: (catalogCode: AvailableCatalogs, lastModified: string, offset?: number, limit?: number, lastModifiedTo?: string) => Promise<any>;
 export declare const getProductDetails: (code: string) => Promise<any>;
-export declare const getAudit: (lastModified?: string) => Promise<Audit[]>;
+export declare const getAudit: (lastModified?: string) => Promise<Audit>;
 export declare const getStaticDailyProducts: (catalogCode: AvailableCatalogs, day: string, saveToS3?: boolean) => Promise<any>;
 type AvailableOtherCatalogCollection = CollectionModels | CollectionSubModels | CollectionSubFamilies;
 export declare const getOtherCatalogData: <T extends AvailableOtherCatalogCollection>(endpoint: AvailableOtherCatalogDataEndpoint, offset?: number, limit?: number, newEndpoint?: boolean) => Promise<T>;

package/dist/pim/methods/models.js

@@ -54,7 +54,7 @@ const getTopicModelData = async (model, topicModel) => {
     };
     data.fields.name = (0, utils_1.getPimTranslations)(model.data);
     data.fields = await (0, contentful_1.addFieldValue)(data, "code", model.code);
-    data.fields = await (0, contentful_1.addFieldValue)(data, "priority", model.priority);
+    data.fields = await (0, contentful_1.addFieldValue)(data, "priority", model?.priority || 0);
     data.fields.description = (0, utils_1.getPimTranslations)(model, "description1");
     if (model.subFamilyCode) {
         const subFamilyEntry = await (0, contentful_1.getEntryByCode)(model.subFamilyCode, "topicSubFamily", "sys,fields.code,fields.catalog");

package/dist/pim/methods/products.js

@@ -1363,7 +1363,9 @@ const audit = async (lastModified, catalog, offset = 0, limit = 150, s3FilePath
             };
         }
         const filename = `${lastModified}-all-audit.json`;
-        const path = `audit`;
+        const path = `audit${process.env.FPI_CTF_ENVIRONMENT
+            ? "/" + process.env.FPI_CTF_ENVIRONMENT
+            : ""}`;
         await (0, s3_1.saveJsonToS3)(allAudit, filename, path);
         const s3Path = `${path}/${filename}`;
         if (logs_1.serverUtils) {
@@ -1405,6 +1407,7 @@ const audit = async (lastModified, catalog, offset = 0, limit = 150, s3FilePath
             otherFilters.push({ key: "fields.catalogs.sys.id[in]", value: catalog });
         }
         (0, logs_1.log)(`Get ${productCodes.length} product entry from Contentful`);
+        console.log("productCodes", productCodes);
         const productEntries = await (0, contentful_1.getAllEntriesByCodes)(productCodes, "topicProduct", "sys,fields", "fields.code", otherFilters);
         (0, logs_1.log)(`Founded ${productEntries.length} topicProduct`);
         let familyEntries = [];

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

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

package/dist/pim/methods/submodels.js

@@ -12,7 +12,7 @@ const getTopicSubModelData = async (subModel, topicSubModel) => {
     };
     data.fields.name = (0, utils_1.getPimTranslations)(subModel.data);
     data.fields = await (0, contentful_1.addFieldValue)(data, "code", subModel.code);
-    data.fields = await (0, contentful_1.addFieldValue)(data, "priority", subModel.priority);
+    data.fields = await (0, contentful_1.addFieldValue)(data, "priority", subModel?.priority || 0);
     if (subModel.subFamilyCode) {
         const subFamilyEntry = await (0, contentful_1.getEntryByCode)(subModel.subFamilyCode, "topicSubFamily", "sys,fields.code,fields.catalog");
         if (subFamilyEntry) {
@@ -85,37 +85,38 @@ const addSubModelToModel = async (topicSubModelId, topicModelId) => {
     data.fields = await (0, contentful_1.addToRelationFields)(topicModel, "subModels", topicSubModelId, true);
     topicModel = await (0, contentful_1.updateEntry)(topicModel, data, topicModel.isPublished());
 };
-const importSubModels = async (offset = 0, limit = 50) => {
+const importSubModels = async (page = 0, size = 50) => {
     const timeStart = new Date();
-    (0, logs_1.log)(`importSubModels - offset: ${offset}, limit: ${limit}`, "INFO");
-    const subModels = await (0, endpoints_1.getOtherCatalogData)("submodels", offset, limit);
-    const total = subModels?.pagedCollection?.length || 0;
-    if (subModels?.pagedCollection?.length) {
+    (0, logs_1.log)(`importSubModels - page: ${page}, size: ${size}`, "INFO");
+    const subModels = await (0, endpoints_1.getOtherCatalogData)("submodels", page, size, true);
+    const total = subModels?.content?.length || 0;
+    if (subModels?.content?.length) {
         (0, logs_1.log)(`Founded ${total} subModels`);
-        let count = offset;
+        let count = page * size;
         let current = 0;
-        for (const subModel of subModels.pagedCollection) {
-            (0, logs_1.log)(`${++count} of ${subModels.totalCount}`);
+        for (const subModel of subModels.content) {
+            (0, logs_1.log)(`${++count} of ${subModels.totalElements}`);
             await importSubModel(subModel);
             if (logs_1.serverUtils) {
                 logs_1.serverUtils.log(subModel.code);
-                const progress = Math.floor((++current / subModels.pagedCollection.length) * 100);
+                const progress = Math.floor((++current / subModels.content.length) * 100);
                 logs_1.serverUtils.updateProgress(progress);
             }
-            if (count % 2 === 0 && count < subModels.totalCount) {
+            if (count % 2 === 0 && count < subModels.totalElements) {
                 await (0, utils_1.sleep)(1000);
             }
         }
     }
-    const nextOffset = Number(offset) + Number(limit);
     const timeEnd = new Date();
     const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
     (0, logs_1.log)(`Request time: ${seconds} seconds`);
+    const nextPage = Number(page) + 1;
     return {
-        offset: nextOffset,
-        limit: Number(limit),
-        completed: nextOffset >= subModels.totalCount,
-        total: subModels.totalCount,
+        page: nextPage,
+        size: Number(size),
+        completed: nextPage >= subModels.totalPages,
+        total: subModels.totalElements,
+        totalPages: subModels.totalPages,
     };
 };
 exports.importSubModels = importSubModels;

package/dist/resources/Audit.d.ts

@@ -1,25 +1,18 @@
-type AuditCatalog = {
-    where: string;
-    catalogCode?: string;
-    categoryCode?: string;
-    subfamilyCode?: string;
-    models?: string;
-    subModels?: string;
-    codes?: string;
-};
-export interface Audit {
+export type Audit = AuditEntry[];
+export interface AuditEntry {
     what: string;
-    when: When;
+    when: string;
     product: string;
-    upgradeProduct?: string;
+    upgradeProduct?: string | null;
     catalogs: AuditCatalog[];
 }
-export interface When {
-    year: number;
-    month: number;
-    dayOfMonth: number;
-    hourOfDay: number;
-    minute: number;
-    second: number;
+export interface AuditCatalog {
+    where: string;
+    catalogCode?: string | null;
+    categoryCode?: string | null;
+    subfamilyCode?: string | null;
+    models?: string | null;
+    subModels?: string | null;
+    accessoryProducts?: string | null;
+    codes?: string | null;
 }
-export {};

package/dist/resources/CollectionSubModels.d.ts

@@ -1,19 +1,19 @@
 export interface CollectionSubModels {
-    totalCount: number;
-    pageSize: number;
-    pageOffset: number;
-    pagedCollection?: PagedCollectionEntity[] | null;
+    content: SubModelEntity[];
+    page: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
 }
-export interface PagedCollectionEntity {
-    relatedProducts?: string[] | null;
+export interface SubModelEntity {
     data: Data;
-    priority: number;
+    destinations?: string[] | null;
+    relatedProducts?: string[] | null;
+    code: string;
+    priority?: number | null;
     subFamilyCode: string;
     productLineCode: string;
     parentModel: ParentModel;
-    code: string;
-    othersData: OthersData;
-    destinations?: string[];
 }
 export interface Data {
     code: string;
@@ -27,11 +27,11 @@ 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 ParentModel {
     code: string;
-    othersData: OthersData;
+    designers?: Data[] | null;
 }

package/package.json

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