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

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

@@ -214,7 +214,7 @@ class BaseProcessPublishAssortment {
         return sdk_1.Request.request(resource, {
             method: 'GET',
             headers: {
-                "Accept": 'application/json',
+                'Accept': 'application/json',
                 'Content-Type': 'application/json',
             },
         });
@@ -308,7 +308,7 @@ class BaseProcessPublishAssortment {
         return await sdk_1.Request.request(resourceString, {
             method: 'GET',
             Headers: {
-                "Accept": 'application/json',
+                'Accept': 'application/json',
                 'Content-Type': 'application/json',
             },
         });
@@ -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) {
@@ -839,40 +864,6 @@ class BaseProcessPublishAssortment {
                 ifc.colorDeletes.push(itemId);
             }
         } // End deletes for loop
-        // ---- ET-243: the family's own row left the assortment while the family still has
-        // option rows. The platform reports this in changeDetail.familyItemsRemoved, and the
-        // row is in neither the baseline nor the delete-data file, so neither loop above can
-        // see it. `deletes` is folded in as a fallback in case a removal is ever classified
-        // there while still missing from the delete-data file. ----
-        for (const removedRow of [...familyItemsRemoved, ...deletes]) {
-            const itemId = removedRow?.itemId ?? removedRow?.id;
-            const item = removedRow?.item;
-            if (!itemId || !item)
-                continue;
-            const itemFamilyId = item?.itemFamilyId ?? itemId;
-            if (itemId !== itemFamilyId)
-                continue; // family rows only
-            if (assortmentItemFullChangeMap.has(itemId))
-                continue; // still in baseline -> loop 1
-            if (assortmentItemDeleteMap.has(itemId))
-                continue; // hard delete    -> loop 2
-            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId))
-                continue;
-            if (!this.meetsCriteria(removedRow))
-                continue;
-            let ifc = itemFamilyChanges.get(itemFamilyId);
-            if (!ifc) {
-                ifc = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, pcd.sinceDate);
-                itemFamilyChanges.set(itemFamilyId, ifc);
-            }
-            if (!ifc.itemFamilyObject) {
-                ifc.itemFamilyObject = item;
-            }
-            if (removedRow?.projectItem) {
-                ifc.assortmentItemFullChangeMap.set(itemId, removedRow);
-            }
-            ifc.familyItemRemoved = true;
-        }
         if (app_framework_1.Logger.isDebugOn()) {
             console.debug('returning size: ' + itemFamilyChanges.size);
             for (const [key, value] of itemFamilyChanges) {
@@ -914,15 +905,11 @@ 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 to existing condition and familyItemRemovedFlag
+        // ---- NEW Step to enable ItemFamily publish ET-243: added color suppressed length
         const familyAssortmentItem = itemFamilyChanges.familyAdd || itemFamilyChanges.familyUpdate || itemFamilyChanges.familyDelete
-            || itemFamilyChanges.familyItemRemoved
             || itemFamilyChanges.colorAdds.length > 0 || itemFamilyChanges.colorUpdates.length > 0 || itemFamilyChanges.colorDeletes.length > 0
             || itemFamilyChanges.colorSuppressed.length > 0
             || (projectItem && this.updatedSinceDate(projectItem, itemFamilyChanges.sinceDate));
-        // familyItemRemoved: the family's own assortment row left the assortment while the
-        // family still has option rows. The family stays in the season, so this publishes an
-        // LCSProductSeasonLink update and no LCSSKUSeasonLink.
         if (familyAssortmentItem) {
             // Product-season add
             const entityReference = itemFamilyChanges.itemFamilyId;

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

@@ -921,6 +921,39 @@ describe('getDeleteChanges', () => {
         expect(itemIds).toContain('qNCQmTFcFxwbT-oG');
         spy.mockRestore();
     });
+    const stubDownloads = (ppa, history, priorBaseline) => {
+        jest.spyOn(ppa, 'downloadDeleteChanges').mockImplementation(async (apc) => {
+            if (!apc)
+                return [];
+            return history.find(h => h['id'] === apc['id'])?.['deleteData'] || [];
+        });
+        jest.spyOn(ppa, 'downloadAssortmentBaseline').mockResolvedValue(priorBaseline);
+    };
+    const famRow = (id, lifecycleStage = 'development') => ({
+        itemId: id,
+        item: { id, itemFamilyId: id, lifecycleStage, roles: ['family'] },
+        projectItem: { id: 'pi-' + id }
+    });
+    const optRow = (id, familyId) => ({
+        itemId: id,
+        item: { id, itemFamilyId: familyId, lifecycleStage: 'development', roles: ['color', 'option'] }
+    });
+    it('adds a family row that left the assortment while its option rows remain', async () => {
+        const history = new Array(...mockData_1.apc_2bOWR2j9R0QThDVu_delete_history);
+        const apcIndex = history.length - 1;
+        const apc = history[apcIndex];
+        const apcDate = new Date(history[apcIndex - 1]['createdOn']);
+        const ppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
+        const fam = famRow('FAM1');
+        const opt = optRow('OPT1', 'FAM1');
+        stubDownloads(ppa, history, { assortmentItems: [fam, opt] });
+        const deleteChanges = await ppa.getDeleteChanges(apc, history, { assortmentItems: [opt] }, apcDate);
+        const itemIds = deleteChanges.map(d => d['itemId']);
+        expect(itemIds).toContain('FAM1');
+        expect(itemIds).not.toContain('OPT1');
+        expect(deleteChanges.find(d => d['itemId'] === 'FAM1')['projectItem']['id']).toEqual('pi-FAM1');
+        jest.restoreAllMocks();
+    });
 });
 describe('buildDeleteChanges', () => {
     const config = {};
@@ -1480,31 +1513,18 @@ describe('getItemFamilyChanges - lifecycle-suppressed options', () => {
         const ifc = pcd.itemFamilyChanges.get(familyId);
         expect(ifc.familyItemRemoved).toBe(true);
         expect(ifc.familyUpdate).toBe(false); // fails if the !familyItemRemoved guard is dropped
-        expect(ifc.assortmentItemFullChangeMap.size).toEqual(1); // third pass must not re-insert the row
     });
-    it('flags the family when its row is removed but option rows remain', () => {
+    it('flags familyDelete when the family row left the assortment but option rows remain', () => {
         const ppa = buildPpa();
         const assortmentItems = [optionRow(maroonId, beforeSince), optionRow(limeId, beforeSince, 'released')];
         const fullChangeMap = ppa.getFullChangeAssortmentMap({ assortmentItems });
-        const details = { ...noDetailChanges(), familyItemsRemoved: [{ itemId: familyId, item: familyItem() }] };
-        const pcd = buildPcd([familyId, limeId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, details, fullChangeMap, new Map());
-        const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.familyItemRemoved).toBe(true); // false before the third pass
-        expect(ifc.itemFamilyObject.id).toEqual(familyId);
-        expect(ifc.colorDeletes.length).toEqual(0); // no SKU event should follow
-        expect(ifc.assortmentItemFullChangeMap.has(familyId)).toBe(false); // removed row carries no projectItem
-    });
-    it('leaves a hard-deleted family row to the delete pass', () => {
-        const ppa = buildPpa();
-        const fullChangeMap = ppa.getFullChangeAssortmentMap({ assortmentItems: [] });
         const deleteMap = new Map([[familyId, familyRow()]]);
-        const details = { ...noDetailChanges(), familyItemsRemoved: [{ itemId: familyId, item: familyItem() }] };
-        const pcd = buildPcd([familyId]);
-        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, details, fullChangeMap, deleteMap);
+        const pcd = buildPcd([familyId, limeId]);
+        pcd.itemFamilyChanges = ppa.getItemFamilyChanges(pcd, noDetailChanges(), fullChangeMap, deleteMap);
         const ifc = pcd.itemFamilyChanges.get(familyId);
-        expect(ifc.familyDelete).toBe(true); // set by the delete pass
-        expect(ifc.familyItemRemoved).toBe(false); // third pass skipped it - no double handling
+        expect(ifc.familyDelete).toBe(true);
+        expect(ifc.colorDeletes.length).toEqual(0); // no SKU event
+        expect(ppa.getProjectItem(ifc, familyId).id).toEqual('pi-' + familyId); // family's own projectItem
     });
 });
 describe('getProjectItem', () => {
@@ -1943,7 +1963,6 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
         const bppa = new base_process_publish_assortment_1.BaseProcessPublishAssortment(config, dc, mapFileUtil);
         const itemFamilyId = 'AERfdvdAt1HHEVvQ';
         const prodEntityData = { id: itemFamilyId, identifier: 'FAM-11', itemNumber: 'FAM-11' };
-        //const projectItem = { id: 'proj-fam', updatedOn: '2023-01-15T00:00:00.000Z' };
         const projectItem = { id: 'proj-fam', updatedOn: '2022-12-01T00:00:00.000Z' };
         const assortment = { id: 'assort123', name: 'Fall 2023 Assortment', publishToFlexPLM: true };
         const seasonFed = {
@@ -1952,7 +1971,7 @@ describe('getEventsForItemFamilyChanges - conditional eventType', () => {
             flexPLMSeasonName: 'Fall 2023'
         };
         const itemFamilyChanges = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, new Date('2023-01-01T00:00:00.000Z'));
-        itemFamilyChanges.familyItemRemoved = true; // the only trigger
+        itemFamilyChanges.familyDelete = true; // the only trigger
         itemFamilyChanges.colorUnchanged.push('rsmWhWiXRNv_XBJG'); // surviving option must not emit
         itemFamilyChanges.itemFamilyObject = prodEntityData;
         jest.spyOn(bppa, 'getAssortment').mockResolvedValue(assortment);

package/package.json

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