@contrail/flexplm 1.1.65 → 1.1.66

package/lib/entity-processor/base-entity-processor.js

@@ -280,6 +280,9 @@ class BaseEntityProcessor {
         const flexPayload = (payload) ? payload[0] : undefined;
         let outboundEntityUpdates = undefined;
         if (flexPayload && 'OK' === flexPayload.status) {
+            if (flexPayload.data && !flexPayload.data?.flexPLMObjectClass) {
+                flexPayload.data.flexPLMObjectClass = flexPayload.objectClass;
+            }
             const inboundData = await this.getTransformedData(flexPayload);
             outboundEntityUpdates = await this.getUpdatesForEntity(event.newData, inboundData);
         }

package/lib/entity-processor/base-entity-processor.spec.js

@@ -91,6 +91,85 @@ describe('BaseEntityProcessor', () => {
             expect(getUpdatesForEntitySpy).toBeCalledTimes(0);
             expect(updates).toBeUndefined();
         });
+        it('should set flexPLMObjectClass when data exists but flexPLMObjectClass is missing', async () => {
+            const btep = new TestBaseEntityProcessor(config, dc, mapFileUtil, 'test');
+            const event = { newData: { id: '123' } };
+            const flexResponse = {
+                data: {
+                    payload: [
+                        {
+                            status: 'OK',
+                            objectClass: 'Material',
+                            data: {
+                                name: 'Test Material'
+                            }
+                        }
+                    ]
+                }
+            };
+            const getTransformedDataSpy = jest.spyOn(btep, 'getTransformedData').mockReturnValue(Promise.resolve({}));
+            const returnValue = {
+                name: 'Test'
+            };
+            const getUpdatesForEntitySpy = jest.spyOn(btep, 'getUpdatesForEntity').mockReturnValue(Promise.resolve(returnValue));
+            await btep.getOutboundEntityUpdates(event, flexResponse);
+            expect(flexResponse.data.payload[0].data['flexPLMObjectClass']).toBe('Material');
+            expect(getTransformedDataSpy).toBeCalledTimes(1);
+            expect(getTransformedDataSpy).toBeCalledWith(flexResponse.data.payload[0]);
+            expect(getUpdatesForEntitySpy).toBeCalledTimes(1);
+        });
+        it('should not override existing flexPLMObjectClass', async () => {
+            const btep = new TestBaseEntityProcessor(config, dc, mapFileUtil, 'test');
+            const event = { newData: { id: '123' } };
+            const flexResponse = {
+                data: {
+                    payload: [
+                        {
+                            status: 'OK',
+                            objectClass: 'Material',
+                            data: {
+                                name: 'Test Material',
+                                flexPLMObjectClass: 'ExistingClass'
+                            }
+                        }
+                    ]
+                }
+            };
+            const getTransformedDataSpy = jest.spyOn(btep, 'getTransformedData').mockReturnValue(Promise.resolve({}));
+            const returnValue = {
+                name: 'Test'
+            };
+            const getUpdatesForEntitySpy = jest.spyOn(btep, 'getUpdatesForEntity').mockReturnValue(Promise.resolve(returnValue));
+            await btep.getOutboundEntityUpdates(event, flexResponse);
+            expect(flexResponse.data.payload[0].data.flexPLMObjectClass).toBe('ExistingClass');
+            expect(getTransformedDataSpy).toBeCalledTimes(1);
+            expect(getTransformedDataSpy).toBeCalledWith(flexResponse.data.payload[0]);
+            expect(getUpdatesForEntitySpy).toBeCalledTimes(1);
+        });
+        it('should handle when data is null or undefined', async () => {
+            const btep = new TestBaseEntityProcessor(config, dc, mapFileUtil, 'test');
+            const event = { newData: { id: '123' } };
+            const flexResponse = {
+                data: {
+                    payload: [
+                        {
+                            status: 'OK',
+                            objectClass: 'Material',
+                            data: null
+                        }
+                    ]
+                }
+            };
+            const getTransformedDataSpy = jest.spyOn(btep, 'getTransformedData').mockReturnValue(Promise.resolve({}));
+            const returnValue = {
+                name: 'Test'
+            };
+            const getUpdatesForEntitySpy = jest.spyOn(btep, 'getUpdatesForEntity').mockReturnValue(Promise.resolve(returnValue));
+            await btep.getOutboundEntityUpdates(event, flexResponse);
+            expect(getTransformedDataSpy).toBeCalledTimes(1);
+            expect(getTransformedDataSpy).toBeCalledWith(flexResponse.data.payload[0]);
+            expect(getUpdatesForEntitySpy).toBeCalledTimes(1);
+        });
     });
     describe('queryEntityWithSubType', () => {
         const config = {};

package/lib/publish/base-process-publish-assortment.d.ts

@@ -3,7 +3,6 @@ import { DataConverter } from '../util/data-converter';
 import { ItemFamilyChanges } from '../interfaces/item-family-changes';
 import { PublishChangeData } from '../interfaces/publish-change-data';
 import { MapFileUtil } from '@contrail/transform-data';
-import { AssortmentPublishChange } from '@contrail/entity-types';
 export declare class BaseProcessPublishAssortment {
     private TTL;
     static ASSORTMENT_NOT_PUBLISHABLE: string;
@@ -36,16 +35,16 @@ export declare class BaseProcessPublishAssortment {
     getSnapshotVersion(assortment: any, apc: any): Promise<number | string>;
     getSeasonFederation(assortmentId: any): Promise<SeasonFederation>;
     getAssortment(assortmentId: any): Promise<any>;
-    getSinceDate(assortmentId: any, assortmentPublishChangeId: any, apcHistory: AssortmentPublishChange[]): Promise<Date>;
-    getApcHistory(assortmentId: string): Promise<AssortmentPublishChange[]>;
+    getSinceDate(assortmentId: any, assortmentPublishChangeId: any, apcHistory: object[]): Promise<Date>;
+    getApcHistory(assortmentId: any): Promise<any>;
     protected updatedSinceDate(entity: any, sinceDate: Date): boolean;
-    getSinceDateFromAPCSpecificDate(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, specificDate: Date): Date;
-    getSinceDateDaysPrevious(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, daysBack: any): Date;
-    getSinceDateFromAPCs(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, pastPublishCount?: number): Date;
-    protected getPublisher(assortmentPublishChange: AssortmentPublishChange): {};
-    downloadAssortmentPublishChange(assortmentId: string, assortmentPublishChangeId: string): Promise<AssortmentPublishChange>;
-    downloadHydratedChangeDetail(assortmentPublishChange: AssortmentPublishChange): Promise<any>;
-    downloadAssortmentBaseline(assortmentPublishChange: AssortmentPublishChange): Promise<any>;
+    getSinceDateFromAPCSpecificDate(apcHistory: any[], assortmentPublishChangeId: string, specificDate: Date): Date;
+    getSinceDateDaysPrevious(apcHistory: any[], assortmentPublishChangeId: string, daysBack: any): Date;
+    getSinceDateFromAPCs(apcHistory: any[], assortmentPublishChangeId: string, pastPublishCount?: number): Date;
+    protected getPublisher(assortmentPublishChange: any): {};
+    downloadAssortmentPublishChange(assortmentId: string, assortmentPublishChangeId: string): Promise<any>;
+    downloadHydratedChangeDetail(assortmentPublishChange: any): Promise<any>;
+    downloadAssortmentBaseline(assortmentPublishChange: any): Promise<any>;
     getDeleteChanges(assortmentPublishChange: any, apcHistory: any[], assortmentBaseline: any, sinceDate: Date): Promise<[]>;
     getBaselineItemIds(assortmentBaseline: any): string[];
     downloadDeleteChanges(apc: any): Promise<any>;

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

@@ -200,30 +200,14 @@ class BaseProcessPublishAssortment {
         return sinceDate;
     }
     async getApcHistory(assortmentId) {
-        const apcs = [];
-        const MAX_PAGES = 1000;
-        let nextPageKey = null;
-        const options = {
-            entityName: 'assortment',
-            id: assortmentId,
-            apiVersion: sdk_1.API_VERSION.V2,
-            nextPageKey,
-            relation: 'history',
-        };
-        let i = 0;
-        do {
-            const response = await new sdk_1.Entities().get(options);
-            if (response?.results) {
-                apcs.push(...response.results);
+        const resource = `/assortments/${assortmentId}/history/`;
+        return sdk_1.Request.request(resource, {
+            method: 'GET',
+            headers: {
+                Accept: 'application/json',
+                'Content-Type': 'application/json'
             }
-            nextPageKey = response?.nextPageKey;
-            options.nextPageKey = nextPageKey;
-            i++;
-        } while (nextPageKey && i < MAX_PAGES);
-        if (i === MAX_PAGES && nextPageKey) {
-            throw new Error('Max pages reached getting APC history for assortmentId: ' + assortmentId);
-        }
-        return apcs;
+        });
     }
     updatedSinceDate(entity, sinceDate) {
         const updatedOn = entity?.updatedOn;
@@ -277,8 +261,13 @@ class BaseProcessPublishAssortment {
         if (apcHistory.length === 1) {
             return new Date(0);
         }
-        const apc = apcHistory.find(apc => apc.id === assortmentPublishChangeId);
+        const apcIndex = apcHistory.findIndex(apc => apc.id === assortmentPublishChangeId);
+        if (apcIndex === 0) {
+            return new Date(0);
+        }
+        const apc = apcHistory[apcIndex];
         const apcDate = new Date(apc?.createdOn);
+        let sinceDate = new Date(0);
         const dateArray = [];
         for (const tempapc of apcHistory) {
             if (assortmentPublishChangeId !== tempapc?.id) {
@@ -288,12 +277,10 @@ class BaseProcessPublishAssortment {
                 }
             }
         }
-        if (dateArray.length === 0 || pastPublishCount > dateArray.length) {
-            return new Date(0);
-        }
-        dateArray.sort((a, b) => { return a.getTime() - b.getTime(); });
-        const arrIndex = dateArray.length - pastPublishCount;
-        return dateArray[arrIndex];
+        dateArray.sort((a, b) => { return Date.parse(a) - Date.parse(b); });
+        const arrIndex = (dateArray.length - pastPublishCount > 0) ? dateArray.length - pastPublishCount : 0;
+        sinceDate = dateArray[arrIndex];
+        return sinceDate;
     }
     getPublisher(assortmentPublishChange) {
         const createdBy = assortmentPublishChange?.createdBy;

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

@@ -624,8 +624,8 @@ describe('getSinceDateDaysPrevious', () => {
         expect(sinceDate).toEqual(matchDate);
     });
 });
-describe('getSinceDateFromAPCs - plan history in ascending order', () => {
-    it('oldest / only apc', () => {
+describe('getSinceDateFromAPCs', () => {
+    it('first / only apc', () => {
         const history = new Array(...mockData_1.plan1_history).slice(0, 1);
         const lastAPCId = 'v9BKkHo-tpL0wUZN';
         const matchDate = new Date(0);
@@ -636,7 +636,7 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('oldest / multiple apcs in history -ascending order', () => {
+    it('first / multiple apcs in history', () => {
         const history = new Array(...mockData_1.plan1_history).slice(0, 3);
         const lastAPCId = 'v9BKkHo-tpL0wUZN';
         const matchDate = new Date(0);
@@ -647,7 +647,7 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('most recent apc -ascending order', () => {
+    it('last apc', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
         const matchDate = new Date('2023-01-17T22:40:07.288Z');
@@ -658,7 +658,7 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('apc in the middle -ascending order', () => {
+    it('apc in the middle', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'GiT9CZXZGVljoYMR';
         const matchDate = new Date('2023-01-16T21:50:42.742Z');
@@ -669,10 +669,10 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('pastPublishCount greater than array size -ascending order; so include all changes', () => {
+    it('pastPublishCount greater than array size', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date(0);
+        const matchDate = new Date('2023-01-15T19:13:58.902Z');
         const config = {};
         const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
         const dc = new data_converter_1.DataConverter(config, mapFileUtil);
@@ -680,7 +680,7 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId, 20);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('pastPublishCount at 3 -ascending order', () => {
+    it('pastPublishCount at 3 ', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
         const matchDate = new Date('2023-01-17T22:35:20.517Z');
@@ -692,74 +692,6 @@ describe('getSinceDateFromAPCs - plan history in ascending order', () => {
         expect(sinceDate).toEqual(matchDate);
     });
 });
-describe('getSinceDateFromAPCs - plan history in descending order', () => {
-    it('oldest / only apc', () => {
-        const history = new Array(...mockData_1.plan1_history_descending).slice(0, 1);
-        const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date(0);
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
-        expect(sinceDate).toEqual(matchDate);
-    });
-    it('oldest / multiple apcs in history -descending order', () => {
-        const history = new Array(...mockData_1.plan1_history_descending).slice(0, 3);
-        const lastAPCId = '4JM83QNiIO0IBkck';
-        const matchDate = new Date(0);
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
-        expect(sinceDate).toEqual(matchDate);
-    });
-    it('most recent apc -descending order', () => {
-        const history = new Array(...mockData_1.plan1_history_descending);
-        const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-17T22:40:07.288Z');
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
-        expect(sinceDate).toEqual(matchDate);
-    });
-    it('apc in the middle -descending order', () => {
-        const history = new Array(...mockData_1.plan1_history_descending);
-        const lastAPCId = 'GiT9CZXZGVljoYMR';
-        const matchDate = new Date('2023-01-16T21:50:42.742Z');
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
-        expect(sinceDate).toEqual(matchDate);
-    });
-    it('pastPublishCount greater than array size -descending order; so include all changes', () => {
-        const history = new Array(...mockData_1.plan1_history_descending);
-        const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date(0);
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId, 20);
-        expect(sinceDate).toEqual(matchDate);
-    });
-    it('pastPublishCount at 3 -descending order', () => {
-        const history = new Array(...mockData_1.plan1_history_descending);
-        const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-17T22:35:20.517Z');
-        const config = {};
-        const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
-        const dc = new data_converter_1.DataConverter(config, mapFileUtil);
-        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId, 3);
-        expect(sinceDate).toEqual(matchDate);
-    });
-});
 describe('getDeleteChanges', () => {
     const config = {};
     const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
@@ -993,7 +925,6 @@ describe('buildDeleteChanges', () => {
         ];
         const apc = {};
         const fullAPC = {
-            id: 'apcId',
             deleteDataDownloadLink: 'deleteDataDownloadLink',
             returnedDeleteData
         };
@@ -1019,7 +950,6 @@ describe('buildDeleteChanges', () => {
         ];
         const apc = {};
         const fullAPC = {
-            id: 'apcId',
             returnedDeleteData
         };
         const previousApc = undefined;
@@ -1049,9 +979,7 @@ describe('buildDeleteChanges', () => {
                 deletes: [{ id: '1' }, { id: '3' }]
             }
         };
-        const previousApc = {
-            id: 'previousApcId',
-        };
+        const previousApc = {};
         const fullPreviousApc = {
             id: previousApcId,
             assortmentBaselineDownloadLink: 'assortmentBaselineDownloadLink'

package/lib/publish/mockData.d.ts

@@ -66,74 +66,6 @@ export declare const plan1_history: ({
     createdById: string;
     adds: number;
 })[];
-export declare const plan1_history_descending: ({
-    summary: {
-        assortmentId: string;
-        count: number;
-        aggregates: {
-            flexCurrency: {
-                average: number;
-                total: number;
-                min: number;
-                max: number;
-            };
-            totalMargin: {};
-        };
-        updatedOn: string;
-        id: string;
-        updatedById: string;
-        createdOn: string;
-        createdById: string;
-        orgId: string;
-    };
-    deletes: number;
-    versionComments: string;
-    unchanged: number;
-    updatedOn: string;
-    versionName: string;
-    updates: number;
-    updatedById: string;
-    createdOn: string;
-    orgId: string;
-    familyItemsRemoved: number;
-    createdBy: string;
-    assortmentId: string;
-    id: string;
-    errors: number;
-    createdById: string;
-    adds: number;
-} | {
-    summary: {
-        assortmentId: string;
-        count: number;
-        aggregates: {
-            totalMargin: {};
-            flexCurrency?: undefined;
-        };
-        updatedOn: string;
-        id: string;
-        updatedById: string;
-        createdOn: string;
-        createdById: string;
-        orgId: string;
-    };
-    deletes: number;
-    versionComments: string;
-    unchanged: number;
-    updatedOn: string;
-    versionName: string;
-    updates: number;
-    updatedById: string;
-    createdOn: string;
-    orgId: string;
-    familyItemsRemoved: number;
-    createdBy: string;
-    assortmentId: string;
-    id: string;
-    errors: number;
-    createdById: string;
-    adds: number;
-})[];
 export declare const plan1_across_month_DST: {
     versionName: string;
     createdOn: string;