handle KeyToRemove in EOM upload

src/services/inventoryService.ts

@@ -538,15 +538,9 @@ export const addItem = async (
             if (!key) return {};
             return { QuestKeys: [key] };
         } else {
-            const key = { ItemType: typeName, ItemCount: quantity };
-
-            const index = inventory.LevelKeys.findIndex(levelKey => levelKey.ItemType == typeName);
-            if (index != -1) {
-                inventory.LevelKeys[index].ItemCount += quantity;
-            } else {
-                inventory.LevelKeys.push(key);
-            }
-            return { LevelKeys: [key] };
+            const levelKeyChanges = [{ ItemType: typeName, ItemCount: quantity }];
+            addLevelKeys(inventory, levelKeyChanges);
+            return { LevelKeys: levelKeyChanges };
         }
     }
     if (typeName in ExportDrones) {
@@ -1240,6 +1234,10 @@ export const addRecipes = (inventory: TInventoryDatabaseDocument, itemsArray: IT
     applyArrayChanges(inventory.Recipes, itemsArray);
 };
 
+export const addLevelKeys = (inventory: TInventoryDatabaseDocument, itemsArray: ITypeCount[]): void => {
+    applyArrayChanges(inventory.LevelKeys, itemsArray);
+};
+
 export const addMods = (inventory: TInventoryDatabaseDocument, itemsArray: IRawUpgrade[]): void => {
     const { RawUpgrades } = inventory;
 

src/services/missionInventoryUpdateService.ts

@@ -22,6 +22,7 @@ import {
     addFusionTreasures,
     addGearExpByCategory,
     addItem,
+    addLevelKeys,
     addMiscItems,
     addMissionComplete,
     addMods,
@@ -77,11 +78,8 @@ export const addMissionInventoryUpdates = async (
     inventoryUpdates: IMissionInventoryUpdateRequest
 ): Promise<IInventoryChanges> => {
     const inventoryChanges: IInventoryChanges = {};
-    if (
-        inventoryUpdates.EndOfMatchUpload &&
-        inventoryUpdates.Missions &&
-        inventoryUpdates.Missions.Tag in ExportRegions
-    ) {
+    if (inventoryUpdates.EndOfMatchUpload) {
+        if (inventoryUpdates.Missions && inventoryUpdates.Missions.Tag in ExportRegions) {
             const node = ExportRegions[inventoryUpdates.Missions.Tag];
             if (node.miscItemFee) {
                 addMiscItems(inventory, [
@@ -92,28 +90,19 @@ export const addMissionInventoryUpdates = async (
                 ]);
             }
         }
-    if (inventoryUpdates.RewardInfo) {
-        if (inventoryUpdates.RewardInfo.periodicMissionTag) {
-            const tag = inventoryUpdates.RewardInfo.periodicMissionTag;
-            const existingCompletion = inventory.PeriodicMissionCompletions.find(completion => completion.tag === tag);
-
-            if (existingCompletion) {
-                existingCompletion.date = new Date();
-            } else {
-                inventory.PeriodicMissionCompletions.push({
-                    tag: tag,
-                    date: new Date()
-                });
+        if (inventoryUpdates.KeyToRemove) {
+            if (!inventoryUpdates.KeyOwner || inventory.accountOwnerId.equals(inventoryUpdates.KeyOwner)) {
+                addLevelKeys(inventory, [
+                    {
+                        ItemType: inventoryUpdates.KeyToRemove,
+                        ItemCount: -1
                     }
-        }
-        if (inventoryUpdates.RewardInfo.NemesisAbandonedRewards) {
-            inventory.NemesisAbandonedRewards = inventoryUpdates.RewardInfo.NemesisAbandonedRewards;
+                ]);
             }
         }
         if (
             inventoryUpdates.MissionFailed &&
             inventoryUpdates.MissionStatus == "GS_FAILURE" &&
-        inventoryUpdates.EndOfMatchUpload &&
             inventoryUpdates.ObjectiveReached &&
             !inventoryUpdates.LockedWeaponGroup
         ) {
@@ -136,6 +125,25 @@ export const addMissionInventoryUpdates = async (
                 ]);
             }
         }
+    }
+    if (inventoryUpdates.RewardInfo) {
+        if (inventoryUpdates.RewardInfo.periodicMissionTag) {
+            const tag = inventoryUpdates.RewardInfo.periodicMissionTag;
+            const existingCompletion = inventory.PeriodicMissionCompletions.find(completion => completion.tag === tag);
+
+            if (existingCompletion) {
+                existingCompletion.date = new Date();
+            } else {
+                inventory.PeriodicMissionCompletions.push({
+                    tag: tag,
+                    date: new Date()
+                });
+            }
+        }
+        if (inventoryUpdates.RewardInfo.NemesisAbandonedRewards) {
+            inventory.NemesisAbandonedRewards = inventoryUpdates.RewardInfo.NemesisAbandonedRewards;
+        }
+    }
     for (const [key, value] of getEntriesUnsafe(inventoryUpdates)) {
         if (value === undefined) {
             logger.error(`Inventory update key ${key} has no value `);

src/types/requestTypes.ts

@@ -49,6 +49,9 @@ export type IMissionInventoryUpdateRequest = {
     rewardsMultiplier?: number;
     GoalTag: string;
     LevelKeyName: string;
+    KeyOwner?: string;
+    KeyRemovalHash?: string;
+    KeyToRemove?: string;
     ActiveBoosters?: IBooster[];
     RawUpgrades?: IRawUpgrade[];
     FusionTreasures?: IFusionTreasure[];