@contrail/flexplm 1.7.3 → 1.7.4-alpha.2fb7e1f

package/lib/publish/base-process-publish-assortment.js

@@ -29,7 +29,8 @@ class BaseProcessPublishAssortment {
         let publisher;
         const assortmentId = event.assortmentId;
         try {
-            console.info('process-start!');
+            console.info('process-start: assortmentId: ' + assortmentId
+                + ', assortmentPublishChangeId: ' + assortmentPublishChangeId);
             let seasonFed;
             try {
                 seasonFed = await this.getSeasonFederation(assortmentId);
@@ -74,9 +75,9 @@ class BaseProcessPublishAssortment {
                 e.publishInfo = publishInfo;
             }
             catch (e2) {
-                console.log('catch e2: ' + e2.message);
+                console.error('getPublishInfo failed: ' + e2.message);
             }
-            console.log('catch e: ' + e.message);
+            console.error('process failed: assortmentId: ' + assortmentId + ': ' + e.message);
             throw e;
         }
     }
@@ -315,19 +316,17 @@ class BaseProcessPublishAssortment {
     }
     async downloadHydratedChangeDetail(assortmentPublishChange) {
         try {
-            console.info('downloadHydratedChangeDetail-start');
             const link = assortmentPublishChange?.hydratedDetailDownloadLink;
             const response = await fetch(link);
             const data = await response.json();
             return data;
         }
         catch (e) {
-            console.log('Error hydratedDetailDownloadLink: ' + e.message);
+            console.error('Error hydratedDetailDownloadLink: ' + e.message);
         }
         return undefined;
     }
     async downloadAssortmentBaseline(assortmentPublishChange) {
-        console.info('downloadAssortmentBaseline-start');
         try {
             const link = assortmentPublishChange?.assortmentBaselineDownloadLink;
             const response = await fetch(link);
@@ -335,15 +334,12 @@ class BaseProcessPublishAssortment {
             return data;
         }
         catch (e) {
-            console.log('Error assortmentBaselineDownloadLink: ' + e.message);
+            console.error('Error assortmentBaselineDownloadLink: ' + e.message);
         }
         return undefined;
     }
     async getDeleteChanges(assortmentPublishChange, apcHistory, assortmentBaseline, sinceDate) {
-        console.info('getDeleteChanges(): ' + assortmentPublishChange?.id);
-        console.info(sinceDate);
         const currentAPCIndex = apcHistory.findIndex(pc => pc?.id === assortmentPublishChange?.id);
-        console.info(' currentAPCIndex: ' + currentAPCIndex);
         if (currentAPCIndex == 0) {
             return [];
         }
@@ -352,16 +348,13 @@ class BaseProcessPublishAssortment {
         const apcDeletes = await this.downloadDeleteChanges(assortmentPublishChange);
         let previousApcDate = Date.parse(apcCreatedOn);
         const sinceDateMilliseconds = sinceDate.getTime();
-        if (app_framework_1.Logger.isInfoOn()) {
-            console.info('apcCreatedOn: ' + apcCreatedOn);
-            console.info('sinceDate: ' + sinceDate);
-            console.info('sinceDateMilliseconds: ' + sinceDateMilliseconds);
-            console.info('apcDateMilliseconds: ' + previousApcDate);
-        }
+        console.info('getDeleteChanges(): apc: ' + assortmentPublishChange?.id
+            + ', index: ' + currentAPCIndex + ', previousApcCreatedOn: ' + apcCreatedOn);
         //if only 1 apc, no processing needed
         if (sinceDateMilliseconds !== previousApcDate) {
-            console.info('sinceDateMilliseconds !== apcDateMilliseconds');
             const currentAssortmentItemIds = this.getBaselineItemIds(assortmentBaseline);
+            let scannedCount = 0;
+            let addedCount = 0;
             const deleteIds = (apcDeletes.length === 0)
                 ? []
                 : apcDeletes.map(item => item?.itemId);
@@ -376,19 +369,20 @@ class BaseProcessPublishAssortment {
                         ? apcHistory[i - 1]
                         : undefined;
                     const deleteChanges = await this.buildDeleteChanges(workingAPC, previousApc);
-                    console.info('checking deleteChanges');
                     for (const dItem of deleteChanges) {
                         const dItemId = dItem?.itemId;
-                        console.info(dItemId);
+                        scannedCount++;
                         if (!currentAssortmentItemIds.includes(dItemId) && !deleteIds.includes(dItemId)) {
-                            console.info('adding');
+                            addedCount++;
                             deleteIds.push(dItemId);
                             apcDeletes.push(dItem);
                         }
                     }
                 }
             }
-            console.info('getDeleteChanges()-currentAssortmentItemIds: ' + currentAssortmentItemIds);
+            console.info('getDeleteChanges(): baselineItems: ' + currentAssortmentItemIds.length
+                + ', scanned ' + scannedCount + ' historical delete changes, added ' + addedCount
+                + ', deleteIds: ' + deleteIds.length);
             console.info('getDeleteChanges()-deleteIds: ' + deleteIds);
         }
         return apcDeletes;
@@ -402,7 +396,6 @@ class BaseProcessPublishAssortment {
         return itemIds;
     }
     async downloadDeleteChanges(apc) {
-        console.info('deleteDataDownloadLink-start');
         try {
             const link = apc?.deleteDataDownloadLink;
             const response = await fetch(link);
@@ -410,19 +403,17 @@ class BaseProcessPublishAssortment {
             return data;
         }
         catch (e) {
-            console.log('Error deleteDataDownloadLink: ' + e.message);
+            console.error('Error deleteDataDownloadLink: ' + e.message);
         }
         return undefined;
     }
     async buildDeleteChanges(apc, previousApc) {
-        console.info('buildDeleteChanges()');
         if (apc?.deleteDataDownloadLink) {
             const deleteChanges = await this.downloadDeleteChanges(apc);
             if (deleteChanges) {
                 return deleteChanges;
             }
         }
-        console.info('pulling down full APC');
         apc = await this.downloadAssortmentPublishChange(apc?.assortmentId, apc?.id);
         if (apc?.deleteDataDownloadLink) {
             const deleteChanges = await this.downloadDeleteChanges(apc);
@@ -434,19 +425,18 @@ class BaseProcessPublishAssortment {
             throw new Error(BaseProcessPublishAssortment.NOT_ABLE_TO_PROCESS_DELETE_CHANGES);
         }
         let previousBaseline;
-        console.info('check previousApc');
         if (previousApc?.assortmentBaselineDownloadLink) {
             previousBaseline = await this.downloadAssortmentBaseline(previousApc);
         }
         else {
-            console.info('previousApc pulling down full APC');
             previousApc = await this.downloadAssortmentPublishChange(previousApc?.assortmentId, previousApc?.id);
             previousBaseline = await this.downloadAssortmentBaseline(previousApc);
         }
         const deleteIds = apc?.detail?.deletes.map(dItem => dItem?.id);
         //building deletes based on previous baseline; because some APCs don't have delete data
         const deleteArray = previousBaseline?.assortmentItems.filter(aItem => deleteIds.includes(aItem?.itemId));
-        console.info('deleteArray.length: ' + deleteArray.length);
+        console.info('buildDeleteChanges(): no deleteDataDownloadLink on apc ' + apc?.id
+            + '; rebuilding ' + deleteArray.length + ' deletes from previous baseline');
         return deleteArray;
     }
     async getItemFederatedIds( /*itemIds*/) {
@@ -484,7 +474,6 @@ class BaseProcessPublishAssortment {
         return deleteItems;
     }
     getReleasedForDevelopmentItemAndFamilyIds(fullChange, deleteChanges) {
-        console.info('getReleasedForDevelopmentItemAndFamilyIds');
         const releasedForDevelopmentItemIds = [];
         const itemFamilySet = new Set();
         const assortmentItemsArray = fullChange?.assortmentItems;
@@ -536,7 +525,6 @@ class BaseProcessPublishAssortment {
         return !!lifecycleStage && !this.config.itemPreDevelopmentLifecycleStages.includes(lifecycleStage);
     }
     async processPublish(pcd, changeDetail, fullChange, deleteChanges) {
-        console.info('processPublish-start');
         const event = {
             assortmentId: pcd.assortmentId,
             assortmentPublishChangeId: pcd.assortmentPublishChangeId
@@ -720,7 +708,6 @@ class BaseProcessPublishAssortment {
             + '-' + d.getUTCMilliseconds();
     }
     getItemFamilyChanges(pcd, changeDetail, assortmentItemFullChangeMap, assortmentItemDeleteMap) {
-        console.info('getItemFamilyChanges-start');
         const itemFamilyChanges = new Map();
         const { adds, deletes, updates, familyItemsRemoved } = changeDetail;
         const addIds = adds.map(item => item.id);
@@ -785,8 +772,7 @@ class BaseProcessPublishAssortment {
             }
             else {
                 if (!item) {
-                    console.error('Failed to find deleted item entity');
-                    console.error(' itemFamilyId: ' + itemFamilyId + ' -itemId: ' + itemId);
+                    console.error('Failed to find deleted item entity: itemFamilyId: ' + itemFamilyId + ', itemId: ' + itemId);
                     continue;
                 }
             }
@@ -823,7 +809,6 @@ class BaseProcessPublishAssortment {
         return itemFamilyChanges;
     }
     async getEventsForPublishChangeData(publishChangeData) {
-        console.info('getEventsForPublishChangeData-start');
         const seasonalPayloads = [];
         for (const itemFamilyChange of publishChangeData.itemFamilyChanges.values()) {
             const events = await this.getEventsForItemFamilyChanges(itemFamilyChange, publishChangeData.assortmentId, publishChangeData.seasonFed, publishChangeData.itemToFederatedIdMapping);
@@ -831,6 +816,8 @@ class BaseProcessPublishAssortment {
                 seasonalPayloads.push(...events);
             }
         }
+        console.info('getEventsForPublishChangeData: itemFamilies: '
+            + publishChangeData.itemFamilyChanges.size + ', payloads: ' + seasonalPayloads.length);
         return seasonalPayloads;
     }
     /**Returns the events for a given ItemFamilyChanges object
@@ -850,7 +837,6 @@ class BaseProcessPublishAssortment {
      * @returns
      */
     async getEventsForItemFamilyChanges(itemFamilyChanges, assortmentId, seasonFed, itemToFederatedIdMapping) {
-        console.info('getEventsForItemFamilyChanges()');
         const events = [];
         const LCSSeason = Object.assign({}, seasonFed);
         const assortment = await this.getAssortment(assortmentId);

package/lib/util/data-converter.js

@@ -175,18 +175,12 @@ class DataConverter {
     }
     async getObjectReferenceValue(prop, newData, inflateObjRef = false) {
         const slug = prop['slug'];
-        if (app_framework_1.Logger.isDebugOn()) {
-            console.debug('getObjectReferenceValue-prop: ' + slug);
-        }
         let value = newData[slug];
         const entityType = prop['referencedTypeRootSlug'];
         const entityId = newData[slug + 'Id'];
         if ((!value || typeof value === 'string') && inflateObjRef) {
             if (entityId) {
                 if (this.objRefCache[entityId]) {
-                    if (app_framework_1.Logger.isDebugOn()) {
-                        console.debug('cache hit: ' + entityId);
-                    }
                     return this.objRefCache[entityId];
                 }
                 const criteria = {
@@ -432,9 +426,6 @@ class DataConverter {
             return "";
         }
         if (this.objRefCache[ctx.cacheKey]) {
-            if (app_framework_1.Logger.isDebugOn()) {
-                console.debug(`object reference cache hit: ${ctx.cacheKey}`);
-            }
             return this.objRefCache[ctx.cacheKey];
         }
         const objectReferenceId = ctx.useIdentityService
@@ -634,9 +625,6 @@ class DataConverter {
         }
         let cacheUser = DataConverter.getFromStaticCache(nd.email);
         if (cacheUser) {
-            if (app_framework_1.Logger.isDebugOn()) {
-                console.debug('user cache hit: ' + nd.email);
-            }
             await this.processGroupMemberCheck(prop, nd.email);
             return cacheUser;
         }
@@ -706,18 +694,12 @@ class DataConverter {
      */
     async getUserListValue(prop, newData) {
         const slug = prop['slug'];
-        if (app_framework_1.Logger.isDebugOn()) {
-            console.debug('getUserListValue-prop: ' + slug);
-        }
         const entityId = newData[slug + 'Id'];
         if (!entityId) {
             return {};
         }
         const cacheUser = DataConverter.getFromStaticCache(entityId);
         if (cacheUser) {
-            if (app_framework_1.Logger.isDebugOn()) {
-                console.debug('user cache hit: ' + entityId);
-            }
             return Object.assign({}, cacheUser);
         }
         const user = await this.getUserById(entityId);

package/package.json

@@ -1,66 +1,66 @@
-{
-  "name": "@contrail/flexplm",
-  "version": "1.7.3",
-  "description": "Library used for integration with flexplm.",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "bin": {
-    "flexplm-mapping": "lib/cli/index.js"
-  },
-  "files": [
-    "lib/**/*",
-    "scripts/copy-template.js"
-  ],
-  "scripts": {
-    "build": "tsc; node scripts/copy-template.js",
-    "build:win": "tsc && node scripts/copy-template.js",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
-    "test": "jest",
-    "test-watch": "jest --watch",
-    "test-debug": "jest --runInBand",
-    "test-coverage": "jest --coverage"
-  },
-  "keywords": [],
-  "author": "VibeIQ",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/jest": "^29.5.2",
-    "jest": "^29.5.0",
-    "prettier": "^1.19.1",
-    "ts-jest": "^29.1.1",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.0.0"
-  },
-  "peerDependencies": {
-    "typescript": ">=4.0.0"
-  },
-  "peerDependenciesMeta": {
-    "typescript": {
-      "optional": true
-    }
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".spec.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
-  },
-  "dependencies": {
-    "@contrail/app-framework": "^1.4.3",
-    "@contrail/sdk": "^1.5.10",
-    "@contrail/transform-data": "^1.3.2",
-    "@contrail/util": "^1.3.1",
-    "axios": "^1.4.0",
-    "p-limit": "^3.1.0"
-  }
-}
+{
+  "name": "@contrail/flexplm",
+  "version": "1.7.4-alpha.2fb7e1f",
+  "description": "Library used for integration with flexplm.",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "bin": {
+    "flexplm-mapping": "lib/cli/index.js"
+  },
+  "files": [
+    "lib/**/*",
+    "scripts/copy-template.js"
+  ],
+  "scripts": {
+    "build": "tsc; node scripts/copy-template.js",
+    "build:win": "tsc && node scripts/copy-template.js",
+    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
+    "lint": "tslint -p tsconfig.json",
+    "test": "jest",
+    "test-watch": "jest --watch",
+    "test-debug": "jest --runInBand",
+    "test-coverage": "jest --coverage"
+  },
+  "keywords": [],
+  "author": "VibeIQ",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/jest": "^29.5.2",
+    "jest": "^29.5.0",
+    "prettier": "^1.19.1",
+    "ts-jest": "^29.1.1",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^4.0.0"
+  },
+  "peerDependencies": {
+    "typescript": ">=4.0.0"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".spec.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  },
+  "dependencies": {
+    "@contrail/app-framework": "^1.4.3",
+    "@contrail/sdk": "^1.5.10",
+    "@contrail/transform-data": "^1.3.2",
+    "@contrail/util": "^1.3.1",
+    "axios": "^1.4.0",
+    "p-limit": "^3.1.0"
+  }
+}