@contrail/flexplm 1.7.4-alpha.aaaa660 → 1.7.4-alpha.b088cfc

package/lib/interfaces/item-family-changes.d.ts

@@ -12,6 +12,7 @@ export declare class ItemFamilyChanges {
     colorDeletes: string[];
     colorUpdates: string[];
     colorUnchanged: string[];
+    colorSuppressed: string[];
     assortmentItemFullChangeMap: Map<string, any>;
     assortmentItemDeleteMap: Map<string, any>;
     itemToFederatedIdMapping: Map<string, string>;

package/lib/interfaces/item-family-changes.js

@@ -14,6 +14,7 @@ class ItemFamilyChanges {
         this.colorDeletes = [];
         this.colorUpdates = [];
         this.colorUnchanged = [];
+        this.colorSuppressed = []; // changed this window, but excluded by the lifecycle filter
         this.assortmentItemFullChangeMap = new Map();
         this.assortmentItemDeleteMap = new Map();
         this.itemToFederatedIdMapping = new Map();
@@ -32,6 +33,7 @@ class ItemFamilyChanges {
         s += ' colorDeletes: [' + this.colorDeletes + ']\n';
         s += ' colorUpdates: [' + this.colorUpdates + ']\n';
         s += ' colorUnchanged: [' + this.colorUnchanged + ']\n';
+        s += ' colorSuppressed: [' + this.colorSuppressed + ']\n';
         s += 'assortmentItemFullChangeMap:\n';
         s += 'size: ' + this.assortmentItemFullChangeMap.size + '\n[';
         for (const key of this.assortmentItemFullChangeMap.keys()) {

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

@@ -15,7 +15,7 @@ class BaseProcessPublishAssortment {
     constructor(_config, _dc, _mapFileUtil) {
         this.TTL = 30 * 24 * 60 * 60 * 1000; // 30 days
         this.cache = {
-            carriedFromSeason: {}
+            carriedFromSeason: {},
         };
         this.config = _config;
         this.dc = _dc;
@@ -46,13 +46,13 @@ class BaseProcessPublishAssortment {
                 console.log(message);
                 const output = {
                     results: { message, event },
-                    skip_await: true
+                    skip_await: true,
                 };
                 return output;
             }
             apcHistory = await this.getApcHistory(assortmentId);
             const sinceDate = await this.getSinceDate(assortmentId, assortmentPublishChangeId, apcHistory);
-            //Get detail information
+            // Get detail information
             const assortmentPublishChange = await this.downloadAssortmentPublishChange(assortmentId, assortmentPublishChangeId);
             publisher = this.getPublisher(assortmentPublishChange);
             const changeDetail = await this.downloadHydratedChangeDetail(assortmentPublishChange);
@@ -91,7 +91,7 @@ class BaseProcessPublishAssortment {
             versionComments: apc?.versionComments,
             publishDate: apc?.createdOn,
             publisher,
-            versionHistoryNumber
+            versionHistoryNumber,
         };
         return publishInfo;
     }
@@ -111,15 +111,15 @@ class BaseProcessPublishAssortment {
             return 'unknown';
         }
         const createdOnDate = new Date(createdOnString);
-        createdOnDate.setMonth(createdOnDate.getMonth() - 1); //subtract 1 month
+        createdOnDate.setMonth(createdOnDate.getMonth() - 1); // subtract 1 month
         const createdOnStringMinus1 = createdOnDate.toISOString();
         const createdOn = 'ISGREATERTHAN ' + createdOnStringMinus1;
         const snapshots = await new sdk_1.Entities().get({
             entityName: 'entity-snapshot',
             criteria: {
                 entityReference,
-                createdOn
-            }
+                createdOn,
+            },
         });
         const assortmentPublishChangeId = apc?.id;
         const snapshot = snapshots.find(snap => snap?.assortmentChangeId === assortmentPublishChangeId);
@@ -169,7 +169,7 @@ class BaseProcessPublishAssortment {
         }
         this.assortment = await new sdk_1.Entities().get({
             entityName: 'assortment',
-            id: assortmentId
+            id: assortmentId,
         });
         return this.assortment;
     }
@@ -214,9 +214,9 @@ class BaseProcessPublishAssortment {
         return sdk_1.Request.request(resource, {
             method: 'GET',
             headers: {
-                Accept: 'application/json',
-                'Content-Type': 'application/json'
-            }
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+            },
         });
     }
     updatedSinceDate(entity, sinceDate) {
@@ -287,7 +287,7 @@ class BaseProcessPublishAssortment {
                 }
             }
         }
-        dateArray.sort((a, b) => { return Date.parse(a) - Date.parse(b); });
+        dateArray.sort((a, b) => Date.parse(a) - Date.parse(b));
         const arrIndex = (dateArray.length - pastPublishCount > 0) ? dateArray.length - pastPublishCount : 0;
         sinceDate = dateArray[arrIndex];
         return sinceDate;
@@ -308,9 +308,9 @@ class BaseProcessPublishAssortment {
         return await sdk_1.Request.request(resourceString, {
             method: 'GET',
             Headers: {
-                Accept: 'application/json',
-                'Content-Type': 'application/json'
-            }
+                'Accept': 'application/json',
+                'Content-Type': 'application/json',
+            },
         });
     }
     async downloadHydratedChangeDetail(assortmentPublishChange) {
@@ -358,7 +358,7 @@ class BaseProcessPublishAssortment {
             console.info('sinceDateMilliseconds: ' + sinceDateMilliseconds);
             console.info('apcDateMilliseconds: ' + previousApcDate);
         }
-        //if only 1 apc, no processing needed
+        // if only 1 apc, no processing needed
         if (sinceDateMilliseconds !== previousApcDate) {
             console.info('sinceDateMilliseconds !== apcDateMilliseconds');
             const currentAssortmentItemIds = this.getBaselineItemIds(assortmentBaseline);
@@ -391,6 +391,31 @@ class BaseProcessPublishAssortment {
             console.info('getDeleteChanges()-currentAssortmentItemIds: ' + currentAssortmentItemIds);
             console.info('getDeleteChanges()-deleteIds: ' + deleteIds);
         }
+        // ---- ET-243: a family row removed while the family still has option rows is reported
+        // in neither the delete data nor the publish-change detail. Derive it by diffing the
+        // baseline as of sinceDate against the current baseline. ----
+        const priorApc = apcHistory.find(apc => apc?.id !== assortmentPublishChange?.id
+            && Date.parse(apc?.createdOn) === sinceDateMilliseconds)
+            || apcHistory[previousApcIndex];
+        const priorBaseline = priorApc?.assortmentBaselineDownloadLink
+            ? await this.downloadAssortmentBaseline(priorApc)
+            : await this.downloadAssortmentBaseline(await this.downloadAssortmentPublishChange(priorApc?.assortmentId, priorApc?.id));
+        const currentItemIds = this.getBaselineItemIds(assortmentBaseline);
+        const collectedIds = apcDeletes.map(dItem => dItem?.itemId);
+        for (const aItem of priorBaseline?.assortmentItems || []) {
+            const itemId = aItem?.itemId;
+            const item = aItem?.item;
+            if (!itemId || !item)
+                continue;
+            if (itemId !== item?.itemFamilyId)
+                continue; // family rows only
+            if (currentItemIds.includes(itemId))
+                continue; // still in the assortment
+            if (collectedIds.includes(itemId))
+                continue; // already reported as a delete
+            console.info('getDeleteChanges(): adding removed family row: ' + itemId);
+            apcDeletes.push(aItem);
+        }
         return apcDeletes;
     }
     getBaselineItemIds(assortmentBaseline) {
@@ -444,7 +469,7 @@ 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
+        // 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;
@@ -495,13 +520,18 @@ class BaseProcessPublishAssortment {
             const itemFamilyId = item?.itemFamilyId;
             if (meetsCriteria) {
                 releasedForDevelopmentItemIds.push(itemId);
-                if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item?.itemFamily;
-                    const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
-                    if (familyItemMeetsCriteria) {
+            }
+            // ---- NEW (Step 5): family resolution moved OUT of the meetsCriteria block.
+            // A family whose options are ALL pre-development has no other route into this
+            // list when it has no assortment-item row of its own. ----
+            if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
+                const familyItem = item?.itemFamily;
+                if (familyItem) {
+                    if (this.meetsCriteria({ item: familyItem })
+                        && !releasedForDevelopmentItemIds.includes(itemFamilyId)) {
                         releasedForDevelopmentItemIds.push(itemFamilyId);
                     }
-                    itemFamilySet.add(itemFamilyId);
+                    itemFamilySet.add(itemFamilyId); // only mark resolved when we had data to judge
                 }
             }
         }
@@ -539,7 +569,7 @@ class BaseProcessPublishAssortment {
         console.info('processPublish-start');
         const event = {
             assortmentId: pcd.assortmentId,
-            assortmentPublishChangeId: pcd.assortmentPublishChangeId
+            assortmentPublishChangeId: pcd.assortmentPublishChangeId,
         };
         const assortmentItemFullChangeMap = this.getFullChangeAssortmentMap(fullChange);
         const assortmentItemDeleteMap = this.getDeleteChangesAssortmentMap(deleteChanges);
@@ -554,7 +584,7 @@ class BaseProcessPublishAssortment {
             console.log(message);
             return {
                 results: { message, event },
-                skip_await: true
+                skip_await: true,
             };
         }
         const results = await this.sendEvents(events);
@@ -599,7 +629,7 @@ class BaseProcessPublishAssortment {
             taskId: this.config.taskId,
             eventType,
             objectClass: 'LCSSeason',
-            events
+            events,
         };
         const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
         const result = await this.sendAndRecordPublishEvent(flexPLMConnect, outboundPublishEvent);
@@ -645,13 +675,13 @@ class BaseProcessPublishAssortment {
                 taskId: this.config.taskId,
                 eventType,
                 objectClass: 'LCSSeason',
-                events
+                events,
             };
             await fileHandle.writeFile(JSON.stringify(outboundPublishEvent));
             results = {
                 message: 'Successfully Saved File',
                 outboundPublishEvent,
-                fileLocation: dirName + fileName
+                fileLocation: dirName + fileName,
             };
         }
         catch (e) {
@@ -672,7 +702,7 @@ class BaseProcessPublishAssortment {
             objectClass: 'LCSSeason',
             eventsFileId: uploadFile.id,
             eventsDownloadLink: uploadFile.downloadUrl,
-            eventsAdminDownloadLink: uploadFile.adminDownloadUrl
+            eventsAdminDownloadLink: uploadFile.adminDownloadUrl,
         };
         if (sendMode === 'vibeiqfile') {
             const flexPLMConnect = new flexplm_connect_1.FlexPLMConnect(this.config);
@@ -686,7 +716,7 @@ class BaseProcessPublishAssortment {
             await this.sendPublishPayloadEvent(outboundPublishEvent);
             return {
                 message: 'Successfully Uploaded File.',
-                outboundPublishEvent
+                outboundPublishEvent,
             };
         }
     }
@@ -702,11 +732,11 @@ class BaseProcessPublishAssortment {
             originSystemType: 'VibeIQ',
             objectClass: 'AssortmentPublishedToFlexPLM',
             outboundPublishEvent,
-            initialEvent
+            initialEvent,
         };
         await new sdk_1.Entities().create({
             entityName: 'external-event',
-            object: eventBody
+            object: eventBody,
         });
     }
     getCurrentDateString() {
@@ -730,7 +760,7 @@ class BaseProcessPublishAssortment {
         for (const [itemId, aItem] of assortmentItemFullChangeMap) {
             const projectItem = aItem?.projectItem;
             const itemFamilyId = aItem?.item?.itemFamilyId;
-            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
+            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId)) {
                 continue;
             }
             const ifc = itemFamilyChanges.get(itemFamilyId) || new item_family_changes_1.ItemFamilyChanges(itemFamilyId, pcd.sinceDate);
@@ -742,6 +772,20 @@ class BaseProcessPublishAssortment {
             if (pcd.itemToFederatedIdMapping.has(itemId)) {
                 ifc.itemToFederatedIdMapping.set(itemId, pcd.itemToFederatedIdMapping.get(itemId));
             }
+            // ---- NEW Step to enable ItemFamily publish ET-243: option is pre-development. It must not produce an
+            // LCSSKUSeasonLink, but a change to it still makes the family publishable. ----
+            if (!pcd.releasedForDevelopmentItemIds.includes(itemId)) {
+                const changedInWindow = addIds.includes(itemId)
+                    || deleteIds.includes(itemId)
+                    || updateIds.includes(itemId)
+                    || this.updatedSinceDate(projectItem, pcd.sinceDate)
+                    || this.updatedSinceDate(aItem?.item, pcd.sinceDate);
+                if (changedInWindow) {
+                    ifc.colorSuppressed.push(itemId);
+                }
+                continue;
+            }
+            // NEW Step - ends
             if (itemId === itemFamilyId) {
                 if (addIds.includes(itemId))
                     ifc.familyAdd = true;
@@ -757,6 +801,12 @@ class BaseProcessPublishAssortment {
                         ifc.familyUpdate = true;
                     }
                 }
+                // NEW Step to enable ItemFamily publish ET-243: item-level edits (incl. lifecycleStage) must publish
+                // the family. Guarded so the "first option added" flow stays suppressed. ----
+                if (!ifc.familyItemRemoved && this.updatedSinceDate(aItem?.item, pcd.sinceDate)) {
+                    ifc.familyUpdate = true;
+                }
+                // NEW Step - ends
                 if (projectItem && !projectItem?.roles && aItem?.item?.roles) {
                     projectItem.roles = aItem?.item?.roles;
                 }
@@ -813,7 +863,7 @@ class BaseProcessPublishAssortment {
             else {
                 ifc.colorDeletes.push(itemId);
             }
-        } //End deletes for loop
+        } // End deletes for loop
         if (app_framework_1.Logger.isDebugOn()) {
             console.debug('returning size: ' + itemFamilyChanges.size);
             for (const [key, value] of itemFamilyChanges) {
@@ -855,13 +905,13 @@ class BaseProcessPublishAssortment {
         const LCSSeason = Object.assign({}, seasonFed);
         const assortment = await this.getAssortment(assortmentId);
         const projectItem = this.getProjectItem(itemFamilyChanges, itemFamilyChanges.itemFamilyId);
+        // ---- NEW Step to enable ItemFamily publish ET-243: added color suppressed length
         const familyAssortmentItem = itemFamilyChanges.familyAdd || itemFamilyChanges.familyUpdate || itemFamilyChanges.familyDelete
             || itemFamilyChanges.colorAdds.length > 0 || itemFamilyChanges.colorUpdates.length > 0 || itemFamilyChanges.colorDeletes.length > 0
+            || itemFamilyChanges.colorSuppressed.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
+            // Product-season add
             const entityReference = itemFamilyChanges.itemFamilyId;
             const prodEntityData = (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference))
                 ? itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference)?.item
@@ -877,7 +927,7 @@ class BaseProcessPublishAssortment {
                 entityReference: 'item:' + entityReference,
                 LCSSeason,
                 LCSProduct,
-                data: seasonalData
+                data: seasonalData,
             };
             if ('ASSORTMENT' === projectItem.addedFromSource && projectItem.addedFromAssortment) {
                 const carriedFromSeason = await this.getCarriedFromSeason(projectItem);
@@ -887,9 +937,9 @@ class BaseProcessPublishAssortment {
             }
             events.push(psUpsert);
         }
-        //colorway-season adds
-        //colorAdds
-        //colorUpdates
+        // colorway-season adds
+        // colorAdds
+        // colorUpdates
         const colorwayChanges = [];
         colorwayChanges.push(...itemFamilyChanges.colorAdds);
         colorwayChanges.push(...itemFamilyChanges.colorUpdates);
@@ -912,7 +962,7 @@ class BaseProcessPublishAssortment {
                 entityReference: 'item:' + entityReference,
                 LCSSeason,
                 LCSSKU,
-                data: seasonalData
+                data: seasonalData,
             };
             if ('ASSORTMENT' === projectItem.addedFromSource && projectItem.addedFromAssortment) {
                 const carriedFromSeason = await this.getCarriedFromSeason(projectItem);
@@ -928,10 +978,10 @@ class BaseProcessPublishAssortment {
         let projectItem = {};
         if (itemFamilyChanges?.assortmentItemFullChangeMap.has(id)) {
             const aItem = itemFamilyChanges?.assortmentItemFullChangeMap.get(id);
-            projectItem = aItem?.projectItem;
+            projectItem = aItem?.projectItem ?? {};
         }
         /////////////////////////////////////////////////////////////////////////////
-        //Get from option assortmentItem because family not in assortmentItemFullChangeMap:start
+        // 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()) {
@@ -942,7 +992,7 @@ class BaseProcessPublishAssortment {
             }
         }
         /////////////////////////////////////////////////////////////////////////////
-        //Get from option assortmentItem because family not in assortmentItemFullChangeMap:end
+        // Get from option assortmentItem because family not in assortmentItemFullChangeMap:end
         /////////////////////////////////////////////////////////////////////////////
         return projectItem;
     }
@@ -992,7 +1042,7 @@ class BaseProcessPublishAssortment {
         if (this.cache.carriedFromSeason[addedFromAssortment]) {
             return this.cache.carriedFromSeason[addedFromAssortment];
         }
-        let seasonFederation = undefined;
+        let seasonFederation;
         const assortmentEntity = await this.getAssormentEntityFromId(addedFromAssortment);
         if (assortmentEntity) {
             seasonFederation = await this.getSeasonFederationFromAssortment(assortmentEntity);
@@ -1005,7 +1055,7 @@ class BaseProcessPublishAssortment {
         try {
             assortment = await new sdk_1.Entities().get({
                 entityName: 'assortment',
-                id: assortmentId
+                id: assortmentId,
             });
         }
         catch (e) {
@@ -1019,7 +1069,7 @@ class BaseProcessPublishAssortment {
         let seasonObj = {
             entityReference: 'assortment:' + assortment.id,
             objectClass: 'LCSSeason',
-            flexPLMTypePath
+            flexPLMTypePath,
         };
         try {
             const assortmentObj = await this.dc.getFlexPLMObjectData(assortment, [], true);