@contrail/flexplm 1.1.11 → 1.1.13

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

@@ -8,6 +8,7 @@ const publish_change_data_1 = require("../interfaces/publish-change-data");
 const map_utils_1 = require("../util/map-utils");
 const fsPromise = require("fs/promises");
 const path = require("path");
+const app_framework_1 = require("@contrail/app-framework");
 const type_conversion_utils_1 = require("../util/type-conversion-utils");
 class BaseProcessPublishAssortment {
     constructor(_config, _dc, _mapFileUtil) {
@@ -38,16 +39,19 @@ class BaseProcessPublishAssortment {
                 return output;
             }
             const assortmentPublishChangeId = event.assortmentPublishChangeId;
-            const sinceDate = await this.getSinceDate(assortmentId, assortmentPublishChangeId);
+            const apcHistory = await this.getApcHistory(assortmentId);
+            const sinceDate = await this.getSinceDate(assortmentId, assortmentPublishChangeId, apcHistory);
             const assortmentPublishChange = await this.downloadAssortmentPublishChange(assortmentId, assortmentPublishChangeId);
             const changeDetail = await this.downloadHydratedChangeDetail(assortmentPublishChange);
-            const fullChange = await this.downloadFullChange(assortmentPublishChange);
-            const releasedForDevelopmentItemIds = this.getReleasedForDevelopmentItemAndFamilyIds(fullChange);
+            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 pcd = new publish_change_data_1.PublishChangeData(assortmentId, seasonFed, assortmentPublishChangeId, sinceDate);
+            const publisher = this.getPublisher(assortmentPublishChange);
+            const pcd = new publish_change_data_1.PublishChangeData(assortmentId, seasonFed, assortmentPublishChangeId, sinceDate, publisher);
             pcd.itemToFederatedIdMapping = itemToFederatedIdMapping;
             pcd.releasedForDevelopmentItemIds = releasedForDevelopmentItemIds;
-            const output = await this.processPublish(pcd, changeDetail, fullChange);
+            const output = await this.processPublish(pcd, changeDetail, assortmentBaseline, deleteChanges);
             console.info('process-end');
             return output;
         }
@@ -63,6 +67,7 @@ class BaseProcessPublishAssortment {
                 entityName: 'assortment',
                 id: assortmentId
             });
