@contrail/flexplm 1.1.63 → 1.1.65

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

@@ -3,6 +3,7 @@ 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;
@@ -35,16 +36,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: object[]): Promise<Date>;
-    getApcHistory(assortmentId: any): Promise<any>;
+    getSinceDate(assortmentId: any, assortmentPublishChangeId: any, apcHistory: AssortmentPublishChange[]): Promise<Date>;
+    getApcHistory(assortmentId: string): Promise<AssortmentPublishChange[]>;
     protected updatedSinceDate(entity: any, sinceDate: Date): boolean;
-    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>;
+    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>;
     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,14 +200,30 @@ class BaseProcessPublishAssortment {
         return sinceDate;
     }
     async getApcHistory(assortmentId) {
-        const resource = `/assortments/${assortmentId}/history/`;
-        return sdk_1.Request.request(resource, {
-            method: 'GET',
-            headers: {
-                Accept: 'application/json',
-                'Content-Type': 'application/json'
+        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);
             }
-        });
+            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;
@@ -261,13 +277,8 @@ class BaseProcessPublishAssortment {
         if (apcHistory.length === 1) {
             return new Date(0);
         }
-        const apcIndex = apcHistory.findIndex(apc => apc.id === assortmentPublishChangeId);
-        if (apcIndex === 0) {
-            return new Date(0);
-        }
-        const apc = apcHistory[apcIndex];
+        const apc = apcHistory.find(apc => apc.id === assortmentPublishChangeId);
         const apcDate = new Date(apc?.createdOn);
-        let sinceDate = new Date(0);
         const dateArray = [];
         for (const tempapc of apcHistory) {
             if (assortmentPublishChangeId !== tempapc?.id) {
@@ -277,10 +288,12 @@ class BaseProcessPublishAssortment {
                 }
             }
         }
-        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;
+        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];
     }
     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', () => {
