@contrail/flexplm 1.1.24 → 1.1.26

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

@@ -401,16 +401,16 @@ class BaseProcessPublishAssortment {
         const assortmentItemsArray = fullChange['assortmentItems'];
         for (const aItem of assortmentItemsArray) {
             const meetsCriteria = this.meetsCriteria(aItem);
-            const item = aItem['item'];
-            const itemId = item['id'];
-            const itemFamilyId = item['itemFamilyId'];
-            console.debug('itemId: ' + item['id']);
-            if (meetsCriteria) {
+            const item = aItem?.item;
+            const itemId = item?.id;
+            const itemFamilyId = item?.itemFamilyId;
+            console.debug('itemId: ' + item?.id);
+            if (item && meetsCriteria) {
                 console.debug('adding item to releasedForDevelopmentItemIds');
                 console.debug('itemFamilyId: ' + item['itemFamilyId']);
                 releasedForDevelopmentItemIds.push(itemId);
                 if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item['itemFamily'];
+                    const familyItem = item?.itemFamily;
                     const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
                     if (familyItemMeetsCriteria) {
                         releasedForDevelopmentItemIds.push(itemFamilyId);
@@ -421,14 +421,14 @@ class BaseProcessPublishAssortment {
         }
         for (const dItem of deleteChanges) {
             const meetsCriteria = this.meetsCriteria(dItem);
-            const item = dItem['item'];
-            const itemId = item['id'];
-            const itemFamilyId = item['itemFamilyId'];
-            console.debug('itemId: ' + item['id']);
-            if (meetsCriteria) {
+            const item = dItem?.item;
+            const itemId = item?.id;
+            const itemFamilyId = item?.itemFamilyId;
+            console.debug('itemId: ' + item?.id);
+            if (item && meetsCriteria) {
                 releasedForDevelopmentItemIds.push(itemId);
                 if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item['itemFamily'];
+                    const familyItem = item?.itemFamily;
                     if (familyItem) {
                         const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
                         if (familyItemMeetsCriteria) {
@@ -445,8 +445,7 @@ class BaseProcessPublishAssortment {
         return releasedForDevelopmentItemIds;
     }
     meetsCriteria(aItem) {
-        const item = aItem['item'];
-        const lifecycleStage = item['lifecycleStage'];
+        const lifecycleStage = aItem?.item?.lifecycleStage;
         return lifecycleStage && !this.config.itemPreDevelopmentLifecycleStages.includes(lifecycleStage);
     }
     async processPublish(pcd, changeDetail, fullChange, deleteChanges) {
@@ -563,7 +562,8 @@ class BaseProcessPublishAssortment {
         const updateIds = updates.map(item => item.id);
         const familyItemsRemovedIds = familyItemsRemoved.map(item => item.itemId);
         for (const [itemId, aItem] of assortmentItemFullChangeMap) {
-            const { item: { itemFamilyId }, projectItem } = aItem;
+            const projectItem = aItem?.projectItem;
+            const itemFamilyId = aItem?.item?.itemFamilyId;
             if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
                 continue;
             }
@@ -707,7 +707,7 @@ class BaseProcessPublishAssortment {
             let item = {};
             if (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference)) {
                 const fullAi = itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference);
-                item = fullAi['item'];
+                item = fullAi?.item;
             }
             const projectItem = this.getProjectItem(itemFamilyChanges, entityReference);
             let seasonalData = await this.getSeasonalData(projectItem);

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

@@ -1051,3 +1051,46 @@ describe('getCarriedFromSeason', () => {
         });
     });
 });
+describe('meetsCriteria', () => {
+    const config = {
+        identifierAtts: {
+            LCSSeason: ['flexPLMSeasonName']
+        },
+        itemPreDevelopmentLifecycleStages: ['concept']
+    };
+    const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
+    const dc = new data_converter_1.DataConverter(config, mapFileUtil);
+    const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+    it('no item', () => {
+        const aItem = {};
+        const results = bppa.meetsCriteria(aItem);
+        expect(results).toBeFalsy();
+    });
+    it('item - no lifecycle stage', () => {
+        const aItem = {
+            item: {
+                lifecycleStage: ''
+            }
+        };
+        const results = bppa.meetsCriteria(aItem);
+        expect(results).toBeFalsy();
+    });
+    it('item - concept lifecycle stage', () => {
+        const aItem = {
+            item: {
+                lifecycleStage: 'concept'
+            }
+        };
+        const results = bppa.meetsCriteria(aItem);
+        expect(results).toBeFalsy();
+    });
+    it('item - delevopment lifecycle stage', () => {
+        const aItem = {
+            item: {
+                lifecycleStage: 'delevopment'
+            }
+        };
+        const results = bppa.meetsCriteria(aItem);
+        expect(results).toBeTruthy();
+    });
+});

package/lib/util/data-converter.js

@@ -374,20 +374,53 @@ class DataConverter {
             }
         }
         if (!objectReferenceId) {
-            console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} not found.`);
+            console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} didn't match any entities.`);
             return objectReferenceId;
         }
         this.objRefCache[cacheKey] = objectReferenceId;
         return objectReferenceId;
     }
     async getAllObjectReferences(entityType, rootTypeCriteria) {
+        const entities = new sdk_1.Entities();
         let loads = [];
         let nextPageKey;
+        let usedV2 = false;
         do {
-            const loadPage = await new sdk_1.Entities().get({ entityName: entityType, criteria: rootTypeCriteria, apiVersion: sdk_1.API_VERSION.V2, nextPageKey });
-            nextPageKey = loadPage.nextPageKey;
-            loads.push(...loadPage.results);
+            const loadPage = await entities.get({
+                entityName: entityType,
+                criteria: rootTypeCriteria,
+                apiVersion: sdk_1.API_VERSION.V2,
+                nextPageKey,
+            });
+            nextPageKey = loadPage?.nextPageKey;
+            if (Object.keys(loadPage).includes('results')) {
+                usedV2 = true;
+                loads.push(...loadPage.results);
+            }
+            else {
+                nextPageKey = null;
+            }
         } while (nextPageKey);
+        if (!usedV2) {
+            const take = 1000;
+            let skip = 0;
+            let done = false;
+            while (!done) {
+                const loadPage = await entities.get({
+                    entityName: entityType,
+                    criteria: rootTypeCriteria,
+                    take,
+                    skip,
+                });
+                loads.push(...loadPage);
+                if (loadPage.length !== take) {
+                    done = true;
+                }
+                else {
+                    skip += take;
+                }
+            }
+        }
         return loads;
     }
     checkKeysAndValues(criteria, arrayOfObjects, entityTypePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/publish/base-process-publish-assortment.spec.ts

@@ -1237,3 +1237,54 @@ describe('getCarriedFromSeason', () =>{
 
 });
 
+describe('meetsCriteria', () =>{
+  const config = {
+    identifierAtts: {
+      LCSSeason: ['flexPLMSeasonName']
+    },
+    itemPreDevelopmentLifecycleStages: ['concept']
+  } as unknown as FCConfig;
+  const mapFileUtil = new MapFileUtil(new Entities());
+  const dc = new DataConverter(config, mapFileUtil);
+  const bppa = new BaseProcessPublishAssortment(config, dc, mapFileUtil);
+  it('no item', () =>{
+    const aItem = {};
+
+    const results = bppa.meetsCriteria(aItem);
+    expect(results).toBeFalsy();
+  });
+
+  it('item - no lifecycle stage', () =>{
+    const aItem = {
+      item: {
+        lifecycleStage: ''
+      }
+    };
+
+    const results = bppa.meetsCriteria(aItem);
+    expect(results).toBeFalsy();
+  });
+
+  it('item - concept lifecycle stage', () =>{
+    const aItem = {
+      item: {
+        lifecycleStage: 'concept'
+      }
+    };
+
+    const results = bppa.meetsCriteria(aItem);
+    expect(results).toBeFalsy();
+  });
+
+  it('item - delevopment lifecycle stage', () =>{
+    const aItem = {
+      item: {
+        lifecycleStage: 'delevopment'
+      }
+    };
+
+    const results = bppa.meetsCriteria(aItem);
+    expect(results).toBeTruthy();
+  });
+
+});

package/src/publish/base-process-publish-assortment.ts

@@ -497,16 +497,16 @@ export class BaseProcessPublishAssortment {
 
     for (const aItem of assortmentItemsArray) {
       const meetsCriteria= this.meetsCriteria(aItem);
-      const item = aItem['item'];
-      const itemId = item['id'];
-      const itemFamilyId = item['itemFamilyId'];
-      console.debug('itemId: ' + item['id']);
-      if(meetsCriteria){
+      const item = aItem?.item;
+      const itemId = item?.id;
+      const itemFamilyId = item?.itemFamilyId;
+      console.debug('itemId: ' + item?.id);
+      if(item && meetsCriteria){
         console.debug('adding item to releasedForDevelopmentItemIds');
         console.debug('itemFamilyId: ' + item['itemFamilyId']);
         releasedForDevelopmentItemIds.push(itemId);
         if(!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId){
-          const familyItem = item['itemFamily'];
+          const familyItem = item?.itemFamily;
           const familyItemMeetsCriteria = this.meetsCriteria({item: familyItem});
           if(familyItemMeetsCriteria){
             releasedForDevelopmentItemIds.push(itemFamilyId);
@@ -518,14 +518,14 @@ export class BaseProcessPublishAssortment {
 
     for(const dItem of deleteChanges){
       const meetsCriteria = this.meetsCriteria(dItem);
-      const item = dItem['item'];
-      const itemId = item['id'];
-      const itemFamilyId = item['itemFamilyId'];
-      console.debug('itemId: ' + item['id']);
-      if(meetsCriteria) {
+      const item = dItem?.item;
+      const itemId = item?.id;
+      const itemFamilyId = item?.itemFamilyId;
+      console.debug('itemId: ' + item?.id);
+      if(item && meetsCriteria) {
         releasedForDevelopmentItemIds.push(itemId);
         if(!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId){
-          const familyItem = item['itemFamily'];
+          const familyItem = item?.itemFamily;
           if(familyItem){
             const familyItemMeetsCriteria = this.meetsCriteria({item: familyItem});
             if(familyItemMeetsCriteria){
@@ -542,8 +542,7 @@ export class BaseProcessPublishAssortment {
   }
 
   meetsCriteria(aItem): boolean {
-    const item = aItem['item'];
-    const lifecycleStage = item['lifecycleStage'];
+    const lifecycleStage = aItem?.item?.lifecycleStage;
 
     return lifecycleStage && !this.config.itemPreDevelopmentLifecycleStages.includes(lifecycleStage);
   }
@@ -678,7 +677,8 @@ export class BaseProcessPublishAssortment {
     const familyItemsRemovedIds = familyItemsRemoved.map(item => item.itemId);
 
     for (const [itemId, aItem] of assortmentItemFullChangeMap) {
-      const { item: { itemFamilyId }, projectItem } = aItem;
+      const projectItem = aItem?.projectItem;
+      const itemFamilyId = aItem?.item?.itemFamilyId;
 
       if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
         continue;
@@ -855,7 +855,7 @@ export class BaseProcessPublishAssortment {
       let item = {};
       if (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference)) {
         const fullAi = itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference);
-        item = fullAi['item'];
+        item = fullAi?.item;
       }
       const projectItem = this.getProjectItem(itemFamilyChanges, entityReference);
       let seasonalData = await this.getSeasonalData(projectItem);

package/src/util/data-converter.ts

@@ -458,7 +458,7 @@ export class DataConverter {
     }
 
     if (!objectReferenceId) {
-      console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} not found.`);
+      console.warn(`The passed in object reference criteria ${JSON.stringify(combinedCriteria)} didn't match any entities.`);
       return objectReferenceId;
     }
 
@@ -475,13 +475,47 @@ export class DataConverter {
    * @returns {Promise<Array>} A Promise that resolves to an array containing all object references.
    */
   async getAllObjectReferences(entityType, rootTypeCriteria) {
-    let loads = []
+    const entities = new Entities();
+    let loads = [];
     let nextPageKey;
+    let usedV2 = false;
     do {
-      const loadPage = await new Entities().get({ entityName: entityType, criteria: rootTypeCriteria, apiVersion: API_VERSION.V2, nextPageKey })
-      nextPageKey = loadPage.nextPageKey;
-      loads.push(...loadPage.results);
+      const loadPage = await entities.get({
+        entityName: entityType,
+        criteria: rootTypeCriteria,
+        apiVersion: API_VERSION.V2,
+        nextPageKey,
+      });
+      nextPageKey = loadPage?.nextPageKey;
+      if (Object.keys(loadPage).includes('results')) {
+        usedV2 = true;
+        loads.push(...loadPage.results);
+      } else {
+        nextPageKey = null;
+      }
     } while (nextPageKey);
+
+    if (!usedV2) {
+      const take = 1000;
+      let skip = 0;
+      let done = false;
+      while (!done) {
+        const loadPage = await entities.get({
+          entityName: entityType,
+          criteria: rootTypeCriteria,
+          take,
+          skip,
+        });
+        loads.push(...loadPage);
+
+        if (loadPage.length !== take) {
+          done = true;
+        } else {
+          skip += take;
+        }
+      }
+    }
+
     return loads;
   }