@contrail/flexplm 1.1.45 → 1.1.46

package/.github/pull_request_template.md

@@ -27,5 +27,5 @@ Describe the testing you added to this PR
 
 
 ## Link to Jira ticket(s)
-https://vibe-team.atlassian.net/browse/TICKET_NUMBER_HERE
+https://vibe-team.atlassian.net/browse/VIBE-TICKET_NUMBER_HERE
 

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

@@ -6,10 +6,10 @@ const flexplm_connect_1 = require("../util/flexplm-connect");
 const item_family_changes_1 = require("../interfaces/item-family-changes");
 const publish_change_data_1 = require("../interfaces/publish-change-data");
 const map_utils_1 = require("../util/map-utils");
+const type_conversion_utils_1 = require("../util/type-conversion-utils");
 const fsPromise = require("fs/promises");
 const path = require("path");
 const app_framework_1 = require("@contrail/app-framework");
-const type_conversion_utils_1 = require("../util/type-conversion-utils");
 class BaseProcessPublishAssortment {
     constructor(_config, _dc, _mapFileUtil) {
         this.TTL = 7 * 24 * 60 * 60 * 1000;
@@ -129,15 +129,16 @@ class BaseProcessPublishAssortment {
             entityReference: 'assortment:' + assortmentId,
             objectClass: 'LCSSeason',
         };
-        const identifierKeys = this.config?.identifierAtts?.LCSSeason || [];
-        for (const key of identifierKeys) {
+        const identifierKeys = await type_conversion_utils_1.TypeConversionUtils.getIdentifierProperties(this.transformMapFile, this.mapFileUtil, assortmentObj);
+        const informationKeys = await type_conversion_utils_1.TypeConversionUtils.getInformationalProperties(this.transformMapFile, this.mapFileUtil, assortmentObj);
+        for (const key of identifierKeys.concat(informationKeys)) {
             if (assortmentObj[key]) {
                 seasonObj[key] = assortmentObj[key];
             }
         }
         const objectKeys = Object.keys(seasonObj);
         const hasAllIdentifiers = identifierKeys.every(key => objectKeys.includes(key));
-        if (!hasAllIdentifiers && !seasonObj?.federationId) {
+        if (!hasAllIdentifiers) {
             throw new Error(BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO + identifierKeys);
         }
         seasonObj = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonObj, 'LCSSeason', 'vibe2flex');
@@ -806,13 +807,14 @@ class BaseProcessPublishAssortment {
         return await this.dc.getFlexPLMObjectData(projectItem, [], true);
     }
     async getProductFederation(entityReference, itemToFederatedIdMapping, itemFamilyObject) {
-        const identifierKeys = this.config?.identifierAtts?.LCSProduct;
         const itemObj = await this.dc.getFlexPLMObjectData(itemFamilyObject, [], true);
         let prodObj = {
             entityReference: 'item:' + entityReference,
             objectClass: 'LCSProduct',
         };
-        for (const key of identifierKeys) {
+        const identifierKeys = await type_conversion_utils_1.TypeConversionUtils.getIdentifierProperties(this.transformMapFile, this.mapFileUtil, itemFamilyObject);
+        const informationKeys = await type_conversion_utils_1.TypeConversionUtils.getInformationalProperties(this.transformMapFile, this.mapFileUtil, itemFamilyObject);
+        for (const key of identifierKeys.concat(informationKeys)) {
             if (itemObj[key]) {
                 prodObj[key] = itemObj[key];
             }
@@ -824,13 +826,14 @@ class BaseProcessPublishAssortment {
         return prodObj;
     }
     async getSKUFederation(entityReference, itemToFederatedIdMapping, itemObject) {
-        const identifierKeys = this.config?.identifierAtts?.LCSSKU;
         const itemObj = await this.dc.getFlexPLMObjectData(itemObject, [], true);
         let skuObj = {
             entityReference: 'item:' + entityReference,
             objectClass: 'LCSSKU',
         };
-        for (const key of identifierKeys) {
+        const identifierKeys = await type_conversion_utils_1.TypeConversionUtils.getIdentifierProperties(this.transformMapFile, this.mapFileUtil, itemObject);
+        const informationKeys = await type_conversion_utils_1.TypeConversionUtils.getInformationalProperties(this.transformMapFile, this.mapFileUtil, itemObject);
+        for (const key of identifierKeys.concat(informationKeys)) {
             if (itemObj[key]) {
                 skuObj[key] = itemObj[key];
             }
@@ -900,5 +903,5 @@ class BaseProcessPublishAssortment {
 }
 exports.BaseProcessPublishAssortment = BaseProcessPublishAssortment;
 BaseProcessPublishAssortment.ASSORTMENT_NOT_PUBLISHABLE = 'Assortment isn\'t marked for publishing to FlexPLM';
-BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO = 'Assortment doesn\'t have all "identifier" properties or a federated id, so there is no processing. Identifier properties: ';
+BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO = 'Assortment doesn\'t have all "identifier" properties, so there is no processing. Identifier properties: ';
 BaseProcessPublishAssortment.NOT_ABLE_TO_PROCESS_DELETE_CHANGES = 'Error: Not able to process delete changes';

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

@@ -41,24 +41,29 @@ jest.mock('@contrail/sdk', () => {
     };
 });
 describe('process publish assortment', () => {
-    const config = {
-        identifierAtts: {
-            LCSSeason: ['flexPLMSeasonName']
-        }
-    };
+    const config = {};
     beforeEach(() => {
         federatedId = '';
         entityObject = { publishToFlexPLM: true };
         getOptionsObject = {};
     });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
     it('No Federation Info', async () => {
         const event = {
             assortmentId: 'B3oRQpYVYzcJAJtQ'
         };
+        const identifierKeys = ['flexPLMSeasonName'];
+        const informationKeys = ['name'];
+        const spyTCU_id_keys = jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties')
+            .mockImplementation(async () => identifierKeys);
+        const spyTCU_info_keys = jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties')
+            .mockImplementation(async () => informationKeys);
         const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
         const dc = new data_converter_1.DataConverter(config, mapFileUtil);
         const results = await new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil).process(event);
-        expect(results['results']['message']).toEqual(base_process_publish_assortment_1.BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO + config.identifierAtts.LCSSeason);
+        expect(results['results']['message']).toEqual(base_process_publish_assortment_1.BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO + identifierKeys);
     });
 });
 describe('getPublishInfo', () => {
@@ -425,9 +430,18 @@ describe('getSeasonFederation', () => {
         entityObject = { publishToFlexPLM: true };
         getOptionsObject = {};
     });
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
     it('No Federation Info', async () => {
         const assortmentId = 'B3oRQpYVYzcJAJtQ';
         try {
+            const identifierKeys = ['flexPLMSeasonName'];
+            const informationKeys = ['name'];
+            const spyTCU_id_keys = jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties')
+                .mockImplementation(async () => identifierKeys);
+            const spyTCU_info_keys = jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties')
+                .mockImplementation(async () => informationKeys);
             const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
             const dc = new data_converter_1.DataConverter(config, mapFileUtil);
             await new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil).getSeasonFederation(assortmentId);

package/lib/util/type-utils.js

@@ -85,12 +85,13 @@ class TypeUtils {
     filterTypeProperties(type, newData) {
         let filteredProps = type['typeProperties'];
         const typePath = type['typePath'];
+        const roles = newData['roles'];
         if (typePath && (typePath.startsWith('item') || typePath.startsWith('project-item'))) {
             if (app_framework_1.Logger.isDebugOn()) {
-                console.debug('typePath: ' + typePath);
-                console.debug('newData: ' + JSON.stringify(newData));
+                console.debug('filterTypeProperties():id: ' + newData?.id
+                    + ', typePath: ' + typePath
+                    + ', newData.roles: ' + newData?.roles);
             }
-            const roles = newData['roles'];
             if (roles) {
                 const isFamily = roles.includes('family');
                 if (app_framework_1.Logger.isDebugOn()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.45",
+  "version": "1.1.46",
   "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

@@ -43,24 +43,30 @@ jest.mock('@contrail/sdk', () => {
   };
 });
 describe('process publish assortment', () => {
-  const config = {
-    identifierAtts: {
-      LCSSeason: ['flexPLMSeasonName']
-    }
-  } as unknown as FCConfig;
+  const config = { } as unknown as FCConfig;
   beforeEach(() => {
     federatedId = '';
     entityObject = {publishToFlexPLM:true};
     getOptionsObject = {};
   });
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
   it('No Federation Info', async () => {
     const event = {
       assortmentId: 'B3oRQpYVYzcJAJtQ'
     };
+    const identifierKeys = ['flexPLMSeasonName'];
+    const informationKeys = ['name'];
+    const spyTCU_id_keys = jest.spyOn(TypeConversionUtils, 'getIdentifierProperties')
+    .mockImplementation(async () => identifierKeys);
+    const spyTCU_info_keys = jest.spyOn(TypeConversionUtils, 'getInformationalProperties')
+    .mockImplementation(async () => informationKeys);
+
     const mapFileUtil = new MapFileUtil(new Entities());
     const dc = new DataConverter(config, mapFileUtil);
     const results = await new BaseProcessPublishAssortment(config, dc, mapFileUtil).process(event);
-    expect(results['results']['message']).toEqual(BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO + config.identifierAtts.LCSSeason);
+    expect(results['results']['message']).toEqual(BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO + identifierKeys);
   });
 });
 
@@ -479,10 +485,20 @@ describe('getSeasonFederation', () =>{
     entityObject = { publishToFlexPLM:true};
     getOptionsObject = {};
   });
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
   it('No Federation Info', async () => {
     const assortmentId = 'B3oRQpYVYzcJAJtQ';
 
     try {
+      const identifierKeys = ['flexPLMSeasonName'];
+      const informationKeys = ['name'];
+      const spyTCU_id_keys = jest.spyOn(TypeConversionUtils, 'getIdentifierProperties')
+      .mockImplementation(async () => identifierKeys);
+      const spyTCU_info_keys = jest.spyOn(TypeConversionUtils, 'getInformationalProperties')
+      .mockImplementation(async () => informationKeys);
+  
       const mapFileUtil = new MapFileUtil(new Entities());
       const dc = new DataConverter(config, mapFileUtil);
       await new BaseProcessPublishAssortment(config, dc, mapFileUtil).getSeasonFederation(assortmentId);