@contrail/flexplm 1.1.63 → 1.1.65

package/lib/util/data-converter.spec.js

@@ -665,6 +665,46 @@ describe('checkKeysAndValues', () => {
         expect(results.length).toBe(1);
     });
 });
+describe('filterOutArchivedAndTrashedEntities', () => {
+    const config = {
+        apiHost: 'host',
+        userName: () => 'user',
+        password: () => 'pass',
+        urlContext: 'xxx',
+        vibeEventEndpoint: '/rfa/vibeiq/vibeEvents',
+        csrfEndpoint: '/servlet/rest/security/csrf',
+        itemPreDevelopmentLifecycleStages: ['concept']
+    };
+    const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
+    const dc = new data_converter_1.DataConverter(config, mapFileUtil);
+    it('filter out isArchived and isTrashed entities', () => {
+        const entities = [
+            { id: '1', name: 'Entity 1', isArchived: false, isTrashed: false },
+            { id: '2', name: 'Entity 2', isArchived: true, isTrashed: false },
+            { id: '3', name: 'Entity 3', isArchived: false, isTrashed: true },
+            { id: '4', name: 'Entity 4', isArchived: false, isTrashed: false }
+        ];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(2);
+        expect(filteredEntities).toEqual([
+            { id: '1', name: 'Entity 1', isArchived: false, isTrashed: false },
+            { id: '4', name: 'Entity 4', isArchived: false, isTrashed: false }
+        ]);
+    });
+    it('no entities to filter', () => {
+        const entities = [];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(0);
+    });
+    it('all entities are archived or trashed', () => {
+        const entities = [
+            { id: '1', name: 'Entity 1', isArchived: true, isTrashed: false },
+            { id: '2', name: 'Entity 2', isArchived: false, isTrashed: true }
+        ];
+        const filteredEntities = dc.filterOutArchivedAndTrashedEntities(entities);
+        expect(filteredEntities.length).toBe(0);
+    });
+});
 describe('setUserListValue', () => {
     const config = {
         apiHost: 'host',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.1.63",
+  "version": "1.1.65",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -41,6 +41,7 @@
   },
   "dependencies": {
     "@contrail/app-framework": "^1.3.4",
+    "@contrail/entity-types": "^1.5.2",
     "@contrail/sdk": "^1.4.3",
     "@contrail/transform-data": "^1.1.3",
     "@contrail/util": "^1.0.48",

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

@@ -1,5 +1,5 @@
 import { BaseProcessPublishAssortment } from './base-process-publish-assortment';
-import { apc_2bOWR2j9R0QThDVu_delete_history, fall_2003_deleteChanges_run2, fall_2003_fedMapping, fall_2003_fullChange, fall_2003_fullChange_run2, fall_2003_hydratedDetails, fall_2003_hydratedDetails_run2, plan1_across_month_DST, plan1_history } from './mockData';
+import { apc_2bOWR2j9R0QThDVu_delete_history, fall_2003_deleteChanges_run2, fall_2003_fedMapping, fall_2003_fullChange, fall_2003_fullChange_run2, fall_2003_hydratedDetails, fall_2003_hydratedDetails_run2, plan1_across_month_DST, plan1_history, plan1_history_descending } from './mockData';
 import { FCConfig, SeasonFederation } from '../interfaces/interfaces';
 import { DataConverter } from '../util/data-converter';
 import { PublishChangeData } from '../interfaces/publish-change-data';
@@ -8,6 +8,7 @@ import { Entities } from '@contrail/sdk';
 import { TypeConversionUtils } from '../util/type-conversion-utils';
 import { MapUtil } from '../util/map-utils';
 import { ItemFamilyChanges } from '../interfaces/item-family-changes';
+import { AssortmentPublishChange } from '@contrail/entity-types';
 
 let federatedId = '';
 jest.mock('../util/data-converter', () => {
@@ -512,7 +513,7 @@ describe('getSeasonFederation', () =>{
 
 describe('Test getSinceDate', () =>{
   it('getSinceDate from getSinceDateFromAPCs', async () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-17T22:40:07.288Z');
 
@@ -529,7 +530,7 @@ describe('Test getSinceDate', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('getSinceDate date from config as year', async () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
@@ -548,7 +549,7 @@ describe('Test getSinceDate', () =>{
 
   it('getSinceDate date from config numberofdays-cross month', async () =>{
     const count = 10;
-    const history = new Array(...plan1_across_month_DST);
+    const history = new Array(...plan1_across_month_DST) as any as AssortmentPublishChange[];
     const lastAPCId = '_mj--7nlyp7mmDrK';
     const matchDate = new Date('2023-02-25T19:13:58.902Z');
     const config = {sinceDate: 'numberofdays:'+ count } as any as FCConfig;
@@ -560,7 +561,7 @@ describe('Test getSinceDate', () =>{
   });
   it('getSinceDate date from config numberofdays-cross DST', async () =>{
     const count = 11;
-    const history = new Array(...plan1_across_month_DST);
+    const history = new Array(...plan1_across_month_DST) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-03-06T21:50:42.742Z');
     const config = {sinceDate: 'numberofdays:'+ count } as any as FCConfig;
@@ -572,7 +573,7 @@ describe('Test getSinceDate', () =>{
   });
   it('getSinceDate date from config numberofpublishes', async () =>{
     const count = 3;
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-17T22:35:20.517Z');
     const config = {sinceDate: 'numberofpublishes:'+ count } as any as FCConfig;
@@ -585,7 +586,7 @@ describe('Test getSinceDate', () =>{
 
   it('getSinceDate date from config numberofpublishes', async () =>{
     const count = 3;
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-17T22:35:20.517Z');
     const config = {sinceDate: 'numberofpublishes:'+ count } as any as FCConfig;
@@ -602,7 +603,7 @@ describe('Test getSinceDate', () =>{
 
 describe('getSinceDateFromAPCSpecificDate', () =>{
   it('last apc - one day', () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
@@ -616,7 +617,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
   });
 
   it('apc in the middle - one day', () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'GiT9CZXZGVljoYMR';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
 
@@ -629,7 +630,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('before initial publish', () => {
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
@@ -640,7 +641,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('numberofdays at 2 ', () => {
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
@@ -655,7 +656,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
 
 describe('getSinceDateDaysPrevious', () =>{
   it('last apc - one day', () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
@@ -669,7 +670,7 @@ describe('getSinceDateDaysPrevious', () =>{
   });
 
   it('apc in the middle - one day', () =>{
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'GiT9CZXZGVljoYMR';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
 
@@ -682,7 +683,7 @@ describe('getSinceDateDaysPrevious', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('numberofdays greater than array size', () => {
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
@@ -693,7 +694,7 @@ describe('getSinceDateDaysPrevious', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('numberofdays at 2 ', () => {
-    const history = new Array(...plan1_history);
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
@@ -706,9 +707,9 @@ describe('getSinceDateDaysPrevious', () =>{
 
 });
 
-describe('getSinceDateFromAPCs', () => {
-  it('first / only apc', () => {
-    const history = new Array(...plan1_history).slice(0, 1);
+describe('getSinceDateFromAPCs - plan history in ascending order', () => {
+  it('oldest / only apc', () => {
+    const history = new Array(...plan1_history).slice(0, 1) as any as AssortmentPublishChange[];
     const lastAPCId = 'v9BKkHo-tpL0wUZN';
     const matchDate = new Date(0);
 
@@ -722,8 +723,8 @@ describe('getSinceDateFromAPCs', () => {
     expect(sinceDate).toEqual(matchDate);
   });
 
-  it('first / multiple apcs in history', () => {
-    const history = new Array(...plan1_history).slice(0, 3);
+  it('oldest / multiple apcs in history -ascending order', () => {
+    const history = new Array(...plan1_history).slice(0, 3) as any as AssortmentPublishChange[];
     const lastAPCId = 'v9BKkHo-tpL0wUZN';
     const matchDate = new Date(0);
 
@@ -737,8 +738,8 @@ describe('getSinceDateFromAPCs', () => {
     expect(sinceDate).toEqual(matchDate);
   });
 
-  it('last apc', () => {
-    const history = new Array(...plan1_history);
+  it('most recent apc -ascending order', () => {
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-17T22:40:07.288Z');
 
@@ -752,8 +753,8 @@ describe('getSinceDateFromAPCs', () => {
     expect(sinceDate).toEqual(matchDate);
   });
 
-  it('apc in the middle', () => {
-    const history = new Array(...plan1_history);
+  it('apc in the middle -ascending order', () => {
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'GiT9CZXZGVljoYMR';
     const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
@@ -767,10 +768,10 @@ describe('getSinceDateFromAPCs', () => {
     expect(sinceDate).toEqual(matchDate);
   });
 
-  it('pastPublishCount greater than array size', () => {
-    const history = new Array(...plan1_history);
+  it('pastPublishCount greater than array size -ascending order; so include all changes', () => {
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-15T19:13:58.902Z');
+    const matchDate = new Date(0);
 
     const config = {} as FCConfig;
 
@@ -782,8 +783,100 @@ describe('getSinceDateFromAPCs', () => {
     expect(sinceDate).toEqual(matchDate);
   });
 
-  it('pastPublishCount at 3 ', () => {
-    const history = new Array(...plan1_history);
+  it('pastPublishCount at 3 -ascending order', () => {
+    const history = new Array(...plan1_history) as any as AssortmentPublishChange[];
+    const lastAPCId = 'sJbGx1Fpq1v2MmcI';
+    const matchDate = new Date('2023-01-17T22:35:20.517Z');
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new BaseProcessPublishAssortment(config, dc, mapFileUtil);
+
+    const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId, 3);
+    expect(sinceDate).toEqual(matchDate);
+  });
+});
+
+describe('getSinceDateFromAPCs - plan history in descending order', () => {
+  it('oldest / only apc', () => {
+    const history = new Array(...plan1_history_descending).slice(0, 1) as any as AssortmentPublishChange[];
+    const lastAPCId = 'sJbGx1Fpq1v2MmcI';
+    const matchDate = new Date(0);
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new 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(...plan1_history_descending).slice(0, 3) as any as AssortmentPublishChange[];
+    const lastAPCId = '4JM83QNiIO0IBkck';
+    const matchDate = new Date(0);
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new BaseProcessPublishAssortment(config, dc, mapFileUtil);
+
+    const sinceDate = ppa.getSinceDateFromAPCs(history, lastAPCId);
+    expect(sinceDate).toEqual(matchDate);
+  });
+
+  it('most recent apc -descending order', () => {
+    const history = new Array(...plan1_history_descending) as any as AssortmentPublishChange[];
+    const lastAPCId = 'sJbGx1Fpq1v2MmcI';
+    const matchDate = new Date('2023-01-17T22:40:07.288Z');
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new 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(...plan1_history_descending) as any as AssortmentPublishChange[];
+    const lastAPCId = 'GiT9CZXZGVljoYMR';
+    const matchDate = new Date('2023-01-16T21:50:42.742Z');
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new 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(...plan1_history_descending) as any as AssortmentPublishChange[];
+    const lastAPCId = 'sJbGx1Fpq1v2MmcI';
+    const matchDate = new Date(0);
+
+    const config = {} as FCConfig;
+
+    const mapFileUtil = new MapFileUtil(new Entities());
+    const dc = new DataConverter(config, mapFileUtil);
+    const ppa = new 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(...plan1_history_descending) as any as AssortmentPublishChange[];
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-01-17T22:35:20.517Z');
 
@@ -1048,9 +1141,10 @@ describe('buildDeleteChanges', () =>{
     ];
     const apc ={};
     const fullAPC = {
+      id: 'apcId',
       deleteDataDownloadLink: 'deleteDataDownloadLink',
       returnedDeleteData
-    };
+    } as AssortmentPublishChange;
     const previousApc = {};
     const ppa = new BaseProcessPublishAssortment(config, dc, mapFileUtil);
     const spy = jest.spyOn(ppa, 'downloadDeleteChanges')
@@ -1077,6 +1171,7 @@ describe('buildDeleteChanges', () =>{
     ];
     const apc ={};
     const fullAPC = {
+      id: 'apcId',
       returnedDeleteData
     };
     const previousApc = undefined;
@@ -1110,13 +1205,14 @@ describe('buildDeleteChanges', () =>{
         deletes: [{id:'1'}, {id:'3'}]
       }
 
+    } as AssortmentPublishChange;
+    const previousApc: AssortmentPublishChange = {
+      id: 'previousApcId',
     };
-    const previousApc = {
-    };
-    const fullPreviousApc = {
+    const fullPreviousApc: AssortmentPublishChange = {
       id: previousApcId,
       assortmentBaselineDownloadLink: 'assortmentBaselineDownloadLink'
-    };
+    } ;
     const previousApcBaseline = {
       assortmentItems: [
         { itemId: '1' },
@@ -1170,7 +1266,7 @@ describe('buildDeleteChanges', () =>{
         deletes: [{id:'1'}, {id:'3'}]
       }
 
-    };
+    } as AssortmentPublishChange;
     const previousApc = {
       assortmentBaselineDownloadLink: 'assortmentBaselineDownloadLink'
     };

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

@@ -1,4 +1,4 @@
-import { Entities, Files, Request } from '@contrail/sdk';
+import { API_VERSION, Entities, Files, Request } from '@contrail/sdk';
 import { AsyncEventsPayloadType, FCConfig, ProductFederation, SeasonalPayload, SeasonFederation, SkuFederation } from '../interfaces/interfaces';
 import { DataConverter } from '../util/data-converter';
 import { FlexPLMConnect } from '../util/flexplm-connect';
@@ -12,6 +12,7 @@ import path = require('path');
 import { MapFileUtil } from '@contrail/transform-data';
 import { Logger } from '@contrail/app-framework';
 import { EventShortMessageStatus } from '../util/event-short-message-status';
+import { AssortmentPublishChange } from '@contrail/entity-types';
 
 export class BaseProcessPublishAssortment {
 
@@ -40,7 +41,7 @@ export class BaseProcessPublishAssortment {
   public async process(event) {
 
     const assortmentPublishChangeId = event.assortmentPublishChangeId;
-    let apcHistory;
+    let apcHistory: AssortmentPublishChange[];
     let publisher;
     const assortmentId = event.assortmentId;
     try {
@@ -210,7 +211,7 @@ export class BaseProcessPublishAssortment {
     return this.assortment;
   }
 
-  public async getSinceDate(assortmentId: any, assortmentPublishChangeId: any, apcHistory: object[]): Promise<Date> {
+  public async getSinceDate(assortmentId: any, assortmentPublishChangeId: any, apcHistory: AssortmentPublishChange[]): Promise<Date> {
 
     let sinceDate = null;
 
@@ -249,15 +250,34 @@ export class BaseProcessPublishAssortment {
     return sinceDate;
   }
 
-  async getApcHistory(assortmentId: any) {
-    const resource = `/assortments/${assortmentId}/history/`;
-    return Request.request(resource, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json'
+  async getApcHistory(assortmentId: string): Promise<AssortmentPublishChange[]> {
+    const apcs = [];
+    const MAX_PAGES = 1_000;
+    let nextPageKey = null;
+    const options = {
+      entityName: 'assortment',
+      id: assortmentId,
+      apiVersion: API_VERSION.V2,
+      nextPageKey,
+      relation: 'history',
+    };
+
+    let i = 0;
+    do {
+      const response = await new 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;
   }
 
   protected updatedSinceDate(entity, sinceDate: Date): boolean {
@@ -265,7 +285,7 @@ export class BaseProcessPublishAssortment {
     return (updatedOn && new Date(updatedOn) > sinceDate);
   }
 
-  getSinceDateFromAPCSpecificDate(apcHistory: any[], assortmentPublishChangeId: string, specificDate: Date):Date {
+  getSinceDateFromAPCSpecificDate(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, specificDate: Date):Date {
     const apc = apcHistory.find(apc => apc?.id === assortmentPublishChangeId);
     const apcDate = new Date(apc?.createdOn);
     let afterDate = apcDate;
@@ -286,7 +306,7 @@ export class BaseProcessPublishAssortment {
     const selectedDate = (beforeDate.getTime() !== 0)?beforeDate : afterDate;
     return selectedDate;
   }
-  getSinceDateDaysPrevious(apcHistory: any[], assortmentPublishChangeId: string, daysBack):Date {
+  getSinceDateDaysPrevious(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, daysBack):Date {
     const apc = apcHistory.find(apc => apc?.id === assortmentPublishChangeId);
     const apcDate = new Date(apc?.createdOn);
     let afterDate = apcDate;
@@ -315,18 +335,14 @@ export class BaseProcessPublishAssortment {
     return selectedDate;
   }
 
-  getSinceDateFromAPCs(apcHistory: any[], assortmentPublishChangeId: string, pastPublishCount = 1): Date {
+  getSinceDateFromAPCs(apcHistory: AssortmentPublishChange[], assortmentPublishChangeId: string, pastPublishCount = 1): Date {
     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 = [];
+    const dateArray: Date[] = [];
     for (const tempapc of apcHistory) {
       if (assortmentPublishChangeId !== tempapc?.id) {
         const tempDate = new Date(tempapc?.createdOn);
@@ -335,12 +351,15 @@ export 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];
   }
-  protected getPublisher(assortmentPublishChange) {
+
+  protected getPublisher(assortmentPublishChange: AssortmentPublishChange) {
     const createdBy = assortmentPublishChange?.createdBy;
     const publisher = {};
     const includeKeys = ['email', 'firstName', 'isSsoUser', 'lastName'];
@@ -354,7 +373,7 @@ export class BaseProcessPublishAssortment {
 
   }
 
-  async downloadAssortmentPublishChange(assortmentId: string, assortmentPublishChangeId: string) {
+  async downloadAssortmentPublishChange(assortmentId: string, assortmentPublishChangeId: string): Promise<AssortmentPublishChange> {
     const resourceString = '/assortments/' + assortmentId + '/history/' + assortmentPublishChangeId + '?relations=createdBy';
     return await Request.request(
       resourceString,
@@ -368,7 +387,7 @@ export class BaseProcessPublishAssortment {
     );
   }
 
-  async downloadHydratedChangeDetail(assortmentPublishChange) {
+  async downloadHydratedChangeDetail(assortmentPublishChange: AssortmentPublishChange) {
     try {
       console.info('downloadHydratedChangeDetail-start');
       const link = assortmentPublishChange?.hydratedDetailDownloadLink;
@@ -382,7 +401,7 @@ export class BaseProcessPublishAssortment {
     return undefined;
   }
 
-  async downloadAssortmentBaseline(assortmentPublishChange) {
+  async downloadAssortmentBaseline(assortmentPublishChange: AssortmentPublishChange) {
     console.info('downloadAssortmentBaseline-start');
     try {
       const link = assortmentPublishChange?.assortmentBaselineDownloadLink;