@contrail/flexplm 1.1.32 → 1.1.34

package/lib/entity-processor/base-entity-processor.d.ts

@@ -28,6 +28,7 @@ export declare abstract class BaseEntityProcessor {
     protected abstract getCreateEntity(inboundData: any): Promise<IncomingEntityResponse>;
     outbound(event: any): Promise<any>;
     handleOutgoingUpsert(entityType: any, event: any): Promise<any>;
+    getOutboundEntityUpdates(event: any, flexResponse: any): Promise<any>;
     handleOutgoingDelete(entityType: any, event: any): Promise<void>;
     protected abstract getOutgoingUpsertPayload(entityType: any, event: any): Promise<EntityPayloadType>;
 }

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

@@ -153,14 +153,21 @@ class BaseEntityProcessor {
         }
         const payload = await this.getOutgoingUpsertPayload(entityType, event);
         const flexResponse = await new flexplm_connect_1.FlexPLMConnect(this.config).sendToFlexPLM(payload);
-        const flexPayload = flexResponse?.data?.payload[0];
-        if (flexPayload) {
-            const inboundData = await this.getTransformedData(flexPayload);
-            const outboundEntityUpdates = await this.getUpdatesForEntity(event.newData, inboundData);
+        const outboundEntityUpdates = await this.getOutboundEntityUpdates(event, flexResponse);
+        if (outboundEntityUpdates) {
             flexResponse['outboundEntityUpdates'] = outboundEntityUpdates;
         }
         return flexResponse;
     }
+    async getOutboundEntityUpdates(event, flexResponse) {
+        const flexPayload = flexResponse?.data?.payload[0];
+        let outboundEntityUpdates = undefined;
+        if (flexPayload && 'OK' === flexPayload.status) {
+            const inboundData = await this.getTransformedData(flexPayload);
+            outboundEntityUpdates = await this.getUpdatesForEntity(event.newData, inboundData);
+        }
+        return outboundEntityUpdates;
+    }
     async handleOutgoingDelete(entityType, event) {
         console.warn('delete is not configured', entityType, event.oldData);
     }

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

