pim-import 6.9.0 → 6.10.1

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

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

package/dist/pim/methods/latestProducts.js

@@ -5,16 +5,16 @@ 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, page = 0, limit = 100, lastModifiedTo = "") => {
+const importLatestProducts = async (catalog, lastModified, page = 0, size = 100, lastModifiedTo = "") => {
     const timeStart = new Date();
     page = Number(page);
-    limit = Number(limit);
-    (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);
+    size = Number(size);
+    (0, logs_1.log)(`importLatestProducts - catalog: ${catalog} lastModified: ${lastModified} page: ${page} size: ${size} lastModifiedTo: ${lastModifiedTo}`, "INFO");
+    const data = await (0, endpoints_1.getLatestProducts)(catalog, lastModified, page, size, lastModifiedTo);
     const total = data.totalElements;
     const products = data.content;
     (0, logs_1.log)(`${total} products founded`);
-    let count = page * limit + 1;
+    let count = page * size + 1;
     let current = 0;
     for (const product of products) {
         (0, logs_1.log)(`${count} of ${total}`);
@@ -30,11 +30,11 @@ const importLatestProducts = async (catalog, lastModified, page = 0, limit = 100
     const timeEnd = new Date();
     const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
     (0, logs_1.log)(`Request time: ${seconds} seconds`);
-    const completed = count >= total;
+    const nextPage = Number(page) + 1;
     return {
-        nextPage: completed ? null : page + 1,
-        limit,
-        completed,
+        page: nextPage,
+        size,
+        completed: nextPage >= data.totalPages,
         total,
         totalPages: data.totalPages,
     };

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

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

package/dist/pim/methods/models.js

@@ -139,19 +139,27 @@ const importModel = async (model) => {
     }
     return topicModel;
 };
-const importModels = async (page = 0, size = 40) => {
+const importModels = async (page = 0, size = 40, singleModelCode) => {
     (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;
+    let forceCompleted = false;
     if (models?.content?.length) {
         (0, logs_1.log)(`Founded ${total} models`);
         let count = page * size;
         let current = 0;
         for (const model of models.content) {
+            if (singleModelCode && model.code !== singleModelCode) {
+                continue;
+            }
             (0, logs_1.log)(`${++count} of ${models.totalElements}`);
             const topicModel = await importModel(model);
             await createOrUpdatePage(topicModel);
             await updateComponentModelOfSubFamilyPages(topicModel);
+            if (singleModelCode && model.code === singleModelCode) {
+                forceCompleted = true;
+                break;
+            }
             if (logs_1.serverUtils) {
                 logs_1.serverUtils.log(model.code);
                 const progress = Math.floor((++current / models.content.length) * 100);
@@ -169,7 +177,7 @@ const importModels = async (page = 0, size = 40) => {
     return {
         page: nextPage,
         size: Number(size),
-        completed: nextPage >= models.totalPages,
+        completed: nextPage >= models.totalPages || forceCompleted,
         total: models.totalElements,
         totalPages: models.totalPages,
     };

package/dist/pim/methods/products.js

@@ -1556,7 +1556,9 @@ const generateTechSpecPdf = async (topicProductId, country = "global", locale =
     const fileName = (pageSlug.length >= 170
         ? `tech-spec-${topicProductId}`
         : `tech-spec-${pageSlug}`) + `_${country}-${locale}`;
-    let baseUrl = process.env.FPI_TECH_SPEC_BASE_URL ?? "";
+    let baseUrl = country === "cn" && process.env.FPI_TECH_SPEC_BASE_URL_CN
+        ? process.env.FPI_TECH_SPEC_BASE_URL_CN
+        : (process.env.FPI_TECH_SPEC_BASE_URL ?? "");
     if (!baseUrl) {
         (0, logs_1.log)(`FPI_TECH_SPEC_BASE_URL process env not found`, "ERROR");
     }

package/package.json

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