-    it('first / only apc', () => {
+describe('getSinceDateFromAPCs - plan history in ascending order', () => {
+    it('oldest / 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', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('first / multiple apcs in history', () => {
+    it('oldest / multiple apcs in history -ascending order', () => {
         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', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('last apc', () => {
+    it('most recent apc -ascending order', () => {
         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', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('apc in the middle', () => {
+    it('apc in the middle -ascending order', () => {
         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', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('pastPublishCount greater than array size', () => {
+    it('pastPublishCount greater than array size -ascending order; so include all changes', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-15T19:13:58.902Z');
+        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);
@@ -680,7 +680,7 @@ describe('getSinceDateFromAPCs', () => {
         const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId, 20);
         expect(sinceDate).toEqual(matchDate);
     });
-    it('pastPublishCount at 3 ', () => {
+    it('pastPublishCount at 3 -ascending order', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
         const matchDate = new Date('2023-01-17T22:35:20.517Z');
@@ -692,6 +692,74 @@ describe('getSinceDateFromAPCs', () => {
         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());
@@ -925,6 +993,7 @@ describe('buildDeleteChanges', () => {
         ];
         const apc = {};
         const fullAPC = {
+            id: 'apcId',
             deleteDataDownloadLink: 'deleteDataDownloadLink',
             returnedDeleteData
         };
@@ -950,6 +1019,7 @@ describe('buildDeleteChanges', () => {
         ];
         const apc = {};
         const fullAPC = {
+            id: 'apcId',
             returnedDeleteData
         };
         const previousApc = undefined;
@@ -979,7 +1049,9 @@ describe('buildDeleteChanges', () => {
                 deletes: [{ id: '1' }, { id: '3' }]
             }
         };
-        const previousApc = {};
+        const previousApc = {
+            id: 'previousApcId',
+        };
         const fullPreviousApc = {
             id: previousApcId,
             assortmentBaselineDownloadLink: 'assortmentBaselineDownloadLink'

package/lib/publish/mockData.d.ts

@@ -66,6 +66,74 @@ 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;

package/lib/publish/mockData.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apc_2bOWR2j9R0QThDVu_delete_history = exports.fall_2003_fedMapping = exports.fall_2003_deleteChanges_run2 = exports.fall_2003_fullChange_run2 = exports.fall_2003_hydratedDetails_run2 = exports.fall_2003_fullChange = exports.fall_2003_hydratedDetails = exports.plan1_across_month_DST = exports.plan1_history = void 0;
+exports.apc_2bOWR2j9R0QThDVu_delete_history = exports.fall_2003_fedMapping = exports.fall_2003_deleteChanges_run2 = exports.fall_2003_fullChange_run2 = exports.fall_2003_hydratedDetails_run2 = exports.fall_2003_fullChange = exports.fall_2003_hydratedDetails = exports.plan1_across_month_DST = exports.plan1_history_descending = exports.plan1_history = void 0;
 exports.plan1_history = [
     {
         summary: {
@@ -257,6 +257,262 @@ exports.plan1_history = [
         adds: 4
     }
 ];
+exports.plan1_history_descending = [
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 13,
+            aggregates: {
+                flexCurrency: {
+                    average: 444,
+                    total: 444,
+                    min: 444,
+                    max: 444
+                },
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-18T16:56:46.078Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-18T16:56:46.078Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 0,
+        versionComments: 'This sets up Jan 18 items for drop issue. That dropping the item family & only option produces only a delete entry  for the option.  Dropping an option of a family that has multiple options, also only produces a delete entry for the option.\n\nAnd dropping the only item option, from a family produces a delete entry for the option and an add for the item family',
+        unchanged: 9,
+        updatedOn: '2023-01-18T16:56:45.800Z',
+        versionName: 'Setup for demo of drop issue',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-18T16:56:45.800Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: 'sJbGx1Fpq1v2MmcI',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 4
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 9,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-17T22:40:07.539Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-17T22:40:07.539Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 1,
+        versionComments: '',
+        unchanged: 8,
+        updatedOn: '2023-01-17T22:40:07.288Z',
+        versionName: 'remove only option on family but leave family in plan',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-17T22:40:07.288Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: 'V0iQE449Ckw1UB7a',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 1
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 9,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-17T22:36:39.434Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-17T22:36:39.434Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 1,
+        versionComments: '',
+        unchanged: 9,
+        updatedOn: '2023-01-17T22:36:39.185Z',
+        versionName: 'drop 1 option (of 2)',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-17T22:36:39.185Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: '4JM83QNiIO0IBkck',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 0
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 10,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-17T22:35:20.750Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-17T22:35:20.750Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 2,
+        versionComments: '',
+        unchanged: 6,
+        updatedOn: '2023-01-17T22:35:20.517Z',
+        versionName: 'adds & 2 drops',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-17T22:35:20.517Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: 'GiT9CZXZGVljoYMR',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 4
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 8,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-16T21:50:43.045Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-16T21:50:43.045Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 0,
+        versionComments: '',
+        unchanged: 6,
+        updatedOn: '2023-01-16T21:50:42.742Z',
+        versionName: 'Add 2 Familys/Options',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-16T21:50:42.742Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: '_mj--7nlyp7mmDrK',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 2
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 6,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-16T19:25:53.351Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-16T19:25:53.351Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 0,
+        versionComments: '',
+        unchanged: 4,
+        updatedOn: '2023-01-16T19:25:53.036Z',
+        versionName: 'add 1 family/option',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-16T19:25:53.036Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: '1MEzdQKVTjVtES8u',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 2
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 4,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-16T19:16:06.502Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-16T19:16:06.502Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 0,
+        versionComments: '',
+        unchanged: 2,
+        updatedOn: '2023-01-16T19:16:06.233Z',
+        versionName: 'add 1 family/option & 1 family',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-16T19:16:06.233Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: 'LS2rVixKh2ojv56w',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 2
+    },
+    {
+        summary: {
+            assortmentId: 'oqIFX3ELRy8sFRd0',
+            count: 2,
+            aggregates: {
+                totalMargin: {}
+            },
+            updatedOn: '2023-01-16T19:13:59.080Z',
+            id: 'oqIFX3ELRy8sFRd0',
+            updatedById: 'Eey3ZOi8znUA85i7',
+            createdOn: '2023-01-16T19:13:59.080Z',
+            createdById: 'Eey3ZOi8znUA85i7',
+            orgId: 'cMkHW5GAD8ViOZj-'
+        },
+        deletes: 0,
+        versionComments: '',
+        unchanged: 0,
+        updatedOn: '2023-01-15T19:13:58.902Z',
+        versionName: 'Add family/option & just family',
+        updates: 0,
+        updatedById: 'Eey3ZOi8znUA85i7',
+        createdOn: '2023-01-15T19:13:58.902Z',
+        orgId: 'cMkHW5GAD8ViOZj-',
+        familyItemsRemoved: 0,
+        createdBy: 'Eey3ZOi8znUA85i7',
+        assortmentId: 'oqIFX3ELRy8sFRd0',
+        id: 'v9BKkHo-tpL0wUZN',
+        errors: 0,
+        createdById: 'Eey3ZOi8znUA85i7',
+        adds: 2
+    }
+];
 exports.plan1_across_month_DST = [
     {
         versionName: 'Add family/option & just family',

package/lib/util/data-converter.d.ts

@@ -30,6 +30,7 @@ export declare class DataConverter {
     setObjectReferenceValue(prop: any, nd: any): Promise<any>;
     getAllObjectReferences(entityType: string, rootTypeCriteria: any, postProcessCriteria?: any): Promise<any[]>;
     checkKeysAndValues(criteria: any, arrayOfObjects: any, entityTypePath: any): any[];
+    filterOutArchivedAndTrashedEntities(entities: any[]): any[];
     setUserListValue(prop: any, nd: any): Promise<any>;
     getUserByEmail(nd: any): Promise<any>;
     processGroupMemberCheck(prop: any, userEmail: any): Promise<void>;

package/lib/util/data-converter.js

@@ -415,7 +415,7 @@ class DataConverter {
             nextPageKey = loadPage?.nextPageKey;
             if (Object.keys(loadPage).includes('results')) {
                 usedV2 = true;
-                let postProcessedResults = loadPage.results;
+                let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage?.results);
                 if (postProcessedResults?.length > 0 && postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
                     const subEntityTypePath = rootTypeCriteria.typePath || entityType;
                     postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -437,7 +437,7 @@ class DataConverter {
                     take,
                     skip,
                 });
-                let postProcessedResults = loadPage;
+                let postProcessedResults = this.filterOutArchivedAndTrashedEntities(loadPage);
                 if (postProcessCriteria && Object.keys(postProcessCriteria).length !== 0) {
                     const subEntityTypePath = rootTypeCriteria.typePath || entityType;
                     postProcessedResults = this.checkKeysAndValues(postProcessCriteria, postProcessedResults, subEntityTypePath);
@@ -476,6 +476,16 @@ class DataConverter {
         }
         return arrOfMatchObjects;
     }
+    filterOutArchivedAndTrashedEntities(entities) {
+        if (!entities || !Array.isArray(entities) || entities.length === 0) {
+            return [];
+        }
+        return entities.filter(entity => {
+            const isArchived = entity?.isArchived;
+            const isTrashed = entity?.isTrashed;
+            return !isArchived && !isTrashed;
+        });
+    }
     async setUserListValue(prop, nd) {
         if (!nd?.email) {
             return "";