@contrail/flexplm 1.5.1-alpha.14abddb → 1.5.1-alpha.64caad7

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

@@ -79,7 +79,7 @@ export declare class BaseProcessPublishAssortment {
     private sendToFlexPLM;
     private saveToLocalFile;
     private handleVibeIQFile;
-    sendPublishPayloadEvent(outboundEvent: any): Promise<void>;
+    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[]>;

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

@@ -576,12 +576,16 @@ class BaseProcessPublishAssortment {
             events
         };
         const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
-        const [result] = await Promise.all([
+        const [sendResult] = await Promise.allSettled([
             flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
             this.sendPublishPayloadEvent(outboundPublishEvent)
         ]);
-        result['outboundPublishEvent'] = outboundPublishEvent;
-        return result;
+        const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
+        const isResultObject = typeof result === 'object' && result !== null;
+        const resultWithOutboundPublishEvent = isResultObject
+            ? { ...result, outboundPublishEvent }
+            : { result, outboundPublishEvent };
+        return resultWithOutboundPublishEvent;
     }
     async saveToLocalFile(events, eventType) {
         let results = {};
@@ -628,10 +632,11 @@ class BaseProcessPublishAssortment {
         };
         if (sendMode === 'vibeiqfile') {
             const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
-            const [result] = await Promise.all([
+            const [sendResult] = await Promise.allSettled([
                 flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
                 this.sendPublishPayloadEvent(outboundPublishEvent)
             ]);
+            const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
             return { ...result, outboundPublishEvent };
         }
         else {
@@ -642,7 +647,7 @@ class BaseProcessPublishAssortment {
             };
         }
     }
-    async sendPublishPayloadEvent(outboundEvent) {
+    async sendPublishPayloadEvent(outboundPublishEvent) {
         console.info('sendPublishPayloadEvent()');
         let initialEvent = {};
         if (this.config?.event) {
@@ -653,7 +658,7 @@ class BaseProcessPublishAssortment {
         const eventBody = {
             originSystemType: 'VibeIQ',
             objectClass: 'AssortmentPublishedToFlexPLM',
-            outboundEvent,
+            outboundPublishEvent,
             initialEvent
         };
         await new sdk_1.Entities().create({

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

@@ -1779,14 +1779,14 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
     });
     it('sendPublishPayloadEvent creates an external-event with initialEvent parsed from config', async () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
-        const outboundEvent = { foo: 'bar' };
-        await bppa.sendPublishPayloadEvent(outboundEvent);
+        const outboundPublishEvent = { foo: 'bar' };
+        await bppa.sendPublishPayloadEvent(outboundPublishEvent);
         expect(createCallArg).toEqual({
             entityName: 'external-event',
             object: {
                 originSystemType: 'VibeIQ',
                 objectClass: 'AssortmentPublishedToFlexPLM',
-                outboundEvent,
+                outboundPublishEvent,
                 initialEvent: { sourceEventId: 'src-1' }
             }
         });
@@ -1794,14 +1794,14 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
     it('sendPublishPayloadEvent defaults 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 outboundEvent = { hello: 'world' };
-        await bppa.sendPublishPayloadEvent(outboundEvent);
+        const outboundPublishEvent = { hello: 'world' };
+        await bppa.sendPublishPayloadEvent(outboundPublishEvent);
         expect(createCallArg).toEqual({
             entityName: 'external-event',
             object: {
                 originSystemType: 'VibeIQ',
                 objectClass: 'AssortmentPublishedToFlexPLM',
-                outboundEvent,
+                outboundPublishEvent,
                 initialEvent: {}
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/flexplm",
-  "version": "1.5.1-alpha.14abddb",
+  "version": "1.5.1-alpha.64caad7",
   "description": "Library used for integration with flexplm.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

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

@@ -2045,7 +2045,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
         flexResolved = true;
         return flexResponse as any;
       });
-    const spyEvent = jest.spyOn(bppa, 'sendPublishPayloadEvent')
+    const spyEvent = jest.spyOn(bppa as any, 'sendPublishPayloadEvent')
       .mockImplementation(async () => {
         await new Promise(r => setTimeout(r, 5));
         eventResolved = true;
@@ -2073,7 +2073,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
 
     const spyFlex = jest.spyOn(FlexPLMConnect.prototype, 'sendToFlexPLM')
       .mockResolvedValue(flexResponse as any);
-    const spyEvent = jest.spyOn(bppa, 'sendPublishPayloadEvent')
+    const spyEvent = jest.spyOn(bppa as any, 'sendPublishPayloadEvent')
       .mockResolvedValue(undefined as any);
 
     const result = await (bppa as any).handleVibeIQFile(events, eventType, 'vibeiqfile');
@@ -2101,7 +2101,7 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
 
     const spyFlex = jest.spyOn(FlexPLMConnect.prototype, 'sendToFlexPLM')
       .mockResolvedValue({} as any);
-    const spyEvent = jest.spyOn(bppa, 'sendPublishPayloadEvent')
+    const spyEvent = jest.spyOn(bppa as any, 'sendPublishPayloadEvent')
       .mockResolvedValue(undefined as any);
 
     const result = await (bppa as any).handleVibeIQFile(events, eventType, 'vibeiqfile-dontsendtoflexplm');
@@ -2119,16 +2119,16 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
 
   it('sendPublishPayloadEvent creates an external-event with initialEvent parsed from config', async () => {
     const bppa = new BaseProcessPublishAssortment(config, dc, mapFileUtil);
-    const outboundEvent = { foo: 'bar' };
+    const outboundPublishEvent = { foo: 'bar' };
 
-    await bppa.sendPublishPayloadEvent(outboundEvent);
+    await (bppa as any).sendPublishPayloadEvent(outboundPublishEvent);
 
     expect(createCallArg).toEqual({
       entityName: 'external-event',
       object: {
         originSystemType: 'VibeIQ',
         objectClass: 'AssortmentPublishedToFlexPLM',
-        outboundEvent,
+        outboundPublishEvent,
         initialEvent: { sourceEventId: 'src-1' }
       }
     });
@@ -2137,16 +2137,16 @@ describe('sendToFlexPLM / handleVibeIQFile / sendPublishPayloadEvent', () => {
   it('sendPublishPayloadEvent defaults initialEvent to {} when config has no event', async () => {
     const bareConfig = { taskId: 'task-x' } as unknown as FCConfig;
     const bppa = new BaseProcessPublishAssortment(bareConfig, dc, mapFileUtil);
-    const outboundEvent = { hello: 'world' };
+    const outboundPublishEvent = { hello: 'world' };
 
-    await bppa.sendPublishPayloadEvent(outboundEvent);
+    await (bppa as any).sendPublishPayloadEvent(outboundPublishEvent);
 
     expect(createCallArg).toEqual({
       entityName: 'external-event',
       object: {
         originSystemType: 'VibeIQ',
         objectClass: 'AssortmentPublishedToFlexPLM',
-        outboundEvent,
+        outboundPublishEvent,
         initialEvent: {}
       }
     });

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

@@ -693,12 +693,17 @@ export class BaseProcessPublishAssortment {
     };
 
     const flexPLMConnect = new FlexPLMConnect(this.config);
-    const [result] = await Promise.all([
+    const [sendResult] = await Promise.allSettled([
       flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
       this.sendPublishPayloadEvent(outboundPublishEvent)
     ]);
-    result['outboundPublishEvent'] = outboundPublishEvent;
-    return result;
+    const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
+    const isResultObject = typeof result === 'object' && result !== null;
+    const resultWithOutboundPublishEvent = isResultObject
+      ? { ...result, outboundPublishEvent }
+      : { result, outboundPublishEvent };
+
+    return resultWithOutboundPublishEvent;
   }
 
   private async saveToLocalFile(events: SeasonalPayload[], eventType: string) {
@@ -752,10 +757,11 @@ export class BaseProcessPublishAssortment {
 
     if (sendMode === 'vibeiqfile') {
       const flexPLMConnect = new FlexPLMConnect(this.config);
-      const [result] = await Promise.all([
+      const [sendResult] = await Promise.allSettled([
         flexPLMConnect.sendToFlexPLM(outboundPublishEvent),
         this.sendPublishPayloadEvent(outboundPublishEvent)
       ]);
+      const result = sendResult.status === 'fulfilled' ? sendResult.value : { error: sendResult.reason?.message };
       return { ...result, outboundPublishEvent };
     } else {
       await this.sendPublishPayloadEvent(outboundPublishEvent);
@@ -766,10 +772,10 @@ export class BaseProcessPublishAssortment {
     }
   }
 
-    public async sendPublishPayloadEvent(outboundEvent: any){
+    private async sendPublishPayloadEvent(outboundPublishEvent: any){
     console.info('sendPublishPayloadEvent()');
     let initialEvent = {};
-    if(this.config?.event){
+    if (this.config?.event){
       initialEvent = (typeof this.config?.event === 'string')
         ? JSON.parse(this.config?.event)
         : this.config?.event;
@@ -777,7 +783,7 @@ export class BaseProcessPublishAssortment {
     const eventBody = {
       originSystemType: 'VibeIQ',
       objectClass: 'AssortmentPublishedToFlexPLM',
-      outboundEvent,
+      outboundPublishEvent,
       initialEvent
     };