@@ -148,50 +148,46 @@ class BaseProcessPublishAssortment {
     getSinceDateFromAPCSpecificDate(apcHistory, assortmentPublishChangeId, specificDate) {
         const apc = apcHistory.find(apc => apc['id'] === assortmentPublishChangeId);
         const apcDate = new Date(apc['createdOn']);
-        const dateArray = [];
+        let afterDate = apcDate;
+        let beforeDate = new Date(0);
+        const sinceDate = specificDate;
         for (const tempapc of apcHistory) {
             if (assortmentPublishChangeId !== tempapc['id']) {
                 const tempDate = new Date(tempapc['createdOn']);
                 if (tempDate < apcDate) {
-                    dateArray.push(tempDate);
+                    if (tempDate > sinceDate && tempDate < afterDate) {
+                        afterDate = tempDate;
+                    }
+                    else if (tempDate < sinceDate && tempDate > beforeDate) {
+                        beforeDate = tempDate;
+                    }
                 }
             }
         }
-        dateArray.sort((a, b) => { return Date.parse(a) - Date.parse(b); });
-        let sinceDate = specificDate;
-        const sinceDateMilliseconds = sinceDate.getTime();
-        for (const d of dateArray) {
-            const milli = Date.parse(d);
-            if (milli >= sinceDateMilliseconds) {
-                sinceDate = d;
-                break;
-            }
-        }
-        return sinceDate;
+        const selectedDate = (beforeDate.getTime() !== 0) ? beforeDate : afterDate;
+        return selectedDate;
     }
     getSinceDateDaysPrevious(apcHistory, assortmentPublishChangeId, daysBack) {
         const apc = apcHistory.find(apc => apc['id'] === assortmentPublishChangeId);
         const apcDate = new Date(apc['createdOn']);
-        const dateArray = [];
+        let afterDate = apcDate;
+        let beforeDate = new Date(0);
+        const sinceDate = new Date(apcDate.getUTCFullYear(), apcDate.getUTCMonth(), apcDate.getUTCDate() - daysBack, 0, (0 - apcDate.getTimezoneOffset()), 0);
         for (const tempapc of apcHistory) {
             if (assortmentPublishChangeId !== tempapc['id']) {
                 const tempDate = new Date(tempapc['createdOn']);
                 if (tempDate < apcDate) {
-                    dateArray.push(tempDate);
+                    if (tempDate > sinceDate && tempDate < afterDate) {
+                        afterDate = tempDate;
+                    }
+                    else if (tempDate < sinceDate && tempDate > beforeDate) {
+                        beforeDate = tempDate;
+                    }
                 }
             }
         }
-        dateArray.sort((a, b) => { return Date.parse(a) - Date.parse(b); });
-        let sinceDate = new Date(apcDate.getUTCFullYear(), apcDate.getUTCMonth(), apcDate.getUTCDate() - daysBack, 0, (0 - apcDate.getTimezoneOffset()), 0);
-        const sinceDateMilliseconds = sinceDate.getTime();
-        for (const d of dateArray) {
-            const milli = Date.parse(d);
-            if (milli >= sinceDateMilliseconds) {
-                sinceDate = d;
-                break;
-            }
-        }
-        return sinceDate;
+        const selectedDate = (beforeDate.getTime() !== 0) ? beforeDate : afterDate;
+        return selectedDate;
     }
     getSinceDateFromAPCs(apcHistory, assortmentPublishChangeId, pastPublishCount = 1) {
         if (apcHistory.length === 1) {

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

@@ -96,7 +96,7 @@ describe('Test getSinceDate', () => {
     it('getSinceDate date from config as year', async () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-17T22:35:20.517Z');
+        const matchDate = new Date('2023-01-16T21:50:42.742Z');
         const config = { sinceDate: '2023-01-17' };
         const mapFileUtil = new transform_data_1.MapFileUtil(new sdk_1.Entities());
         const dc = new data_converter_1.DataConverter(config, mapFileUtil);
@@ -120,7 +120,7 @@ describe('Test getSinceDate', () => {
         expect(sinceDate).toEqual(matchDate);
     });
     it('getSinceDate date from config numberofdays-cross DST', async () => {
-        const count = 12;
+        const count = 11;
         const history = new Array(...mockData_1.plan1_across_month_DST);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
         const matchDate = new Date('2023-03-06T21:50:42.742Z');
@@ -163,7 +163,7 @@ describe('getSinceDateFromAPCSpecificDate', () => {
     it('last apc - one day', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-17T22:35:20.517Z');
+        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);
@@ -174,7 +174,7 @@ describe('getSinceDateFromAPCSpecificDate', () => {
     it('apc in the middle - one day', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'GiT9CZXZGVljoYMR';
-        const matchDate = new Date('2023-01-16T19:16:06.233Z');
+        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);
@@ -196,7 +196,7 @@ describe('getSinceDateFromAPCSpecificDate', () => {
     it('numberofdays at 2 ', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-16T19:16:06.233Z');
+        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);
@@ -209,7 +209,7 @@ describe('getSinceDateDaysPrevious', () => {
     it('last apc - one day', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-17T22:35:20.517Z');
+        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);
@@ -220,7 +220,7 @@ describe('getSinceDateDaysPrevious', () => {
     it('apc in the middle - one day', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'GiT9CZXZGVljoYMR';
-        const matchDate = new Date('2023-01-16T19:16:06.233Z');
+        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);
@@ -242,7 +242,7 @@ describe('getSinceDateDaysPrevious', () => {
     it('numberofdays at 2 ', () => {
         const history = new Array(...mockData_1.plan1_history);
         const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-        const matchDate = new Date('2023-01-16T19:16:06.233Z');
+        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);

package/lib/util/mockData.d.ts

@@ -8,22 +8,67 @@ export declare const thumbnail_content_entity: {
     fileName: string;
     primaryFileId: string;
     primaryFileUrl: string;
+    primaryFile: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     tinyViewableId: string;
     tinyViewableUrl: string;
+    tinyViewable: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     smallViewableId: string;
     smallViewableUrl: string;
+    smallViewable: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     mediumViewableId: string;
     mediumViewableUrl: string;
+    mediumViewable: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     largeViewableId: string;
     largeViewableUrl: string;
+    largeViewable: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     CS_300Id: string;
     CS_300Url: string;
+    CS_300: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     CS_500Id: string;
     CS_500Url: string;
+    CS_500: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     CS_800Id: string;
     CS_800Url: string;
+    CS_800: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     CS_1000Id: string;
     CS_1000Url: string;
+    CS_1000: {
+        fileName: string;
+        id: string;
+        size: number;
+    };
     createdOn: string;
     orgId: string;
     id: string;
@@ -32,8 +77,3 @@ export declare const thumbnail_content_entity: {
     updatedById: string;
     fileSize: number;
 };
-export declare const cuRficeyoStwTF_f_fileEntities: {
-    fileName: string;
-    id: string;
-    size: number;
-}[];

package/lib/util/mockData.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cuRficeyoStwTF_f_fileEntities = exports.thumbnail_content_entity = exports.four_custom_sizes = exports.empty_custom_sizes = void 0;
+exports.thumbnail_content_entity = exports.four_custom_sizes = exports.empty_custom_sizes = void 0;
 exports.empty_custom_sizes = [];
 exports.four_custom_sizes = [
     {
@@ -28,73 +28,72 @@ exports.thumbnail_content_entity = {
     fileName: 'JACKET 300_SOLDIER OLIVE.png',
     primaryFileId: 'yn2d5oHD4rXHRzyB',
     primaryFileUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Ff646d3cd-e23a-4689-bd16-0301d2036720.png',
-    tinyViewableId: '6HWzJrQ-Jx1iefmj',
-    tinyViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb68f8652-f33f-452f-ae34-25397b4521eb.png',
-    smallViewableId: 'D3WRW4iRmjLzp5VX',
-    smallViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F541c53f8-fd85-418e-ae28-ad7410658b90.png',
-    mediumViewableId: 'AsRvJenpeqxksUNW',
-    mediumViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fe803c2d3-3e1b-4d9c-9bb9-2c488f1f295b.png',
-    largeViewableId: 'vo4N4mCd-tFrw101',
-    largeViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb1b7a55c-b8ba-4857-be4e-e1c3f11d8e9a.png',
-    CS_300Id: '6A5AG33nVu3Z6ogO',
-    CS_300Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F3f2ea306-a77f-4cc3-a49a-75fb5d8b113c.png',
-    CS_500Id: 'rBaHc1J2xdOWdbhI',
-    CS_500Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F979c8c65-b63f-4220-aa2e-11520f2f68bf.png',
-    CS_800Id: 'ZPAeYI3JiqjQ7unY',
-    CS_800Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fc58eeffa-2592-4698-a058-19281cda447c.png',
-    CS_1000Id: 'Hg_CthwsD4ozopCb',
-    CS_1000Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F2c827c7b-361b-4e05-b77d-4280294f9d9c.png',
-    createdOn: '2023-07-05T15:02:13.950Z',
-    orgId: '5LZnKVTNxvwMqufy',
-    id: 'cuRficeyoStwTF-f',
-    contentType: 'image/png',
-    createdById: 'SWIFPZeZzkBvrSLD',
-    updatedById: 'SWIFPZeZzkBvrSLD',
-    fileSize: 1757973
-};
-exports.cuRficeyoStwTF_f_fileEntities = [
-    {
+    primaryFile: {
         fileName: 'JACKET 300_SOLDIER OLIVE.png',
         id: 'yn2d5oHD4rXHRzyB',
         size: 1757973
     },
-    {
+    tinyViewableId: '6HWzJrQ-Jx1iefmj',
+    tinyViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb68f8652-f33f-452f-ae34-25397b4521eb.png',
+    tinyViewable: {
         fileName: 'JACKET 300_SOLDIER OLIVE_tiny.png',
         id: '6HWzJrQ-Jx1iefmj',
         size: 1784
     },
-    {
+    smallViewableId: 'D3WRW4iRmjLzp5VX',
+    smallViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F541c53f8-fd85-418e-ae28-ad7410658b90.png',
+    smallViewable: {
         fileName: 'JACKET 300_SOLDIER OLIVE_small.png',
         id: 'D3WRW4iRmjLzp5VX',
         size: 8699
     },
-    {
+    mediumViewableId: 'AsRvJenpeqxksUNW',
+    mediumViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fe803c2d3-3e1b-4d9c-9bb9-2c488f1f295b.png',
+    mediumViewable: {
         fileName: 'JACKET 300_SOLDIER OLIVE_medium.png',
         id: 'AsRvJenpeqxksUNW',
         size: 77558
     },
-    {
+    largeViewableId: 'vo4N4mCd-tFrw101',
+    largeViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb1b7a55c-b8ba-4857-be4e-e1c3f11d8e9a.png',
+    largeViewable: {
         fileName: 'JACKET 300_SOLDIER OLIVE_large.png',
         id: 'vo4N4mCd-tFrw101',
         size: 1781538
     },
-    {
+    CS_300Id: '6A5AG33nVu3Z6ogO',
+    CS_300Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F3f2ea306-a77f-4cc3-a49a-75fb5d8b113c.png',
+    CS_300: {
         fileName: 'JACKET 300_SOLDIER OLIVE_CS_300.png',
         id: '6A5AG33nVu3Z6ogO',
         size: 141153
     },
-    {
+    CS_500Id: 'rBaHc1J2xdOWdbhI',
+    CS_500Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F979c8c65-b63f-4220-aa2e-11520f2f68bf.png',
+    CS_500: {
         fileName: 'JACKET 300_SOLDIER OLIVE_CS_500.png',
         id: 'rBaHc1J2xdOWdbhI',
         size: 382057
     },
-    {
+    CS_800Id: 'ZPAeYI3JiqjQ7unY',
+    CS_800Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fc58eeffa-2592-4698-a058-19281cda447c.png',
+    CS_800: {
         fileName: 'JACKET 300_SOLDIER OLIVE_CS_800.png',
         id: 'ZPAeYI3JiqjQ7unY',
         size: 1008702
-    }, {
+    },
+    CS_1000Id: 'Hg_CthwsD4ozopCb',
+    CS_1000Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F2c827c7b-361b-4e05-b77d-4280294f9d9c.png',
+    CS_1000: {
         fileName: 'JACKET 300_SOLDIER OLIVE_CS_1000.png',
         id: 'Hg_CthwsD4ozopCb',
         size: 1605889
-    }
-];
+    },
+    createdOn: '2023-07-05T15:02:13.950Z',
+    orgId: '5LZnKVTNxvwMqufy',
+    id: 'cuRficeyoStwTF-f',
+    contentType: 'image/png',
+    createdById: 'SWIFPZeZzkBvrSLD',
+    updatedById: 'SWIFPZeZzkBvrSLD',
+    fileSize: 1757973
+};

package/lib/util/thumbnail-util.d.ts

@@ -6,10 +6,14 @@ export declare class ThumbnailUtil {
     static NEW_THUMBNAIL_ID: string;
     static EXISTING_THUMBNAIL_ID: string;
     static REMOVE_THUMBNAIL: string;
+    static OOB_SIZES: {
+        slug: string;
+    }[];
     constructor(config: FCConfig);
     setOutboundThumbnail(data: any, event: any): Promise<any>;
+    isThumbnailNew(event: any, customSizes: any[]): boolean;
     getFileId(primaryViewableId: string): Promise<string>;
     getCustomSizes(): Promise<any[]>;
-    getContentEntity(primaryViewableId: any): Promise<any>;
-    getFileEntities(fileEntityIds: any[]): Promise<any>;
+    getContentEntity(primaryViewableId: any, sizes: any[]): Promise<any>;
+    logContentResults(content: any, relations: string[]): void;
 }

package/lib/util/thumbnail-util.js

@@ -17,7 +17,8 @@ class ThumbnailUtil {
             const primaryViewableId = event.newData.primaryViewableId;
             const fileId = await this.getFileId(primaryViewableId);
             if (fileId) {
-                const key = (event?.propertyDiffs?.largeViewableDownloadUrl)
+                const customSizes = await this.getCustomSizes();
+                const key = (this.isThumbnailNew(event, customSizes))
                     ? ThumbnailUtil.NEW_THUMBNAIL_ID
                     : ThumbnailUtil.EXISTING_THUMBNAIL_ID;
                 data[key] = fileId;
@@ -28,42 +29,43 @@ class ThumbnailUtil {
         }
         return data;
     }
+    isThumbnailNew(event, customSizes) {
+        const propertyDiffs = event?.propertyDiffs;
+        if (propertyDiffs) {
+            const diffKeys = Object.keys(propertyDiffs);
+            const sizeKeys = ThumbnailUtil.OOB_SIZES.map(s => s.slug);
+            if (customSizes) {
+                sizeKeys.push(...customSizes.map(s => s.slug));
+            }
+            console.info('diffKeys: ' + JSON.stringify(diffKeys));
+            console.info('sizeKeys: ' + JSON.stringify(sizeKeys));
+            return diffKeys.some(s => sizeKeys.includes(s));
+        }
+        return false;
+    }
     async getFileId(primaryViewableId) {
-        console.info('getFileId()-' + primaryViewableId);
+        console.info('ThumbnailUtil.getFileId()-' + primaryViewableId);
         const sizes = await this.getCustomSizes();
-        const OOBSizes = [{ slug: 'largeViewable' }, { slug: 'mediumViewable' }, { slug: 'smallViewable' }, { slug: 'tinyViewable' }];
+        const OOBSizes = JSON.parse(JSON.stringify(ThumbnailUtil.OOB_SIZES));
         sizes.push(...OOBSizes);
         console.info('sizes: ' + JSON.stringify(sizes));
-        const content = await this.getContentEntity(primaryViewableId);
-        if (app_framework_1.Logger.isDebugOn()) {
-            console.debug('content: ' + JSON.stringify(content));
-        }
+        const content = await this.getContentEntity(primaryViewableId, sizes);
         if (!content) {
             return undefined;
         }
         const contentKeys = Object.getOwnPropertyNames(content);
-        const fileEntityIds = [];
-        for (const size of sizes) {
-            const key = size.slug + 'Id';
-            if (contentKeys.includes(key) && !fileEntityIds.includes(content[key])) {
-                fileEntityIds.push(content[key]);
-                size['fileId'] = content[key];
-            }
-        }
-        const fileResults = await this.getFileEntities(fileEntityIds);
-        if (app_framework_1.Logger.isDebugOn()) {
-            console.debug('fileResults: ' + JSON.stringify(fileResults));
-        }
+        const isDebugOn = app_framework_1.Logger.isDebugOn();
         let fileId = undefined;
         let tempFileSize = 0;
-        const isDebugOn = app_framework_1.Logger.isDebugOn();
-        for (const sizeObj of sizes) {
-            if (isDebugOn) {
-                console.debug('size: ' + JSON.stringify(sizeObj));
-            }
-            if (sizeObj['fileId']) {
-                const file = fileResults.find(f => f['id'] === sizeObj['fileId']);
-                if (file['size'] > tempFileSize && file['size'] < this.max_thumbnail_size) {
+        for (const size of sizes) {
+            const slug = size?.slug;
+            if (contentKeys.includes(slug)) {
+                const file = content[slug];
+                if (isDebugOn) {
+                    console.debug('size: ' + slug);
+                    console.debug('fileId: ' + file['id']);
+                }
+                if (file && file['size'] > tempFileSize && file['size'] < this.max_thumbnail_size) {
                     tempFileSize = file['size'];
                     fileId = file['id'];
                     if (isDebugOn) {
@@ -72,7 +74,7 @@ class ThumbnailUtil {
                 }
             }
         }
-        console.info('getFileId(): returning-' + fileId);
+        console.info('ThumbnailUtil.getFileId(): returning-' + fileId);
         return fileId;
     }
     async getCustomSizes() {
@@ -83,30 +85,33 @@ class ThumbnailUtil {
         sizes.push(...customSizes);
         return sizes;
     }
-    async getContentEntity(primaryViewableId) {
+    async getContentEntity(primaryViewableId, sizes) {
         const criteria = {
             id: primaryViewableId
         };
+        const relations = sizes.map(s => s.slug);
+        relations.push('primaryFile');
         const contentResults = await this.entities.get({
             entityName: 'content',
-            criteria
+            criteria,
+            relations
         });
-        console.info('contentResults: ' + JSON.stringify(contentResults));
         const content = (contentResults && contentResults[0]) ? contentResults[0] : undefined;
+        this.logContentResults(content, relations);
         return content;
     }
-    async getFileEntities(fileEntityIds) {
-        const criteria = {
-            ids: fileEntityIds
-        };
-        const fileResults = await this.entities.get({
-            entityName: 'file',
-            criteria
-        });
-        return fileResults;
+    logContentResults(content, relations) {
+        if (app_framework_1.Logger.isDebugOn()) {
+            const contentCopy = JSON.parse(JSON.stringify(content));
+            relations.forEach(r => {
+                delete contentCopy[r];
+            });
+            console.debug('content: ' + JSON.stringify(contentCopy));
+        }
     }
 }
 exports.ThumbnailUtil = ThumbnailUtil;
 ThumbnailUtil.NEW_THUMBNAIL_ID = 'NEW_THUMBNAIL_ID';
 ThumbnailUtil.EXISTING_THUMBNAIL_ID = 'EXISTING_THUMBNAIL_ID';
 ThumbnailUtil.REMOVE_THUMBNAIL = 'REMOVE_THUMBNAIL';
+ThumbnailUtil.OOB_SIZES = [{ slug: 'largeViewable' }, { slug: 'mediumLargeViewable' }, { slug: 'mediumViewable' }, { slug: 'smallViewable' }, { slug: 'tinyViewable' }];

package/lib/util/thumbnail-util.spec.js

@@ -47,9 +47,16 @@ describe('ThumbnailUtil Tests', () => {
                     largeViewableDownloadUrl: {
                         newValue: newDownloadUrl,
                         oldValue: oldDownloadUrl
+                    },
+                    largeViewable: {
+                        propertyName: 'largeViewable',
+                        oldValue: '',
+                        newValue: 'Test1'
                     }
                 }
             };
+            const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
+            spyCustomSizes.mockReturnValue(Promise.resolve(mockData_1.empty_custom_sizes));
             const spyGetFileId = jest.spyOn(tu, 'getFileId');
             spyGetFileId.mockReturnValue(Promise.resolve(thumbnailId));
             const results = await tu.setOutboundThumbnail(data, event);
@@ -70,6 +77,8 @@ describe('ThumbnailUtil Tests', () => {
                 },
                 propertyDiffs: {}
             };
+            const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
+            spyCustomSizes.mockReturnValue(Promise.resolve(mockData_1.empty_custom_sizes));
             const spyGetFileId = jest.spyOn(tu, 'getFileId');
             spyGetFileId.mockReturnValue(Promise.resolve(thumbnailId));
             const results = await tu.setOutboundThumbnail(data, event);
@@ -90,10 +99,8 @@ describe('ThumbnailUtil Tests', () => {
             const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
             spyCustomSizes.mockReturnValue(Promise.resolve(mockData_1.empty_custom_sizes));
             const spyContentEntity = jest.spyOn(tu, 'getContentEntity');
-            const content = mockData_1.thumbnail_content_entity;
+            const content = JSON.parse(JSON.stringify(mockData_1.thumbnail_content_entity));
             spyContentEntity.mockReturnValue(Promise.resolve(content));
-            const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-            spyGetFileEntities.mockReturnValue(Promise.resolve(mockData_1.cuRficeyoStwTF_f_fileEntities));
             const results = await tu.getFileId(primaryFileId);
             expect(results).toEqual('vo4N4mCd-tFrw101');
         });
@@ -107,8 +114,6 @@ describe('ThumbnailUtil Tests', () => {
             const spyContentEntity = jest.spyOn(tu, 'getContentEntity');
             const content = mockData_1.thumbnail_content_entity;
             spyContentEntity.mockReturnValue(Promise.resolve(content));
-            const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-            spyGetFileEntities.mockReturnValue(Promise.resolve(mockData_1.cuRficeyoStwTF_f_fileEntities));
             const results = await tu.getFileId(primaryFileId);
             expect(results).toEqual('AsRvJenpeqxksUNW');
         });
@@ -123,8 +128,6 @@ describe('ThumbnailUtil Tests', () => {
             const spyContentEntity = jest.spyOn(tu, 'getContentEntity');
             const content = mockData_1.thumbnail_content_entity;
             spyContentEntity.mockReturnValue(Promise.resolve(content));
-            const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-            spyGetFileEntities.mockReturnValue(Promise.resolve(mockData_1.cuRficeyoStwTF_f_fileEntities));
             const results = await tu.getFileId(primaryFileId);
             expect(results).toEqual('rBaHc1J2xdOWdbhI');
         });

package/package.json

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

package/src/entity-processor/base-entity-processor.ts

@@ -199,16 +199,24 @@ export abstract class BaseEntityProcessor {
     const payload = await this.getOutgoingUpsertPayload(entityType, event);
     const flexResponse: any = await new FlexPLMConnect(this.config).sendToFlexPLM(payload);
 
-    const flexPayload = flexResponse?.data?.payload[0];
-    if(flexPayload) {
-      const inboundData = await this.getTransformedData(flexPayload);
-      const outboundEntityUpdates = await this.getUpdatesForEntity(event.newData, inboundData)
+    const outboundEntityUpdates = await this.getOutboundEntityUpdates(event, flexResponse);
+    if(outboundEntityUpdates){
       flexResponse['outboundEntityUpdates'] = outboundEntityUpdates;
     }
     
     return flexResponse;
   }
 
+  async getOutboundEntityUpdates(event, flexResponse): Promise<any> {
+    const flexPayload = flexResponse?.data?.payload[0];
+    let outboundEntityUpdates = undefined;
+    if(flexPayload && 'OK' === flexPayload.status) {
+      const inboundData = await this.getTransformedData(flexPayload);
+      outboundEntityUpdates = await this.getUpdatesForEntity(event.newData, inboundData)
+    }
+    return outboundEntityUpdates;
+  }
+
   async handleOutgoingDelete(entityType, event) {
     console.warn('delete is not configured', entityType, event.oldData);
   }

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

@@ -105,7 +105,7 @@ describe('Test getSinceDate', () =>{
   it('getSinceDate date from config as year', async () =>{
     const history = new Array(...plan1_history);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-17T22:35:20.517Z');
+    const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
     const config = {sinceDate: '2023-01-17' } as any as FCConfig;
 
@@ -133,7 +133,7 @@ describe('Test getSinceDate', () =>{
     expect(sinceDate).toEqual(matchDate);
   });
   it('getSinceDate date from config numberofdays-cross DST', async () =>{
-    const count = 12;
+    const count = 11;
     const history = new Array(...plan1_across_month_DST);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
     const matchDate = new Date('2023-03-06T21:50:42.742Z');
@@ -178,7 +178,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
   it('last apc - one day', () =>{
     const history = new Array(...plan1_history);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-17T22:35:20.517Z');
+    const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
@@ -192,7 +192,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
   it('apc in the middle - one day', () =>{
     const history = new Array(...plan1_history);
     const lastAPCId = 'GiT9CZXZGVljoYMR';
-    const matchDate = new Date('2023-01-16T19:16:06.233Z');
+    const matchDate = new Date('2023-01-15T19:13:58.902Z');
 
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
@@ -216,7 +216,7 @@ describe('getSinceDateFromAPCSpecificDate', () =>{
   it('numberofdays at 2 ', () => {
     const history = new Array(...plan1_history);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-16T19:16:06.233Z');
+    const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
     const dc = new DataConverter(config, mapFileUtil);
@@ -231,7 +231,7 @@ describe('getSinceDateDaysPrevious', () =>{
   it('last apc - one day', () =>{
     const history = new Array(...plan1_history);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-17T22:35:20.517Z');
+    const matchDate = new Date('2023-01-16T21:50:42.742Z');
 
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
@@ -245,7 +245,7 @@ describe('getSinceDateDaysPrevious', () =>{
   it('apc in the middle - one day', () =>{
     const history = new Array(...plan1_history);
     const lastAPCId = 'GiT9CZXZGVljoYMR';
-    const matchDate = new Date('2023-01-16T19:16:06.233Z');
+    const matchDate = new Date('2023-01-15T19:13:58.902Z');
 
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
@@ -269,7 +269,7 @@ describe('getSinceDateDaysPrevious', () =>{
   it('numberofdays at 2 ', () => {
     const history = new Array(...plan1_history);
     const lastAPCId = 'sJbGx1Fpq1v2MmcI';
-    const matchDate = new Date('2023-01-16T19:16:06.233Z');
+    const matchDate = new Date('2023-01-15T19:13:58.902Z');
     const config = {} as FCConfig;
     const mapFileUtil = new MapFileUtil(new Entities());
     const dc = new DataConverter(config, mapFileUtil);

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

@@ -178,47 +178,30 @@ export class BaseProcessPublishAssortment {
   getSinceDateFromAPCSpecificDate(apcHistory: object[], assortmentPublishChangeId: string, specificDate: Date):Date {
     const apc = apcHistory.find(apc => apc['id'] === assortmentPublishChangeId);
     const apcDate = new Date(apc['createdOn']);
-    const dateArray = [];
+    let afterDate = apcDate;
+    let beforeDate = new Date(0);
+    const sinceDate = specificDate;
     for (const tempapc of apcHistory) {
       if (assortmentPublishChangeId !== tempapc['id']) {
         const tempDate = new Date(tempapc['createdOn']);
         if (tempDate < apcDate) {
-          dateArray.push(tempDate);
+          if(tempDate > sinceDate && tempDate < afterDate){
+            afterDate = tempDate;
+          } else if(tempDate < sinceDate && tempDate > beforeDate){
+            beforeDate = tempDate;
+          }
         }
       }
     }
-
-    dateArray.sort((a,b) => { return Date.parse(a) - Date.parse(b);});
-
-    let sinceDate = specificDate;
-
-    const sinceDateMilliseconds = sinceDate.getTime();
-    for(const d of dateArray){
-      const milli = Date.parse(d);
-      if(milli >= sinceDateMilliseconds){
-        sinceDate = d;
-        break;
-      }
-    }
-    return sinceDate;
-
+    const selectedDate = (beforeDate.getTime() !== 0)?beforeDate : afterDate;
+    return selectedDate;
   }
   getSinceDateDaysPrevious(apcHistory: object[], assortmentPublishChangeId: string, daysBack):Date {
     const apc = apcHistory.find(apc => apc['id'] === assortmentPublishChangeId);
     const apcDate = new Date(apc['createdOn']);
-    const dateArray = [];
-    for (const tempapc of apcHistory) {
-      if (assortmentPublishChangeId !== tempapc['id']) {
-        const tempDate = new Date(tempapc['createdOn']);
-        if (tempDate < apcDate) {
-          dateArray.push(tempDate);
-        }
-      }
-    }
-
-    dateArray.sort((a,b) => { return Date.parse(a) - Date.parse(b);});
-
-    let sinceDate = new Date(
+    let afterDate = apcDate;
+    let beforeDate = new Date(0);
+    const sinceDate = new Date(
       apcDate.getUTCFullYear(),
       apcDate.getUTCMonth(),
       apcDate.getUTCDate()-daysBack,
@@ -226,15 +209,20 @@ export class BaseProcessPublishAssortment {
       (0 - apcDate.getTimezoneOffset()),
       0);
 
-    const sinceDateMilliseconds = sinceDate.getTime();
-    for(const d of dateArray){
-      const milli = Date.parse(d);
-      if(milli >= sinceDateMilliseconds){
-        sinceDate = d;
-        break;
+    for (const tempapc of apcHistory) {
+      if (assortmentPublishChangeId !== tempapc['id']) {
+        const tempDate = new Date(tempapc['createdOn']);
+        if (tempDate < apcDate) {
+          if(tempDate > sinceDate && tempDate < afterDate){
+            afterDate = tempDate;
+          } else if(tempDate < sinceDate && tempDate > beforeDate){
+            beforeDate = tempDate;
+          }
+        }
       }
     }
-    return sinceDate;
+    const selectedDate = (beforeDate.getTime() !== 0)?beforeDate : afterDate;
+    return selectedDate;
   }
 
   getSinceDateFromAPCs(apcHistory: any[], assortmentPublishChangeId: string, pastPublishCount = 1): Date {

package/src/util/mockData.ts

@@ -26,73 +26,72 @@ export const thumbnail_content_entity = {
   fileName: 'JACKET 300_SOLDIER OLIVE.png',
   primaryFileId: 'yn2d5oHD4rXHRzyB',
   primaryFileUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Ff646d3cd-e23a-4689-bd16-0301d2036720.png',
-  tinyViewableId: '6HWzJrQ-Jx1iefmj',
-  tinyViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb68f8652-f33f-452f-ae34-25397b4521eb.png',
-  smallViewableId: 'D3WRW4iRmjLzp5VX',
-  smallViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F541c53f8-fd85-418e-ae28-ad7410658b90.png',
-  mediumViewableId: 'AsRvJenpeqxksUNW',
-  mediumViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fe803c2d3-3e1b-4d9c-9bb9-2c488f1f295b.png',
-  largeViewableId: 'vo4N4mCd-tFrw101',
-  largeViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb1b7a55c-b8ba-4857-be4e-e1c3f11d8e9a.png',
-  CS_300Id: '6A5AG33nVu3Z6ogO',
-  CS_300Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F3f2ea306-a77f-4cc3-a49a-75fb5d8b113c.png',
-  CS_500Id: 'rBaHc1J2xdOWdbhI',
-  CS_500Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F979c8c65-b63f-4220-aa2e-11520f2f68bf.png',
-  CS_800Id: 'ZPAeYI3JiqjQ7unY',
-  CS_800Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fc58eeffa-2592-4698-a058-19281cda447c.png',
-  CS_1000Id: 'Hg_CthwsD4ozopCb',
-  CS_1000Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F2c827c7b-361b-4e05-b77d-4280294f9d9c.png',
-  createdOn: '2023-07-05T15:02:13.950Z',
-  orgId: '5LZnKVTNxvwMqufy',
-  id: 'cuRficeyoStwTF-f',
-  contentType: 'image/png',
-  createdById: 'SWIFPZeZzkBvrSLD',
-  updatedById: 'SWIFPZeZzkBvrSLD',
-  fileSize: 1757973
-};
-export const cuRficeyoStwTF_f_fileEntities = [
-  {
+  primaryFile: {
     fileName: 'JACKET 300_SOLDIER OLIVE.png',
     id: 'yn2d5oHD4rXHRzyB',
     size: 1757973
   },
-  {
+  tinyViewableId: '6HWzJrQ-Jx1iefmj',
+  tinyViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb68f8652-f33f-452f-ae34-25397b4521eb.png',
+  tinyViewable: {
     fileName: 'JACKET 300_SOLDIER OLIVE_tiny.png',
     id: '6HWzJrQ-Jx1iefmj',
     size: 1784
   },
-  {
+  smallViewableId: 'D3WRW4iRmjLzp5VX',
+  smallViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F541c53f8-fd85-418e-ae28-ad7410658b90.png',
+  smallViewable: {
     fileName: 'JACKET 300_SOLDIER OLIVE_small.png',
     id: 'D3WRW4iRmjLzp5VX',
     size: 8699
   },
-  {
+  mediumViewableId: 'AsRvJenpeqxksUNW',
+  mediumViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fe803c2d3-3e1b-4d9c-9bb9-2c488f1f295b.png',
+  mediumViewable: {
     fileName: 'JACKET 300_SOLDIER OLIVE_medium.png',
     id: 'AsRvJenpeqxksUNW',
     size: 77558
   },
-  {
+  largeViewableId: 'vo4N4mCd-tFrw101',
+  largeViewableUrl: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fb1b7a55c-b8ba-4857-be4e-e1c3f11d8e9a.png',
+  largeViewable: {
     fileName: 'JACKET 300_SOLDIER OLIVE_large.png',
     id: 'vo4N4mCd-tFrw101',
     size: 1781538
   },
-  {
+  CS_300Id: '6A5AG33nVu3Z6ogO',
+  CS_300Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F3f2ea306-a77f-4cc3-a49a-75fb5d8b113c.png',
+  CS_300: {
     fileName: 'JACKET 300_SOLDIER OLIVE_CS_300.png',
     id: '6A5AG33nVu3Z6ogO',
     size: 141153
   },
-  {
+  CS_500Id: 'rBaHc1J2xdOWdbhI',
+  CS_500Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F979c8c65-b63f-4220-aa2e-11520f2f68bf.png',
+  CS_500: {
     fileName: 'JACKET 300_SOLDIER OLIVE_CS_500.png',
     id: 'rBaHc1J2xdOWdbhI',
     size: 382057
   },
-  {
+  CS_800Id: 'ZPAeYI3JiqjQ7unY',
+  CS_800Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2Fc58eeffa-2592-4698-a058-19281cda447c.png',
+  CS_800:{
     fileName: 'JACKET 300_SOLDIER OLIVE_CS_800.png',
     id: 'ZPAeYI3JiqjQ7unY',
     size: 1008702
-  },{
+  },
+  CS_1000Id: 'Hg_CthwsD4ozopCb',
+  CS_1000Url: 'https://api.vibeiq.com/prod/api/files/downloadUrl/5LZnKVTNxvwMqufy%2Fcontent:cuRficeyoStwTF-f%2F2c827c7b-361b-4e05-b77d-4280294f9d9c.png',
+  CS_1000: {
     fileName: 'JACKET 300_SOLDIER OLIVE_CS_1000.png',
     id: 'Hg_CthwsD4ozopCb',
     size: 1605889
-  }
-];
+  },
+  createdOn: '2023-07-05T15:02:13.950Z',
+  orgId: '5LZnKVTNxvwMqufy',
+  id: 'cuRficeyoStwTF-f',
+  contentType: 'image/png',
+  createdById: 'SWIFPZeZzkBvrSLD',
+  updatedById: 'SWIFPZeZzkBvrSLD',
+  fileSize: 1757973
+};

package/src/util/thumbnail-util.spec.ts

@@ -1,7 +1,7 @@
 import { FCConfig } from '../interfaces/interfaces';
 import { ThumbnailUtil } from './thumbnail-util';
 
-import { empty_custom_sizes, four_custom_sizes, thumbnail_content_entity, cuRficeyoStwTF_f_fileEntities } from './mockData';
+import { empty_custom_sizes, four_custom_sizes, thumbnail_content_entity } from './mockData';
 
 describe('ThumbnailUtil Tests', () =>{
   const config = {} as FCConfig;
@@ -54,10 +54,17 @@ describe('ThumbnailUtil Tests', () =>{
           largeViewableDownloadUrl :{
             newValue: newDownloadUrl,
             oldValue: oldDownloadUrl
+          },
+          largeViewable: {
+            propertyName: 'largeViewable',
+            oldValue: '',
+            newValue: 'Test1'
           }
         }
       };
 
+      const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
+      spyCustomSizes.mockReturnValue(Promise.resolve(empty_custom_sizes));
       const spyGetFileId = jest.spyOn(tu, 'getFileId');
       spyGetFileId.mockReturnValue(Promise.resolve(thumbnailId));
       const results = await tu.setOutboundThumbnail(data, event);
@@ -80,6 +87,8 @@ describe('ThumbnailUtil Tests', () =>{
         propertyDiffs: {}
       };
 
+      const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
+      spyCustomSizes.mockReturnValue(Promise.resolve(empty_custom_sizes));
       const spyGetFileId = jest.spyOn(tu, 'getFileId');
       spyGetFileId.mockReturnValue(Promise.resolve(thumbnailId));
       const results = await tu.setOutboundThumbnail(data, event);
@@ -101,11 +110,9 @@ describe('ThumbnailUtil Tests', () =>{
       const spyCustomSizes = jest.spyOn(tu, 'getCustomSizes');
       spyCustomSizes.mockReturnValue(Promise.resolve(empty_custom_sizes));
       const spyContentEntity = jest.spyOn(tu, 'getContentEntity');
-      const content = thumbnail_content_entity;
-      spyContentEntity.mockReturnValue(Promise.resolve(content));
+      const content = JSON.parse(JSON.stringify(thumbnail_content_entity));
 
-      const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-      spyGetFileEntities.mockReturnValue(Promise.resolve(cuRficeyoStwTF_f_fileEntities));
+      spyContentEntity.mockReturnValue(Promise.resolve(content));
 
       const results = await tu.getFileId(primaryFileId);
       expect(results).toEqual('vo4N4mCd-tFrw101');
@@ -122,9 +129,6 @@ describe('ThumbnailUtil Tests', () =>{
       const content = thumbnail_content_entity;
       spyContentEntity.mockReturnValue(Promise.resolve(content));
 
-      const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-      spyGetFileEntities.mockReturnValue(Promise.resolve(cuRficeyoStwTF_f_fileEntities));
-
       const results = await tu.getFileId(primaryFileId);
       expect(results).toEqual('AsRvJenpeqxksUNW');
     });
@@ -141,9 +145,6 @@ describe('ThumbnailUtil Tests', () =>{
       const content = thumbnail_content_entity;
       spyContentEntity.mockReturnValue(Promise.resolve(content));
 
-      const spyGetFileEntities = jest.spyOn(tu, 'getFileEntities');
-      spyGetFileEntities.mockReturnValue(Promise.resolve(cuRficeyoStwTF_f_fileEntities));
-
       const results = await tu.getFileId(primaryFileId);
       expect(results).toEqual('rBaHc1J2xdOWdbhI');
     });

package/src/util/thumbnail-util.ts

@@ -8,6 +8,7 @@ export class ThumbnailUtil {
   static NEW_THUMBNAIL_ID = 'NEW_THUMBNAIL_ID';
   static EXISTING_THUMBNAIL_ID = 'EXISTING_THUMBNAIL_ID';
   static REMOVE_THUMBNAIL = 'REMOVE_THUMBNAIL';
+  static OOB_SIZES = [{ slug: 'largeViewable' }, { slug: 'mediumLargeViewable' }, { slug: 'mediumViewable' }, { slug: 'smallViewable' }, { slug: 'tinyViewable' }]
   constructor(private config: FCConfig){
     this.entities = new Entities();
     if(this.config['max_thumbnail_size']){
@@ -22,7 +23,8 @@ export class ThumbnailUtil {
       const fileId = await this.getFileId(primaryViewableId);
 
       if(fileId){
-        const key = (event?.propertyDiffs?.largeViewableDownloadUrl)
+        const customSizes = await this.getCustomSizes();
+        const key = (this.isThumbnailNew(event, customSizes))
           ? ThumbnailUtil.NEW_THUMBNAIL_ID
           : ThumbnailUtil.EXISTING_THUMBNAIL_ID;
         data[key] = fileId;
@@ -33,52 +35,57 @@ export class ThumbnailUtil {
     }
     return data;
   }
+    /** Determines if a new image has been generated.  If any viewable is new, there might be a better
+   * sized image.  So send the fileId as new.
+   *
+   * @param event
+   * @param customSizes
+   * @returns boolean
+   */
+    public isThumbnailNew(event, customSizes: any[]): boolean {
+      const propertyDiffs = event?.propertyDiffs;
+      if(propertyDiffs){
+        const diffKeys = Object.keys(propertyDiffs);
+        const sizeKeys = ThumbnailUtil.OOB_SIZES.map( s => s.slug);
+        if(customSizes){
+          sizeKeys.push(...customSizes.map(s => s.slug));
+        }
+        console.info('diffKeys: ' + JSON.stringify(diffKeys));
+        console.info('sizeKeys: ' + JSON.stringify(sizeKeys));
+        return diffKeys.some(s => sizeKeys.includes(s));
+      }
+      return false;
+    }
 
   public async getFileId(primaryViewableId: string): Promise<string> {
-    console.info('getFileId()-' + primaryViewableId);
+    console.info('ThumbnailUtil.getFileId()-' + primaryViewableId);
     const sizes = await this.getCustomSizes();
 
-    const OOBSizes = [{ slug: 'largeViewable' }, { slug: 'mediumViewable' }, { slug: 'smallViewable' }, { slug: 'tinyViewable' }];
+    const OOBSizes = JSON.parse(JSON.stringify(ThumbnailUtil.OOB_SIZES));
     sizes.push(...OOBSizes);
     console.info('sizes: ' + JSON.stringify(sizes));
 
     //get Content
-    const content = await this.getContentEntity(primaryViewableId);
-    if(Logger.isDebugOn()){
-      console.debug('content: ' + JSON.stringify(content));
-
-    }
+    const content = await this.getContentEntity(primaryViewableId, sizes);
     if (!content) {
       return undefined;
     }
-    //get file entities
-    const contentKeys = Object.getOwnPropertyNames(content);
-    const fileEntityIds = [];
-    for (const size of sizes) {
-      const key = size.slug + 'Id';
-      if (contentKeys.includes(key) && !fileEntityIds.includes(content[key])) {
-        fileEntityIds.push(content[key]);
-        size['fileId'] = content[key];
-      }
-    }
-
-    const fileResults = await this.getFileEntities(fileEntityIds);
 
-    if(Logger.isDebugOn()){
-      console.debug('fileResults: ' + JSON.stringify(fileResults));
-    }
+    const contentKeys = Object.getOwnPropertyNames(content);
+    const isDebugOn = Logger.isDebugOn();
 
-    // Finding largest image that is under the max limit
     let fileId = undefined;
     let tempFileSize = 0;
-    const isDebugOn = Logger.isDebugOn();
-    for (const sizeObj of sizes) {
-      if(isDebugOn){
-        console.debug('size: ' + JSON.stringify(sizeObj));
-      }
-      if (sizeObj['fileId']) {
-        const file = fileResults.find(f => f['id'] === sizeObj['fileId']);
-        if (file['size'] > tempFileSize && file['size'] < this.max_thumbnail_size) {
+    
+    for(const size of sizes){
+      const slug = size?.slug;
+      if(contentKeys.includes(slug)){
+        const file = content[slug];
+        if(isDebugOn){
+          console.debug('size: ' + slug);
+          console.debug('fileId: ' + file['id']);
+        }
+        if(file && file['size'] > tempFileSize && file['size'] < this.max_thumbnail_size){
           tempFileSize = file['size'];
           fileId = file['id'];
           if(isDebugOn){
@@ -87,7 +94,7 @@ export class ThumbnailUtil {
         }
       }
     }
-    console.info('getFileId(): returning-' + fileId);
+    console.info('ThumbnailUtil.getFileId(): returning-' + fileId);
     return fileId;
   }
 
@@ -100,29 +107,38 @@ export class ThumbnailUtil {
     return sizes;
   }
 
-  async getContentEntity(primaryViewableId: any) {
+  async getContentEntity(primaryViewableId: any, sizes: any[]) {
     const criteria = {
       id: primaryViewableId
     };
+    const relations = sizes.map(s => s.slug);
+    relations.push('primaryFile');
     const contentResults = await this.entities.get({
       entityName: 'content',
-      criteria
+      criteria,
+      relations
     });
-    console.info('contentResults: ' + JSON.stringify(contentResults));
     const content = (contentResults && contentResults[0]) ? contentResults[0] : undefined;
+    this.logContentResults(content, relations);
     return content;
   }
 
-  async getFileEntities(fileEntityIds: any[]) {
-    const criteria = {
-      ids: fileEntityIds
-    };
-
-    const fileResults = await this.entities.get({
-      entityName: 'file',
-      criteria
-    });
-    return fileResults;
-  }
+    /** This outputs the content entity, without the inflated file entities.
+   * To help debugging issues with sending the thumbnail info.
+   * The inflated entities are removed, because are large and cause
+   * problems with log file size limits.
+   *
+   * @param content: the content with inflated objects
+   * @param relations: string[] of the slugs for inflated objects
+   */
+    logContentResults(content: any, relations: string[]) {
+      if(Logger.isDebugOn()){
+        const contentCopy = JSON.parse(JSON.stringify(content));
+        relations.forEach(r => {
+          delete contentCopy[r];
+        });
+        console.debug('content: ' + JSON.stringify(contentCopy));
+      }
+    }
 
 }