From 143b53947af8aef787ab32a178f949b82b6746e0 Mon Sep 17 00:00:00 2001 From: Sainan Date: Sat, 22 Jun 2024 05:18:21 +0200 Subject: [PATCH] simplify this shit --- src/controllers/api/missionInventoryUpdateController.ts | 2 +- src/services/missionInventoryUpdateService.ts | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index 46acdd34..008b9a9b 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -66,7 +66,7 @@ const missionInventoryUpdateController: RequestHandler = async (req, res): Promi TotalCredits, CreditsBonus, MissionCredits, - ...(FusionPoints !== undefined && { FusionPoints }) + FusionPoints }); } catch (err) { console.error("Error parsing JSON data:", err); diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index f7300837..45fd7ccf 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -54,12 +54,10 @@ const combineRewardAndLootInventory = ( const missionCredits = lootInventory.RegularCredits || 0; const creditsBonus = rewardInventory.RegularCredits || 0; const totalCredits = missionCredits + creditsBonus; - const FusionPoints = (lootInventory.FusionPoints || 0) + (rewardInventory.FusionPoints || 0) || undefined; + const FusionPoints = (lootInventory.FusionPoints || 0) + (rewardInventory.FusionPoints || 0); lootInventory.RegularCredits = totalCredits; - if (FusionPoints) { - lootInventory.FusionPoints = FusionPoints; - } + lootInventory.FusionPoints = FusionPoints; inventoryFields.forEach((field: IInventoryFieldType) => { if (rewardInventory[field] && !lootInventory[field]) { lootInventory[field] = []; @@ -72,7 +70,7 @@ const combineRewardAndLootInventory = ( TotalCredits: [totalCredits, totalCredits], CreditsBonus: [creditsBonus, creditsBonus], MissionCredits: [missionCredits, missionCredits], - ...(FusionPoints !== undefined && { FusionPoints }) + FusionPoints: FusionPoints }; };