+            console.info('assortment-name: ' + assortment['name']);
         }
         catch (e) {
             console.warn(`No Assortment found for id: ${assortmentId}`);
@@ -90,35 +95,41 @@ class BaseProcessPublishAssortment {
         seasonObj = await map_utils_1.MapUtil.applyTransformMap(this.transformMapFile, this.mapFileUtil, seasonObj, 'LCSSeason', 'vibe2flex');
         return seasonObj;
     }
-    async getSinceDate(assortmentId, assortmentPublishChangeId) {
-        const sinceDateString = String(this.config['sinceDate'] || '');
-        if (sinceDateString.includes('-')) {
-            const [year, month, day] = sinceDateString.split('-').map(Number);
-            const d = new Date(year, month - 1, day, 0, 0);
-            const minutes = -d.getTimezoneOffset();
-            d.setUTCMinutes(minutes);
-            return d;
-        }
-        if (sinceDateString.includes(':')) {
-            const [type, countStr] = sinceDateString.split(':');
-            const count = parseInt(countStr);
-            if (type.trim().toLowerCase() === 'numberofdays') {
-                const currentDate = new Date();
-                const d = new Date(currentDate.getUTCFullYear(), currentDate.getUTCMonth(), currentDate.getUTCDate() - count, 0, 0);
-                d.setUTCMinutes(-d.getTimezoneOffset());
-                return d;
-            }
-            if (type.trim().toLowerCase() === 'numberofpublishes') {
-                const apcHistory = await this.getApcHistory(assortmentId);
-                return this.getSinceDateFromAPCs(apcHistory, assortmentPublishChangeId, count);
-            }
-        }
-        const apcHistory = await this.getApcHistory(assortmentId);
-        const derivedSinceDate = this.getSinceDateFromAPCs(apcHistory, assortmentPublishChangeId);
-        if (!derivedSinceDate)
-            throw new Error('Couldn\'t set sinceDate');
-        console.info('getSinceDate:', derivedSinceDate);
-        return derivedSinceDate;
+    async getSinceDate(assortmentId, assortmentPublishChangeId, apcHistory) {
+        let sinceDate = null;
+        let pastPublishCount = 1;
+        if (this.config['sinceDate']) {
+            const sinceDateString = '' + this.config['sinceDate'];
+            if (sinceDateString && sinceDateString.indexOf('-') > 0) {
+                const sinceDateParts = sinceDateString.split('-');
+                if (sinceDateParts.length == 3) {
+                    const year = parseInt(sinceDateParts[0]);
+                    const month = parseInt(sinceDateParts[1]) - 1;
+                    const day = parseInt(sinceDateParts[2]);
+                    const minutes = 0 - new Date().getTimezoneOffset();
+                    sinceDate = this.getSinceDateFromAPCSpecificDate(apcHistory, assortmentPublishChangeId, new Date(year, month, day, 0, minutes, 0));
+                }
+            }
+            else if (sinceDateString && sinceDateString.indexOf(':') > 0) {
+                const sinceDateParts = sinceDateString.split(':');
+                const type = sinceDateParts[0];
+                const count = parseInt(sinceDateParts[1]);
+                if ('numberofdays' == type.toLocaleLowerCase()) {
+                    sinceDate = this.getSinceDateDaysPrevious(apcHistory, assortmentPublishChangeId, count);
+                }
+                else if ('numberofpublishes' == type.toLocaleLowerCase()) {
+                    pastPublishCount = count;
+                }
+            }
+        }
+        if (sinceDate == null) {
+            sinceDate = this.getSinceDateFromAPCs(apcHistory, assortmentPublishChangeId, pastPublishCount);
+        }
+        if (sinceDate == null) {
+            throw new Error('Couldnt set sinceDate');
+        }
+        console.info('getSinceDate: ' + sinceDate);
+        return sinceDate;
     }
     async getApcHistory(assortmentId) {
         const resource = `/assortments/${assortmentId}/history/`;
@@ -134,6 +145,54 @@ class BaseProcessPublishAssortment {
         const updatedOn = entity?.updatedOn;
         return (updatedOn && new Date(updatedOn) > sinceDate);
     }
+    getSinceDateFromAPCSpecificDate(apcHistory, assortmentPublishChangeId, specificDate) {
+        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 = specificDate;
+        const sinceDateMilliseconds = sinceDate.getTime();
+        for (const d of dateArray) {
+            const milli = Date.parse(d);
+            if (milli >= sinceDateMilliseconds) {
+                sinceDate = d;
+                break;
+            }
+        }
+        return sinceDate;
+    }
+    getSinceDateDaysPrevious(apcHistory, assortmentPublishChangeId, daysBack) {
+        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(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;
+    }
     getSinceDateFromAPCs(apcHistory, assortmentPublishChangeId, pastPublishCount = 1) {
         if (apcHistory.length === 1) {
             return new Date(0);
@@ -143,13 +202,32 @@ class BaseProcessPublishAssortment {
             return new Date(0);
         }
         const apc = apcHistory[apcIndex];
-        const apcDate = new Date(apc.createdOn);
-        const sortedPreviousDates = apcHistory
-            .filter(tempapc => tempapc.id !== assortmentPublishChangeId && new Date(tempapc.createdOn) < apcDate)
-            .map(tempapc => new Date(tempapc.createdOn))
-            .sort((a, b) => a.getTime() - b.getTime());
-        const arrIndex = Math.max(sortedPreviousDates.length - pastPublishCount, 0);
-        return sortedPreviousDates[arrIndex] || new Date(0);
+        const apcDate = new Date(apc['createdOn']);
+        let sinceDate = new Date(0);
+        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); });
+        const arrIndex = (dateArray.length - pastPublishCount > 0) ? dateArray.length - pastPublishCount : 0;
+        sinceDate = dateArray[arrIndex];
+        return sinceDate;
+    }
+    getPublisher(assortmentPublishChange) {
+        const createdBy = assortmentPublishChange?.createdBy;
+        const publisher = {};
+        const includeKeys = ['email', 'firstName', 'isSsoUser', 'lastName'];
+        for (const [key, value] of Object.entries(createdBy)) {
+            if (includeKeys.includes(key)) {
+                publisher[key] = value;
+            }
+        }
+        return publisher;
     }
     async downloadAssortmentPublishChange(assortmentId, assortmentPublishChangeId) {
         const resourceString = '/assortments/' + assortmentId + '/history/' + assortmentPublishChangeId;
@@ -174,8 +252,8 @@ class BaseProcessPublishAssortment {
         }
         return undefined;
     }
-    async downloadFullChange(assortmentPublishChange) {
-        console.info('downloadFullChange-start');
+    async downloadAssortmentBaseline(assortmentPublishChange) {
+        console.info('downloadAssortmentBaseline-start');
         try {
             const link = assortmentPublishChange?.assortmentBaselineDownloadLink;
             const response = await fetch(link);
@@ -187,13 +265,114 @@ class BaseProcessPublishAssortment {
         }
         return undefined;
     }
-    getAllItemIds(changeDetail, fullChange) {
-        console.info('getAllItemIds-start');
-        const extractItemIds = (item) => [item.id, item.itemFamilyId];
-        const assortmentItemIds = (fullChange.assortmentItems || []).flatMap(item => extractItemIds(item.item));
-        const deleteItemIds = (changeDetail.deletes || []).flatMap(hDelete => extractItemIds(hDelete.item));
-        const uniqueItemIds = new Set([...assortmentItemIds, ...deleteItemIds]);
-        return Array.from(uniqueItemIds);
+    async getDeleteChanges(assortmentPublishChange, apcHistory, assortmentBaseline, sinceDate) {
+        console.info('getDeleteChanges(): ' + assortmentPublishChange['id']);
+        console.info(sinceDate);
+        const currentAPCIndex = apcHistory.findIndex(pc => pc['id'] === assortmentPublishChange['id']);
+        console.info(' currentAPCIndex: ' + currentAPCIndex);
+        if (currentAPCIndex == 0) {
+            return [];
+        }
+        const previousApcIndex = (currentAPCIndex > 0) ? currentAPCIndex - 1 : 0;
+        const apcCreatedOn = apcHistory[previousApcIndex]['createdOn'];
+        console.info('apcCreatedOn:  ' + apcCreatedOn);
+        const apcDeletes = await this.downloadDeleteChanges(assortmentPublishChange);
+        let previousApcDate = Date.parse(apcCreatedOn);
+        const sinceDateMilliseconds = sinceDate.getTime();
+        if (app_framework_1.Logger.isInfoOn()) {
+            console.info('apcCreatedOn: ' + apcCreatedOn);
+            console.info('sinceDate: ' + sinceDate);
+            console.info('sinceDateMilliseconds: ' + sinceDateMilliseconds);
+            console.info('apcDateMilliseconds: ' + previousApcDate);
+        }
+        if (sinceDateMilliseconds !== previousApcDate) {
+            console.info('sinceDateMilliseconds !== apcDateMilliseconds');
+            const currentAssortmentItemIds = this.getBaselineItemIds(assortmentBaseline);
+            const deleteIds = (apcDeletes.length === 0)
+                ? []
+                : apcDeletes.map(item => item['itemId']);
+            for (let i = currentAPCIndex - 1; i > 0; i--) {
+                const workingAPC = apcHistory[i];
+                previousApcDate = Date.parse(workingAPC['createdOn']);
+                if (sinceDateMilliseconds === previousApcDate) {
+                    break;
+                }
+                if (workingAPC['deletes'] > 0) {
+                    const previousApc = (i > 0)
+                        ? apcHistory[i - 1]
+                        : undefined;
+                    const deleteChanges = await this.buildDeleteChanges(workingAPC, previousApc);
+                    console.info('checking deleteChanges');
+                    for (const dItem of deleteChanges) {
+                        const dItemId = dItem['itemId'];
+                        console.info(dItemId);
+                        if (!currentAssortmentItemIds.includes(dItemId) && !deleteIds.includes(dItemId)) {
+                            console.info('adding');
+                            deleteIds.push(dItemId);
+                            apcDeletes.push(dItem);
+                        }
+                    }
+                }
+            }
+            console.info('getDeleteChanges()-currentAssortmentItemIds: ' + currentAssortmentItemIds);
+            console.info('getDeleteChanges()-deleteIds: ' + deleteIds);
+        }
+        return apcDeletes;
+    }
+    getBaselineItemIds(assortmentBaseline) {
+        const itemIds = [];
+        const assortmentItemsArray = assortmentBaseline['assortmentItems'];
+        for (const aItem of assortmentItemsArray) {
+            itemIds.push(aItem['itemId']);
+        }
+        return itemIds;
+    }
+    async downloadDeleteChanges(apc) {
+        console.info('deleteDataDownloadLink-start');
+        try {
+            const link = apc['deleteDataDownloadLink'];
+            const response = await fetch(link);
+            const data = await response.json();
+            return data;
+        }
+        catch (e) {
+            console.log('Error deleteDataDownloadLink: ' + e.message);
+        }
+        return undefined;
+    }
+    async buildDeleteChanges(apc, previousApc) {
+        console.info('buildDeleteChanges()');
+        if (apc['deleteDataDownloadLink']) {
+            const deleteChanges = await this.downloadDeleteChanges(apc);
+            if (deleteChanges) {
+                return deleteChanges;
+            }
+        }
+        console.info('pulling down full APC');
+        apc = await this.downloadAssortmentPublishChange(apc['assortmentId'], apc['id']);
+        if (apc['deleteDataDownloadLink']) {
+            const deleteChanges = await this.downloadDeleteChanges(apc);
+            if (deleteChanges) {
+                return deleteChanges;
+            }
+        }
+        if (!previousApc) {
+            throw new Error(BaseProcessPublishAssortment.NOT_ABLE_TO_PROCESS_DELETE_CHANGES);
+        }
+        let previousBaseline;
+        console.info('check previousApc');
+        if (previousApc['assortmentBaselineDownloadLink']) {
+            previousBaseline = await this.downloadAssortmentBaseline(previousApc);
+        }
+        else {
+            console.info('previousApc pulling down full APC');
+            previousApc = await this.downloadAssortmentPublishChange(previousApc['assortmentId'], previousApc['id']);
+            previousBaseline = await this.downloadAssortmentBaseline(previousApc);
+        }
+        const deleteIds = apc['detail']['deletes'].map(dItem => dItem['id']);
+        const deleteArray = previousBaseline['assortmentItems'].filter(aItem => deleteIds.includes(aItem['itemId']));
+        console.info('deleteArray.length: ' + deleteArray.length);
+        return deleteArray;
     }
     async getItemFederatedIds() {
         const itemFederatedIds = new Map();
@@ -208,37 +387,73 @@ class BaseProcessPublishAssortment {
         }
         return assortmentItemsMap;
     }
-    getReleasedForDevelopmentItemAndFamilyIds(fullChange) {
+    getDeleteChangesAssortmentMap(deleteChanges) {
+        const deleteItems = new Map();
+        for (const dItem of deleteChanges) {
+            deleteItems.set(dItem['itemId'], dItem);
+        }
+        return deleteItems;
+    }
+    getReleasedForDevelopmentItemAndFamilyIds(fullChange, deleteChanges) {
         console.info('getReleasedForDevelopmentItemAndFamilyIds');
         const releasedForDevelopmentItemIds = [];
         const itemFamilySet = new Set();
-        const assortmentItemsArray = fullChange?.assortmentItems || [];
+        const assortmentItemsArray = fullChange['assortmentItems'];
         for (const aItem of assortmentItemsArray) {
-            const item = aItem?.item;
-            const lifecycleStage = item?.lifecycleStage;
-            const itemId = item?.id;
-            const itemFamilyId = item?.itemFamilyId;
-            console.debug(`itemId: ${itemId}`);
-            if (lifecycleStage && !this.config?.itemPreDevelopmentLifecycleStages?.includes(lifecycleStage)) {
+            const meetsCriteria = this.meetsCriteria(aItem);
+            const item = aItem['item'];
+            const itemId = item['id'];
+            const itemFamilyId = item['itemFamilyId'];
+            console.debug('itemId: ' + item['id']);
+            if (meetsCriteria) {
                 console.debug('adding item to releasedForDevelopmentItemIds');
-                console.debug(`itemFamilyId: ${itemFamilyId}`);
+                console.debug('itemFamilyId: ' + item['itemFamilyId']);
                 releasedForDevelopmentItemIds.push(itemId);
                 if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
-                    const familyItem = item?.itemFamily;
-                    const familyLifecycleStage = familyItem?.lifecycleStage;
-                    if (familyLifecycleStage && !this.config?.itemPreDevelopmentLifecycleStages?.includes(familyLifecycleStage)) {
+                    const familyItem = item['itemFamily'];
+                    const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
+                    if (familyItemMeetsCriteria) {
                         releasedForDevelopmentItemIds.push(itemFamilyId);
                     }
                     itemFamilySet.add(itemFamilyId);
                 }
             }
         }
+        for (const dItem of deleteChanges) {
+            const meetsCriteria = this.meetsCriteria(dItem);
+            const item = dItem['item'];
+            const itemId = item['id'];
+            const itemFamilyId = item['itemFamilyId'];
+            console.debug('itemId: ' + item['id']);
+            if (meetsCriteria) {
+                releasedForDevelopmentItemIds.push(itemId);
+                if (!itemFamilySet.has(itemFamilyId) && itemId !== itemFamilyId) {
+                    const familyItem = item['itemFamily'];
+                    if (familyItem) {
+                        const familyItemMeetsCriteria = this.meetsCriteria({ item: familyItem });
+                        if (familyItemMeetsCriteria) {
+                            releasedForDevelopmentItemIds.push(itemFamilyId);
+                        }
+                        itemFamilySet.add(itemFamilyId);
+                    }
+                    else {
+                        itemFamilySet.add(itemFamilyId);
+                    }
+                }
+            }
+        }
         return releasedForDevelopmentItemIds;
     }
-    async processPublish(pcd, changeDetail, fullChange) {
+    meetsCriteria(aItem) {
+        const item = aItem['item'];
+        const lifecycleStage = item['lifecycleStage'];
+        return lifecycleStage && !this.config.itemPreDevelopmentLifecycleStages.includes(lifecycleStage);
+    }
+    async processPublish(pcd, changeDetail, fullChange, deleteChanges) {
         console.info('processPublish-start');
         const assortmentItemFullChangeMap = this.getFullChangeAssortmentMap(fullChange);
-        pcd.itemFamilyChanges = this.getItemFamilyChanges(pcd, changeDetail, assortmentItemFullChangeMap);
+        const assortmentItemDeleteMap = this.getDeleteChangesAssortmentMap(deleteChanges);
+        pcd.itemFamilyChanges = this.getItemFamilyChanges(pcd, changeDetail, assortmentItemFullChangeMap, assortmentItemDeleteMap);
         const events = await this.getEventsForPublishChangeData(pcd);
         if (events.length === 0) {
             const message = 'No Events to Send; returning';
@@ -339,7 +554,7 @@ class BaseProcessPublishAssortment {
             + '-' + d.getUTCSeconds()
             + '-' + d.getUTCMilliseconds();
     }
-    getItemFamilyChanges(publishChangeData, changeDetail, assortmentItemFullChangeMap) {
+    getItemFamilyChanges(pcd, changeDetail, assortmentItemFullChangeMap, assortmentItemDeleteMap) {
         console.info('getItemFamilyChanges-start');
         const itemFamilyChanges = new Map();
         const { adds, deletes, updates, familyItemsRemoved } = changeDetail;
@@ -349,17 +564,17 @@ class BaseProcessPublishAssortment {
         const familyItemsRemovedIds = familyItemsRemoved.map(item => item.itemId);
         for (const [itemId, aItem] of assortmentItemFullChangeMap) {
             const { item: { itemFamilyId }, projectItem } = aItem;
-            if (!publishChangeData.releasedForDevelopmentItemIds.includes(itemFamilyId) || !publishChangeData.releasedForDevelopmentItemIds.includes(itemId)) {
+            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
                 continue;
             }
-            const ifc = itemFamilyChanges.get(itemFamilyId) || new item_family_changes_1.ItemFamilyChanges(itemFamilyId, publishChangeData.sinceDate);
+            const ifc = itemFamilyChanges.get(itemFamilyId) || new item_family_changes_1.ItemFamilyChanges(itemFamilyId, pcd.sinceDate);
             if (!itemFamilyChanges.has(itemFamilyId)) {
                 ifc.itemFamilyObject = itemId === itemFamilyId ? aItem?.item : aItem?.item?.itemFamily;
                 itemFamilyChanges.set(itemFamilyId, ifc);
             }
             ifc.assortmentItemFullChangeMap.set(itemId, aItem);
-            if (publishChangeData.itemToFederatedIdMapping.has(itemId)) {
-                ifc.itemToFederatedIdMapping.set(itemId, publishChangeData.itemToFederatedIdMapping.get(itemId));
+            if (pcd.itemToFederatedIdMapping.has(itemId)) {
+                ifc.itemToFederatedIdMapping.set(itemId, pcd.itemToFederatedIdMapping.get(itemId));
             }
             if (itemId === itemFamilyId) {
                 if (addIds.includes(itemId))
@@ -372,7 +587,7 @@ class BaseProcessPublishAssortment {
                     ifc.familyItemRemoved = true;
                 if (projectItem) {
                     const updatedOnDate = new Date(projectItem.updatedOn);
-                    if (updatedOnDate > publishChangeData.sinceDate) {
+                    if (updatedOnDate > pcd.sinceDate) {
                         ifc.familyUpdate = true;
                     }
                 }
@@ -387,7 +602,7 @@ class BaseProcessPublishAssortment {
                     ifc.colorDeletes.push(itemId);
                 else if (updateIds.includes(itemId))
                     ifc.colorUpdates.push(itemId);
-                else if (projectItem && new Date(projectItem.updatedOn) > publishChangeData.sinceDate)
+                else if (projectItem && new Date(projectItem.updatedOn) > pcd.sinceDate)
                     ifc.colorUpdates.push(itemId);
                 else
                     ifc.colorUnchanged.push(itemId);
@@ -396,24 +611,48 @@ class BaseProcessPublishAssortment {
                 }
             }
         }
-        for (const delEntity of deletes) {
-            const itemId = delEntity.id;
-            if (!publishChangeData.itemToFederatedIdMapping.has(itemId) && !publishChangeData.releasedForDevelopmentItemIds.includes(itemId)) {
+        for (const [itemId, delEntity] of assortmentItemDeleteMap) {
+            const itemFamilyId = delEntity['item']['itemFamilyId'];
+            const item = delEntity['item'];
+            if (!pcd.releasedForDevelopmentItemIds.includes(itemFamilyId) || !pcd.releasedForDevelopmentItemIds.includes(itemId)) {
                 continue;
             }
-            const { item: { itemFamilyId } } = delEntity;
-            const ifc = itemFamilyChanges.get(itemFamilyId) || new item_family_changes_1.ItemFamilyChanges(itemFamilyId, publishChangeData.sinceDate);
-            if (!itemFamilyChanges.has(itemFamilyId)) {
-                ifc.familyDelete = true;
+            else {
+                if (!item) {
+                    console.error('Failed to find deleted item entity');
+                    console.error(' itemFamilyId: ' + itemFamilyId + ' -itemId: ' + itemId);
+                    continue;
+                }
+            }
+            let ifc = itemFamilyChanges.get(itemFamilyId);
+            if (!ifc) {
+                ifc = new item_family_changes_1.ItemFamilyChanges(itemFamilyId, pcd.sinceDate);
+                if (itemId === itemFamilyId) {
+                    ifc.familyDelete = true;
+                    ifc.itemFamilyObject = item;
+                }
+                else {
+                    ifc.itemFamilyObject = item?.itemFamily;
+                }
                 itemFamilyChanges.set(itemFamilyId, ifc);
             }
-            if (itemId !== itemFamilyId) {
+            if (pcd.itemToFederatedIdMapping.has(itemId)) {
+                ifc.itemToFederatedIdMapping.set(itemId, pcd.itemToFederatedIdMapping.get(itemId));
+            }
+            ifc.assortmentItemDeleteMap.set(itemId, delEntity);
+            ifc.assortmentItemFullChangeMap.set(itemId, delEntity);
+            if (itemId === itemFamilyId) {
+                ifc.familyDelete = true;
+            }
+            else {
                 ifc.colorDeletes.push(itemId);
             }
         }
-        console.debug(`returning size: ${itemFamilyChanges.size}`);
-        for (const [key, value] of itemFamilyChanges) {
-            console.debug(`${key} => ${value}`);
+        if (app_framework_1.Logger.isDebugOn()) {
+            console.debug('returning size: ' + itemFamilyChanges.size);
+            for (const [key, value] of itemFamilyChanges) {
+                console.debug(key + ' => ' + value);
+            }
         }
         return itemFamilyChanges;
     }
@@ -433,8 +672,8 @@ class BaseProcessPublishAssortment {
         const events = [];
         const LCSSeason = Object.assign({}, seasonFed);
         const projectItem = this.getProjectItem(itemFamilyChanges, itemFamilyChanges.itemFamilyId);
-        const familyAssortmentItem = itemFamilyChanges.familyAdd || itemFamilyChanges.familyUpdate
-            || itemFamilyChanges.colorAdds.length > 0 || itemFamilyChanges.colorUpdates.length > 0
+        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));
         if (familyAssortmentItem) {
             const entityReference = itemFamilyChanges.itemFamilyId;
@@ -460,10 +699,11 @@ class BaseProcessPublishAssortment {
             }
             events.push(psUpsert);
         }
-        const colorAddUpdates = [];
-        colorAddUpdates.push(...itemFamilyChanges.colorAdds);
-        colorAddUpdates.push(...itemFamilyChanges.colorUpdates);
-        for (const entityReference of colorAddUpdates) {
+        const colorwayChanges = [];
+        colorwayChanges.push(...itemFamilyChanges.colorAdds);
+        colorwayChanges.push(...itemFamilyChanges.colorUpdates);
+        colorwayChanges.push(...itemFamilyChanges.colorDeletes);
+        for (const entityReference of colorwayChanges) {
             let item = {};
             if (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference)) {
                 const fullAi = itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference);
@@ -489,42 +729,6 @@ class BaseProcessPublishAssortment {
             }
             events.push(csUpsert);
         }
-        const data = {};
-        for (const color of itemFamilyChanges.colorDeletes) {
-            const entityReference = color;
-            let item = {};
-            if (itemFamilyChanges.assortmentItemFullChangeMap.has(entityReference)) {
-                const fullAi = itemFamilyChanges.assortmentItemFullChangeMap.get(entityReference);
-                item = fullAi['item'];
-            }
-            const LCSSKU = await this.getSKUFederation(entityReference, itemToFederatedIdMapping, item);
-            const csRemove = {
-                eventType: 'REMOVE_FROM_SEASON',
-                objectClass: 'LCSSKUSeasonLink',
-                entityReference: '',
-                LCSSeason,
-                LCSSKU,
-                data
-            };
-            events.push(csRemove);
-        }
-        if (itemFamilyChanges.familyDelete) {
-            const entityReference = itemFamilyChanges.itemFamilyId;
-            const LCSProduct = {
-                entityReference: 'item:' + entityReference,
-                objectClass: 'LCSProduct',
-                federatedId: itemToFederatedIdMapping.get(entityReference)
-            };
-            const psUpsert = {
-                eventType: 'REMOVE_FROM_SEASON',
-                objectClass: 'LCSProductSeasonLink',
-                entityReference: 'item:' + entityReference,
-                LCSSeason,
-                LCSProduct,
-                data
-            };
-            events.push(psUpsert);
-        }
         return events;
     }
     getProjectItem(itemFamilyChanges, id) {
@@ -535,10 +739,8 @@ class BaseProcessPublishAssortment {
         }
         if (id === itemFamilyChanges.itemFamilyId && Object.keys(projectItem).length == 0) {
             for (const asstItem of itemFamilyChanges.assortmentItemFullChangeMap.values()) {
-                const item = asstItem?.item;
-                if (item?.roles?.includes('color') && asstItem?.projectItem) {
-                    projectItem = Object.assign({}, asstItem?.projectItem);
-                    projectItem.roles = ['family'];
+                if (asstItem?.familyProjectItem) {
+                    projectItem = asstItem?.familyProjectItem;
                     break;
                 }
             }
@@ -644,3 +846,4 @@ class BaseProcessPublishAssortment {
 exports.BaseProcessPublishAssortment = BaseProcessPublishAssortment;
 BaseProcessPublishAssortment.ASSORTMENT_NOT_PUBLISHABLE = 'Assortment isn\'t marked for publishing to FlexPLM';
 BaseProcessPublishAssortment.ASSORTMENT_NO_FED_INFO = 'Assortment doesn\'t have all "identifier" properties or a federated id, so there is no processing. Identifier properties: ';
+BaseProcessPublishAssortment.NOT_ABLE_TO_PROCESS_DELETE_CHANGES = 'Error: Not able to process delete changes';