From 500b875f5835aa64383da9b3fb72277a9d20da64 Mon Sep 17 00:00:00 2001 From: Ordis <134585663+OrdisPrime@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:28:57 +0100 Subject: [PATCH] cleanup comments --- .../giveKeyChainTriggeredItemsController.ts | 1 - .../api/inventorySlotsController.ts | 4 ---- src/controllers/api/updateQuestController.ts | 3 +-- src/services/missionInventoryUpdateService.ts | 20 ++++--------------- src/services/questService.ts | 1 - 5 files changed, 5 insertions(+), 24 deletions(-) diff --git a/src/controllers/api/giveKeyChainTriggeredItemsController.ts b/src/controllers/api/giveKeyChainTriggeredItemsController.ts index 827bb79c..9437e75a 100644 --- a/src/controllers/api/giveKeyChainTriggeredItemsController.ts +++ b/src/controllers/api/giveKeyChainTriggeredItemsController.ts @@ -17,7 +17,6 @@ export const giveKeyChainTriggeredItemsController: RequestHandler = async (req, } // items were added: update quest stage's i (item was given) const quest = inventory.QuestKeys.find(quest => quest.ItemType === keyChainTriggeredItemsRequest.KeyChain); - console.log(`quest: ${JSON.stringify(quest)}`); if (!quest) { throw new Error(`Quest ${keyChainTriggeredItemsRequest.KeyChain} not found in QuestKeys`); diff --git a/src/controllers/api/inventorySlotsController.ts b/src/controllers/api/inventorySlotsController.ts index cb49ddb4..4caea9d0 100644 --- a/src/controllers/api/inventorySlotsController.ts +++ b/src/controllers/api/inventorySlotsController.ts @@ -22,8 +22,6 @@ export const inventorySlotsController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); //const body = JSON.parse(req.body as string) as IInventorySlotsRequest; - //console.log(body); - //TODO: check which slot was purchased because pvpBonus is also possible const inventory = await getInventory(accountId); @@ -31,7 +29,5 @@ export const inventorySlotsController: RequestHandler = async (req, res) => { updateSlots(inventory, InventorySlot.PVE_LOADOUTS, 1, 1); await inventory.save(); - //console.log({ InventoryChanges: currencyChanges }, " added loadout changes:"); - res.json({ InventoryChanges: currencyChanges }); }; diff --git a/src/controllers/api/updateQuestController.ts b/src/controllers/api/updateQuestController.ts index 43c3d53b..2b30a3d1 100644 --- a/src/controllers/api/updateQuestController.ts +++ b/src/controllers/api/updateQuestController.ts @@ -25,11 +25,10 @@ export const updateQuestController: RequestHandler = async (req, res) => { const questKeyName = updateQuestRequest.QuestKeys[0].ItemType; const questCompletionItems = getQuestCompletionItems(questKeyName); - console.log(questCompletionItems, "quest completion items"); + logger.debug(`quest completion items { ${questCompletionItems.map(item => item.ItemType).join(", ")} }`); const inventoryChanges = {}; for (const item of questCompletionItems) { - console.log(item, "item"); const inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount); combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges); } diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index 94eb134f..3c286c75 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -179,7 +179,7 @@ export const addMissionInventoryUpdates = ( return inventoryChanges; }; -//return partial missioninventoryupdate response +//TODO: return type of partial missioninventoryupdate response export const addMissionRewards = async ( inventory: TInventoryDatabaseDocument, { RewardInfo: rewardInfo, LevelKeyName: levelKeyName, Missions: missions }: IMissionInventoryUpdateRequest @@ -197,10 +197,10 @@ export const addMissionRewards = async ( const inventoryChanges: IInventoryChanges = {}; let missionCompletionCredits = 0; - //inventory change is what the client does not know the server updated, although credit updates seem to be taken from totalCredits + //inventory change is what the client has not rewarded itself, credit updates seem to be taken from totalCredits if (levelKeyName) { const fixedLevelRewards = getLevelKeyRewards(levelKeyName); - console.log("fixedLevelRewards", fixedLevelRewards); + //logger.debug(`fixedLevelRewards ${fixedLevelRewards}`); for (const reward of fixedLevelRewards) { if (reward.rewardType == "RT_CREDITS") { inventory.RegularCredits += reward.amount; @@ -215,13 +215,12 @@ export const addMissionRewards = async ( const levelCreditReward = getLevelCreditRewards(missions?.Tag); missionCompletionCredits += levelCreditReward; inventory.RegularCredits += levelCreditReward; - console.log("levelCreditReward", levelCreditReward); + logger.debug(`levelCreditReward ${levelCreditReward}`); } //TODO: resolve issue with creditbundles for (const reward of MissionRewards) { //TODO: additem should take in storeItems - console.log("adding item", reward.StoreItem); const inventoryChange = await addItem(inventory, reward.StoreItem.replace("StoreItems/", ""), reward.ItemCount); //TODO: combineInventoryChanges improve type safety, merging 2 of the same item? //TODO: check for the case when two of the same item are added, combineInventoryChanges should merge them @@ -229,8 +228,6 @@ export const addMissionRewards = async ( combineInventoryChanges(inventoryChanges, inventoryChange.InventoryChanges); } - console.log(inventory.RegularCredits); - console.log("inventoryChanges", inventoryChanges); return { inventoryChanges, MissionRewards, missionCompletionCredits }; }; @@ -246,15 +243,6 @@ export const calculateFinalCredits = ( ) => { const hasDailyCreditBonus = true; const totalCredits = missionDropCredits + missionCompletionCredits + rngRewardCredits; - console.log( - "missionDropCredits", - missionDropCredits, - "missionCompletionCredits", - missionCompletionCredits, - "rngRewardCredits", - rngRewardCredits - ); - console.log("totalCredits", totalCredits); const finalCredits = { MissionCredits: [missionDropCredits, missionDropCredits], diff --git a/src/services/questService.ts b/src/services/questService.ts index 22f53d80..7b600178 100644 --- a/src/services/questService.ts +++ b/src/services/questService.ts @@ -12,7 +12,6 @@ export const updateQuestKey = ( } const questKeyIndex = inventory.QuestKeys.findIndex(questKey => questKey.ItemType === questKeyUpdate[0].ItemType); - console.log("quest key index", questKeyIndex); if (questKeyIndex === -1) { throw new Error(`quest key ${questKeyUpdate[0].ItemType} not found`);