@contrail/flexplm 1.5.1-alpha.c9b11be → 1.6.0-alpha.8e73fa3

package/lib/interfaces/mapping-file.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -32,6 +32,15 @@ export declare class BaseProcessPublishAssortment {
         skip_await?: undefined;
     }>;
     getPublishInfo(assortmentId: string, assortmentPublishChangeId: string, apcHistory: any, publisher: any): Promise<any>;
+    /** Gets the version number of the snapshot that was created for the publish change.
+     * But if no snapshot was found for the publish change, and the last snapshot was
+     * created before the publish change, then it returns 'after: versionNumber' where
+     * versionNumber is the version number of the last snapshot.
+     * If no snapshot was found for the publish change, and the last snapshot was
+     * created after the publish change, then it returns 'unknown'.
+     *
+     * @returns versionNumber or 'unknown' or 'after: versionNumber'
+     */
     getSnapshotVersion(assortment: any, apc: any): Promise<number | string>;
     getSeasonFederation(assortmentId: any): Promise<SeasonFederation>;
     getAssortment(assortmentId: any): Promise<any>;
@@ -77,12 +86,29 @@ export declare class BaseProcessPublishAssortment {
     getResultsCount(events: any): any;
     private sendEvents;
     private sendToFlexPLM;
+    private buildPublishError;
     private saveToLocalFile;
     private handleVibeIQFile;
     private sendPublishPayloadEvent;
     private getCurrentDateString;
     getItemFamilyChanges(pcd: PublishChangeData, changeDetail: any, assortmentItemFullChangeMap: Map<string, any>, assortmentItemDeleteMap: Map<string, any>): Map<string, ItemFamilyChanges>;
     getEventsForPublishChangeData(publishChangeData: PublishChangeData): Promise<SeasonalPayload[]>;
+    /**Returns the events for a given ItemFamilyChanges object
+     *
+     * Cases:
+     * Add just family:
+     * Add option to family (with existing option):
+     * Add option to family (no options on assortment):
+     * Remove family and option:
+     * Remove only option and leave family:
+     * Remove one option of multiple for family:
+     *
+     * @param itemFamilyChanges
+     * @param assortmentId
+     * @param assortmentFederationId
+     * @param itemToFederatedIdMapping
+     * @returns
+     */
     getEventsForItemFamilyChanges(itemFamilyChanges: ItemFamilyChanges, assortmentId: string, seasonFed: SeasonFederation, itemToFederatedIdMapping: Map<string, string>): Promise<SeasonalPayload[]>;
     getProjectItem(itemFamilyChanges: ItemFamilyChanges, id: string): any;
     getSeasonalData(projectItem: any): Promise<object>;

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

@@ -13,7 +13,7 @@ const app_framework_1 = require("@contrail/app-framework");
 const event_short_message_status_1 = require("../util/event-short-message-status");
 class BaseProcessPublishAssortment {
     constructor(_config, _dc, _mapFileUtil) {
-        this.TTL = 30 * 24 * 60 * 60 * 1000;
+        this.TTL = 30 * 24 * 60 * 60 * 1000; // 30 days
         this.cache = {
             carriedFromSeason: {}
         };
@@ -52,13 +52,14 @@ class BaseProcessPublishAssortment {
             }
             apcHistory = await this.getApcHistory(assortmentId);
             const sinceDate = await this.getSinceDate(assortmentId, assortmentPublishChangeId, apcHistory);
+            //Get detail information
             const assortmentPublishChange = await this.downloadAssortmentPublishChange(assortmentId, assortmentPublishChangeId);
             publisher = this.getPublisher(assortmentPublishChange);
             const changeDetail = await this.downloadHydratedChangeDetail(assortmentPublishChange);
             const assortmentBaseline = await this.downloadAssortmentBaseline(assortmentPublishChange);
             const deleteChanges = await this.getDeleteChanges(assortmentPublishChange, apcHistory, assortmentBaseline, sinceDate);
             const releasedForDevelopmentItemIds = this.getReleasedForDevelopmentItemAndFamilyIds(assortmentBaseline, deleteChanges);
-            const itemToFederatedIdMapping = await this.getItemFederatedIds();
+            const itemToFederatedIdMapping = await this.getItemFederatedIds( /*allItemIds*/);
             const pcd = new publish_change_data_1.PublishChangeData(assortmentId, seasonFed, assortmentPublishChangeId, sinceDate, publisher);
             pcd.itemToFederatedIdMapping = itemToFederatedIdMapping;
             pcd.releasedForDevelopmentItemIds = releasedForDevelopmentItemIds;
@@ -94,6 +95,15 @@ class BaseProcessPublishAssortment {
         };
         return publishInfo;
     }
+    /** Gets the version number of the snapshot that was created for the publish change.
+     * But if no snapshot was found for the publish change, and the last snapshot was
+     * created before the publish change, then it returns 'after: versionNumber' where
+     * versionNumber is the version number of the last snapshot.
+     * If no snapshot was found for the publish change, and the last snapshot was
+     * created after the publish change, then it returns 'unknown'.
+     *
+     * @returns versionNumber or 'unknown' or 'after: versionNumber'
+     */
     async getSnapshotVersion(assortment, apc) {
         const entityReference = assortment?.createdForReference;
         const createdOnString = apc?.createdOn;
@@ -101,7 +111,7 @@ class BaseProcessPublishAssortment {
             return 'unknown';
         }
         const createdOnDate = new Date(createdOnString);
-        createdOnDate.setMonth(createdOnDate.getMonth() - 1);
+        createdOnDate.setMonth(createdOnDate.getMonth() - 1); //subtract 1 month
         const createdOnStringMinus1 = createdOnDate.toISOString();
         const createdOn = 'ISGREATERTHAN ' + createdOnStringMinus1;
         const snapshots = await new sdk_1.Entities().get({
@@ -348,6 +358,7 @@ class BaseProcessPublishAssortment {
             console.info('sinceDateMilliseconds: ' + sinceDateMilliseconds);
             console.info('apcDateMilliseconds: ' + previousApcDate);
         }
+        //if only 1 apc, no processing needed
         if (sinceDateMilliseconds !== previousApcDate) {
             console.info('sinceDateMilliseconds !== apcDateMilliseconds');
             const currentAssortmentItemIds = this.getBaselineItemIds(assortmentBaseline);
@@ -433,12 +444,27 @@ class BaseProcessPublishAssortment {
             previousBaseline = await this.downloadAssortmentBaseline(previousApc);
         }
         const deleteIds = apc?.detail?.deletes.map(dItem => dItem?.id);
+        //building deletes based on previous baseline; because some APCs don't have delete data
         const deleteArray = previousBaseline?.assortmentItems.filter(aItem => deleteIds.includes(aItem?.itemId));
         console.info('deleteArray.length: ' + deleteArray.length);
         return deleteArray;
     }
-    async getItemFederatedIds() {
+    async getItemFederatedIds( /*itemIds*/) {
         const itemFederatedIds = new Map();
+        // const expandedItemIds = itemIds.map(id => 'item:' + id);
+        // const fedRecords = await new Federation(this.logger).getFederationRecordsFromIdsBulk(expandedItemIds);
+        // for (let i = 0; i < fedRecords.length; i++) {
+        //   const federationRecord = fedRecords[i];
+        //   // console.log('federationRecord: ' + JSON.stringify(federationRecord));
+        //   // console.log('federationRecord.reference: ' + federationRecord.reference);
+        //   // console.log('federationRecord.mappedReference: ' + federationRecord.mappedReference);
+        //   let vibeId = federationRecord.reference;
+        //   if (vibeId && vibeId.startsWith('item:')) {
+        //     vibeId = vibeId.substring(5);
+        //   }
+        //   itemFederatedIds.set(vibeId, federationRecord.mappedReference);
+        // }
+        // console.log('itemFederatedIds: ' + JSON.stringify(Object.fromEntries(itemFederatedIds)));
         return itemFederatedIds;
     }
     getFullChangeAssortmentMap(fullChange) {
@@ -565,7 +591,7 @@ class BaseProcessPublishAssortment {
             case 'vibeiqfile-dontsendtoflexplm':
                 return this.handleVibeIQFile(events, eventType, sendMode);
             default:
-                return {};
+                return {}; // Or handle other cases as required
         }
     }
     async sendToFlexPLM(events, eventType) {
@@ -576,16 +602,30 @@ class BaseProcessPublishAssortment {
             events
         };
         const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
-        const [sendResult] = await Promise.allSettled([
+        const [sendResult, eventResult] = await Promise.allSettled([
             flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
             this.sendPublishPayloadEvent(outboundPublishEvent)
         ]);
-        const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
+        if (sendResult.status === 'rejected' || eventResult.status === 'rejected') {
+            throw this.buildPublishError(sendResult, eventResult, outboundPublishEvent);
+        }
+        const result = sendResult.value;
         const isResultObject = typeof result === 'object' && result !== null;
-        const resultWithOutboundPublishEvent = isResultObject
+        return isResultObject
             ? { ...result, outboundPublishEvent }
             : { result, outboundPublishEvent };
-        return resultWithOutboundPublishEvent;
+    }
+    buildPublishError(sendResult, eventResult, outboundPublishEvent) {
+        const baseReason = sendResult.status === 'rejected' ? sendResult.reason : eventResult.reason;
+        const error = baseReason instanceof Error ? baseReason : new Error(String(baseReason));
+        error.outboundPublishEvent = outboundPublishEvent;
+        error.sendToFlexPLMResult = sendResult.status === 'fulfilled'
+            ? sendResult.value
+            : { error: sendResult.reason?.message ?? String(sendResult.reason) };
+        error.sendPublishPayloadEventResult = eventResult.status === 'fulfilled'
+            ? eventResult.value
+            : { error: eventResult.reason?.message ?? String(eventResult.reason) };
+        return error;
     }
     async saveToLocalFile(events, eventType) {
         let results = {};
@@ -632,12 +672,18 @@ class BaseProcessPublishAssortment {
         };
         if (sendMode === 'vibeiqfile') {
             const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
-            const [sendResult] = await Promise.allSettled([
+            const [sendResult, eventResult] = await Promise.allSettled([
                 flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
                 this.sendPublishPayloadEvent(outboundPublishEvent)
             ]);
-            const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
-            return { ...result, outboundPublishEvent };
+            if (sendResult.status === 'rejected' || eventResult.status === 'rejected') {
+                throw this.buildPublishError(sendResult, eventResult, outboundPublishEvent);
+            }
+            const result = sendResult.value;
+            const isResultObject = typeof result === 'object' && result !== null;
+            return isResultObject
+                ? { ...result, outboundPublishEvent }
+                : { result, outboundPublishEvent };
         }
         else {
             await this.sendPublishPayloadEvent(outboundPublishEvent);
@@ -770,7 +816,7 @@ class BaseProcessPublishAssortment {
             else {
                 ifc.colorDeletes.push(itemId);
             }
-        }
+        } //End deletes for loop
         if (app_framework_1.Logger.isDebugOn()) {
             console.debug('returning size: ' + itemFamilyChanges.size);
             for (const [key, value] of itemFamilyChanges) {
@@ -790,6 +836,22 @@ class BaseProcessPublishAssortment {
         }
         return seasonalPayloads;
     }
+    /**Returns the events for a given ItemFamilyChanges object
+     *
+     * Cases:
+     * Add just family:
+     * Add option to family (with existing option):
+     * Add option to family (no options on assortment):
+     * Remove family and option:
+     * Remove only option and leave family:
+     * Remove one option of multiple for family:
+     *
+     * @param itemFamilyChanges
+     * @param assortmentId
+     * @param assortmentFederationId
+     * @param itemToFederatedIdMapping
+     * @returns
+     */
     async getEventsForItemFamilyChanges(itemFamilyChanges, assortmentId, seasonFed, itemToFederatedIdMapping) {
         console.info('getEventsForItemFamilyChanges()');
         const events = [];
@@ -799,7 +861,10 @@ class BaseProcessPublishAssortment {
         const familyAssortmentItem = itemFamilyChanges.familyAdd || itemFamilyChanges.familyUpdate || itemFamilyChanges.familyDelete
             || itemFamilyChanges.colorAdds.length > 0 || itemFamilyChanges.colorUpdates.length > 0 || itemFamilyChanges.colorDeletes.length > 0
             || (projectItem && this.updatedSinceDate(projectItem, itemFamilyChanges.sinceDate));
+        //familyItemRemoved is used when adding the first option to an assortment
+        //and will have updates for the family item.
         if (familyAssortmentItem) {
+            //Product-season add
             const entityReference = itemFamilyChanges.itemFamilyId;
             const prodEntityData = (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference))
                 ? itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference)?.item
@@ -825,6 +890,9 @@ class BaseProcessPublishAssortment {
             }
             events.push(psUpsert);
         }
+        //colorway-season adds
+        //colorAdds
+        //colorUpdates
         const colorwayChanges = [];
         colorwayChanges.push(...itemFamilyChanges.colorAdds);
         colorwayChanges.push(...itemFamilyChanges.colorUpdates);
@@ -865,6 +933,9 @@ class BaseProcessPublishAssortment {
             const aItem = itemFamilyChanges?.assortmentItemFullChangeMap.get(id);
             projectItem = aItem?.projectItem;
         }
+        /////////////////////////////////////////////////////////////////////////////
+        //Get from option assortmentItem because family not in assortmentItemFullChangeMap:start
+        /////////////////////////////////////////////////////////////////////////////
         if (id === itemFamilyChanges.itemFamilyId && Object.keys(projectItem).length == 0) {
             for (const asstItem of itemFamilyChanges.assortmentItemFullChangeMap.values()) {
                 if (asstItem?.familyProjectItem) {
@@ -873,6 +944,9 @@ class BaseProcessPublishAssortment {
                 }
             }
         }
+        /////////////////////////////////////////////////////////////////////////////
+        //Get from option assortmentItem because family not in assortmentItemFullChangeMap:end
+        /////////////////////////////////////////////////////////////////////////////
         return projectItem;
     }
     async getSeasonalData(projectItem) {

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

@@ -14,6 +14,7 @@ let federatedId = '';
 jest.mock('../util/data-converter', () => {
     return {
         DataConverter: class {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
             getFlexPLMObjectData(newData, dataToSkip, inflateObjRef) {
                 return newData;
             }
@@ -115,6 +116,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: assortmentName };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -140,6 +142,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: undefined };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -165,6 +168,7 @@ describe('getPublishInfo', () => {
             return undefined;
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -199,6 +203,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: assortmentName };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -223,6 +228,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: assortmentName };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -249,6 +255,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: assortmentName };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -275,6 +282,7 @@ describe('getPublishInfo', () => {
             return { id: assortmentId, name: assortmentName };
         });
         const spyyGetSnapshotVersion = jest.spyOn(ppa, 'getSnapshotVersion')
+            // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
             .mockImplementation(async (assortmentId, assortmentPublishChangeId) => {
             return versionHistoryNumber;
         });
@@ -428,6 +436,7 @@ describe('getSnapshotVersion', () => {
             {
                 id: 'qewrwer',
                 assortmentChangeId: 'bad-id',
+                // createdOn: '2023-01-14T19:13:58.902Z',
                 versionNumber
             }
         ];
@@ -1160,6 +1169,7 @@ describe('getItemFamilyChanges', () => {
         const ifcs = pcd.itemFamilyChanges;
         expect(ifcs.size).toEqual(1);
         const ifc = ifcs.get(itemFamilyId);
+        // expect(ifc.familyAdd).toBe(true);
         expect(ifc.colorAdds.length).toEqual(1);
     });
     it('Feb 3 - 2+ Option A', () => {
@@ -1189,6 +1199,7 @@ describe('getItemFamilyChanges', () => {
         const ifcs = pcd.itemFamilyChanges;
         expect(ifcs.size).toEqual(1);
         const ifc = ifcs.get(itemFamilyId);
+        // expect(ifc.familyAdd).toBe(true);
         expect(ifc.colorAdds.length).toEqual(2);
     });
     it('Feb 3 - 2+ Option A & Feb 3 - 1 Option A', () => {
@@ -1320,6 +1331,8 @@ describe('getItemFamilyChanges', () => {
         const ifcs = pcd.itemFamilyChanges;
         expect(ifcs.size).toEqual(1);
         const ifc = ifcs.get(itemFamilyId);
+        //TODO fix
+        // expect(ifc.familyDelete).toBe(true);
         expect(ifc.colorAdds.length).toEqual(0);
         expect(ifc.colorDeletes.length).toEqual(1);
     });
@@ -1592,9 +1605,10 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity')
-            .mockResolvedValueOnce(true)
-            .mockResolvedValueOnce(true);
+            .mockResolvedValueOnce(true) // for family
+            .mockResolvedValueOnce(true); // for SKU
         const events = await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        // Should have both family and SKU events because familyAssortmentItem is true when colorAdds.length > 0
         expect(events).toHaveLength(2);
         const skuEvent = events.find(e => e.objectClass === 'LCSSKUSeasonLink');
         expect(skuEvent.eventType).toBe('UPSERT_ON_SEASON');
@@ -1633,9 +1647,10 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity')
-            .mockResolvedValueOnce(false)
-            .mockResolvedValueOnce(false);
+            .mockResolvedValueOnce(false) // for family
+            .mockResolvedValueOnce(false); // for SKU
         const events = await bppa.getEventsForItemFamilyChanges(itemFamilyChanges, 'assort123', seasonFed, new Map());
+        // Should have both family and SKU events because familyAssortmentItem is true when colorUpdates.length > 0
         expect(events).toHaveLength(2);
         const skuEvent = events.find(e => e.objectClass === 'LCSSKUSeasonLink');
         expect(skuEvent.eventType).toBe('UPDATE_ON_SEASON');
@@ -1674,6 +1689,7 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         jest.spyOn(map_utils_1.MapUtil, 'applyTransformMap').mockResolvedValue({ transformedData: 'value' });
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getIdentifierProperties').mockResolvedValue(['identifier']);
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'getInformationalProperties').mockResolvedValue([]);
+        // Product is creatable (true), SKU is not (false)
         jest.spyOn(type_conversion_utils_1.TypeConversionUtils, 'isOutboundCreatableFromEntity')
             .mockResolvedValueOnce(true)
             .mockResolvedValueOnce(false);
@@ -1684,7 +1700,9 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         expect(productEvent.eventType).toBe('UPSERT_ON_SEASON');
         expect(skuEvent.eventType).toBe('UPDATE_ON_SEASON');
         expect(type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity).toHaveBeenCalledTimes(2);
+        // Verify product event called with assortment entity
         expect(type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity).toHaveBeenNthCalledWith(1, undefined, mapFileUtil, familyProjectItem, { item: prodEntityData, assortment });
+        // Verify SKU event called with assortment entity
         expect(type_conversion_utils_1.TypeConversionUtils.isOutboundCreatableFromEntity).toHaveBeenNthCalledWith(2, undefined, mapFileUtil, colorProjectItem, { item: itemData, assortment });
     });
 });
@@ -1709,7 +1727,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
     afterEach(() => {
         jest.restoreAllMocks();
     });
-    it('sendToFlexPLM merges outboundPublishEvent into result and calls sendPublishPayloadEvent in parallel', async () => {
+    it('should merge outboundPublishEvent into result and call sendPublishPayloadEvent in parallel', async () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
         const flexResponse = { status: 200, data: { ok: true } };
         let flexResolved = false;
@@ -1738,7 +1756,80 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
         expect(spyEvent).toHaveBeenCalledWith(passedOutboundPublishEvent);
         expect(result).toEqual({ ...flexResponse, outboundPublishEvent: passedOutboundPublishEvent });
     });
-    it('handleVibeIQFile (vibeiqfile) merges outboundPublishEvent into FlexPLM result and calls sendPublishPayloadEvent', async () => {
+    it('sendToFlexPLM throws when flexPLMConnect.sendToFlexPLM fails, attaching outboundPublishEvent and both results', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexError = new Error('flex failed');
+        const eventResponse = { eventOk: true };
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockRejectedValue(flexError);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockResolvedValue(eventResponse);
+        await expect(bppa.sendToFlexPLM(events, eventType)).rejects.toMatchObject({
+            message: 'flex failed',
+            outboundPublishEvent: expect.objectContaining({ taskId: 'task-abc', eventType, objectClass: 'LCSSeason', events }),
+            sendToFlexPLMResult: { error: 'flex failed' },
+            sendPublishPayloadEventResult: eventResponse
+        });
+    });
+    it('sendToFlexPLM throws when sendPublishPayloadEvent fails, with flex result attached', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexResponse = { status: 200 };
+        const eventError = new Error('event failed');
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockResolvedValue(flexResponse);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockRejectedValue(eventError);
+        await expect(bppa.sendToFlexPLM(events, eventType)).rejects.toMatchObject({
+            message: 'event failed',
+            outboundPublishEvent: expect.objectContaining({ taskId: 'task-abc', eventType }),
+            sendToFlexPLMResult: flexResponse,
+            sendPublishPayloadEventResult: { error: 'event failed' }
+        });
+    });
+    it('sendToFlexPLM throws the flexPLMConnect error when both fail', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexError = new Error('flex failed');
+        const eventError = new Error('event failed');
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockRejectedValue(flexError);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockRejectedValue(eventError);
+        await expect(bppa.sendToFlexPLM(events, eventType)).rejects.toBe(flexError);
+        expect(flexError.outboundPublishEvent).toBeDefined();
+        expect(flexError.sendToFlexPLMResult).toEqual({ error: 'flex failed' });
+        expect(flexError.sendPublishPayloadEventResult).toEqual({ error: 'event failed' });
+    });
+    it('handleVibeIQFile (vibeiqfile) throws when flexPLMConnect.sendToFlexPLM fails, with both results attached', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexError = new Error('flex failed');
+        const eventResponse = { eventOk: true };
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockRejectedValue(flexError);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockResolvedValue(eventResponse);
+        await expect(bppa.handleVibeIQFile(events, eventType, 'vibeiqfile')).rejects.toMatchObject({
+            message: 'flex failed',
+            outboundPublishEvent: expect.objectContaining({ eventsFileId: 'file-123' }),
+            sendToFlexPLMResult: { error: 'flex failed' },
+            sendPublishPayloadEventResult: eventResponse
+        });
+    });
+    it('handleVibeIQFile (vibeiqfile) throws when sendPublishPayloadEvent fails, with flex result attached', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexResponse = { status: 200 };
+        const eventError = new Error('event failed');
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockResolvedValue(flexResponse);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockRejectedValue(eventError);
+        await expect(bppa.handleVibeIQFile(events, eventType, 'vibeiqfile')).rejects.toMatchObject({
+            message: 'event failed',
+            outboundPublishEvent: expect.objectContaining({ eventsFileId: 'file-123' }),
+            sendToFlexPLMResult: flexResponse,
+            sendPublishPayloadEventResult: { error: 'event failed' }
+        });
+    });
+    it('handleVibeIQFile (vibeiqfile) throws the flexPLMConnect error when both fail', async () => {
+        const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const flexError = new Error('flex failed');
+        const eventError = new Error('event failed');
+        jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM').mockRejectedValue(flexError);
+        jest.spyOn(bppa, 'sendPublishPayloadEvent').mockRejectedValue(eventError);
+        await expect(bppa.handleVibeIQFile(events, eventType, 'vibeiqfile')).rejects.toBe(flexError);
+        expect(flexError.sendToFlexPLMResult).toEqual({ error: 'flex failed' });
+        expect(flexError.sendPublishPayloadEventResult).toEqual({ error: 'event failed' });
+    });
+    it('should merge outboundPublishEvent into FlexPLM result and call sendPublishPayloadEvent when mode is vibeiqfile', async () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
         const flexResponse = { status: 200, data: { ok: true } };
         const spyFlex = jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM')
@@ -1761,7 +1852,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
         expect(spyEvent).toHaveBeenCalledWith(passedOutboundPublishEvent);
         expect(result).toEqual({ ...flexResponse, outboundPublishEvent: passedOutboundPublishEvent });
     });
-    it('handleVibeIQFile (vibeiqfile-dontsendtoflexplm) skips FlexPLM but still calls sendPublishPayloadEvent', async () => {
+    it('should skip FlexPLM but still call sendPublishPayloadEvent when mode is vibeiqfile-dontsendtoflexplm', async () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
         const spyFlex = jest.spyOn(flexplm_connect_1.FlexPLMConnect.prototype, 'sendToFlexPLM')
             .mockResolvedValue({});
@@ -1777,7 +1868,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
             outboundPublishEvent: passedOutboundPublishEvent
         });
     });
-    it('sendPublishPayloadEvent creates an external-event with initialEvent parsed from config', async () => {
+    it('should create an external-event with initialEvent parsed from config', async () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
         const outboundPublishEvent = { foo: 'bar' };
         await bppa.sendPublishPayloadEvent(outboundPublishEvent);
@@ -1791,7 +1882,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
             }
         });
     });
-    it('sendPublishPayloadEvent defaults initialEvent to {} when config has no event', async () => {
+    it('should default initialEvent to {} when config has no event', async () => {
         const bareConfig = { taskId: 'task-x' };
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(bareConfig, dc, mapFileUtil);
         const outboundPublishEvent = { hello: 'world' };

package/lib/publish/mockData.js

@@ -3399,6 +3399,11 @@ exports.fall_2003_fedMapping = [
         mappedReference: 'VR:com.lcs.wc.product.LCSSKU:372509'
     }
 ];
+//SYHfQzYWlfXDqK7r - 4 adds
+//JreGRNvoJ3FsoRZI - 1 delete
+//NaPUhAdEzKB-5tQ3 - no changes
+//CHGKSCT358qyh1Nu - 1 delete
+//H4L4dHziO6WZRIwa - re-add from JreGRNvoJ3FsoRZI
 exports.apc_2bOWR2j9R0QThDVu_delete_history = [
     {
         adds: 4,

package/lib/transform/identifier-conversion-spec-mockData.js

@@ -31,6 +31,20 @@ exports.mapping = {
                 }
             }
         }
+        // flex2vibe: {
+        //   LCSRevisableEntity: {
+        //     getMapKey: (object) =>{ return object;}
+        //   },
+        //   LCSLast: {
+        //     getMapKey: (object) => {return object;}
+        //   },
+        //   LCSMaterial: {
+        //     getMapKey: (object) =>{ return object;}
+        //   },
+        //   LCSBusinessObject: {
+        //     getMapKey: (object) => {return object;}
+        //   }
+        // },
     },
     LCSSeason: {
         vibe2flex: {
@@ -54,7 +68,7 @@ exports.mapping = {
         vibeOwningKeys: ['itemNumber', 'lifecycleStage'],
         vibe2flex: {
             getClass: () => 'LCSProduct',
-            getSoftType: (entity) => {
+            getSoftType: (entity /*, dependencies*/) => {
                 const prodType = entity['prodType'];
                 let val = '';
                 switch (prodType) {
@@ -79,7 +93,7 @@ exports.mapping = {
                 vibeIQIdentifier: 'itemNumber'
             },
             valueTransform: {
-                transformEx: (row) => {
+                transformEx: (row /*, dependencies*/) => {
                     return row['otherProp'] + 'xxx';
                 }
             }
@@ -97,7 +111,7 @@ exports.mapping = {
         vibeOwningKeys: ['itemNumber', 'lifecycleStage'],
         vibe2flex: {
             getClass: () => 'LCSSKU',
-            getSoftType: (entity) => {
+            getSoftType: (entity /*, dependencies*/) => {
                 const prodType = entity['prodType'];
                 let val = '';
                 switch (prodType) {
@@ -252,6 +266,20 @@ exports.mapping2 = {
                 }
             }
         }
+        // flex2vibe: {
+        //   LCSRevisableEntity: {
+        //     getMapKey: (object) =>{ return object;}
+        //   },
+        //   LCSLast: {
+        //     getMapKey: (object) => {return object;}
+        //   },
+        //   LCSMaterial: {
+        //     getMapKey: (object) =>{ return object;}
+        //   },
+        //   LCSBusinessObject: {
+        //     getMapKey: (object) => {return object;}
+        //   }
+        // },
     },
     LCSSeason: {
         getIdentifierProperties: () => ['brand', 'year', 'seasonType'],
@@ -274,7 +302,7 @@ exports.mapping2 = {
         vibeOwningKeys: ['itemNumber', 'lifecycleStage'],
         vibe2flex: {
             getClass: () => 'LCSProduct',
-            getSoftType: (entity) => {
+            getSoftType: (entity /*, dependencies*/) => {
                 const prodType = entity['prodType'];
                 let val = '';
                 switch (prodType) {
@@ -299,7 +327,7 @@ exports.mapping2 = {
                 vibeIQIdentifier: 'itemNumber'
             },
             valueTransform: {
-                transformEx: (row) => {
+                transformEx: (row /*, dependencies*/) => {
                     return row['otherProp'] + 'xxx';
                 }
             }
@@ -318,7 +346,7 @@ exports.mapping2 = {
         getIdentifierProperties: () => ['uniqueIdentifierA', 'uniqueIdentifierB'],
         vibe2flex: {
             getClass: () => 'LCSSKU',
-            getSoftType: (entity) => {
+            getSoftType: (entity /*, dependencies*/) => {
                 const prodType = entity['prodType'];
                 let val = '';
                 switch (prodType) {