From fd2027b071c3cb869872a837aaedbbafcd767340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis?= <97699850+janisslsm@users.noreply.github.com> Date: Fri, 6 Sep 2024 02:16:27 +0300 Subject: [PATCH] fix lint --- src/controllers/api/giveStartingGearController.ts | 2 +- src/controllers/api/inventoryController.ts | 1 - .../api/missionInventoryUpdateController.ts | 6 ++++-- src/controllers/api/trainingResultController.ts | 5 ----- src/controllers/api/updateInventoryController.ts | 10 ++++++---- src/services/inventoryService.ts | 12 +----------- src/services/missionInventoryUpdateService.ts | 2 +- src/types/purchaseTypes.ts | 12 ++---------- 8 files changed, 15 insertions(+), 35 deletions(-) diff --git a/src/controllers/api/giveStartingGearController.ts b/src/controllers/api/giveStartingGearController.ts index 088459438..974f94e71 100644 --- a/src/controllers/api/giveStartingGearController.ts +++ b/src/controllers/api/giveStartingGearController.ts @@ -11,4 +11,4 @@ export const giveStartingGearController: RequestHandler = async (req, res) => { console.log(req.query); await inventory.save(); res.status(200); -}; \ No newline at end of file +}; diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index 865a73187..c02fe6f2f 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -4,7 +4,6 @@ import { toInventoryResponse } from "@/src/helpers/inventoryHelpers"; import { Inventory } from "@/src/models/inventoryModels/inventoryModel"; import { config } from "@/src/services/configService"; import { IInventoryDatabase } from "@/src/types/inventoryTypes/inventoryTypes"; -import { ExportCustoms, ExportFlavour } from "warframe-public-export-plus"; // eslint-disable-next-line @typescript-eslint/no-misused-promises const inventoryController: RequestHandler = async (request, response) => { diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index 65363730c..c2d8899f7 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -57,8 +57,10 @@ const missionInventoryUpdateController: RequestHandler = async (req, res): Promi const { InventoryChanges, MissionRewards } = getRewards(lootInventory); - const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = - combineRewardAndLootInventory(InventoryChanges, lootInventory); + const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = combineRewardAndLootInventory( + InventoryChanges, + lootInventory + ); // eslint-disable-next-line @typescript-eslint/no-unused-vars const InventoryJson = JSON.stringify(await missionInventoryUpdate(combinedInventoryChanges, accountId)); diff --git a/src/controllers/api/trainingResultController.ts b/src/controllers/api/trainingResultController.ts index 3aaa8f2e8..f45a85945 100644 --- a/src/controllers/api/trainingResultController.ts +++ b/src/controllers/api/trainingResultController.ts @@ -1,14 +1,9 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; -import { getJSONfromString } from "@/src/helpers/stringHelpers"; import { getInventory } from "@/src/services/inventoryService"; import { IMongoDate } from "@/src/types/commonTypes"; import { RequestHandler } from "express"; import { unixTimesInMs } from "@/src/constants/timeConstants"; -interface ITrainingResultsRequest { - numLevelsGained: number; -} - interface ITrainingResultsResponse { NewTrainingDate: IMongoDate; NewLevel: number; diff --git a/src/controllers/api/updateInventoryController.ts b/src/controllers/api/updateInventoryController.ts index c0aac40fb..541a831bd 100644 --- a/src/controllers/api/updateInventoryController.ts +++ b/src/controllers/api/updateInventoryController.ts @@ -1,6 +1,6 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; import { RequestHandler } from "express"; -import { getInventory, missionInventoryUpdate } from "@/src/services/inventoryService"; +import { missionInventoryUpdate } from "@/src/services/inventoryService"; import { combineRewardAndLootInventory } from "@/src/services/missionInventoryUpdateService"; import { getJSONfromString } from "@/src/helpers/stringHelpers"; import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes"; @@ -8,9 +8,11 @@ import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes"; // eslint-disable-next-line @typescript-eslint/no-misused-promises export const updateInventoryController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); - const lootInventory = getJSONfromString(req.body.toString()) as IMissionInventoryUpdateRequest; - const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = - combineRewardAndLootInventory(lootInventory, lootInventory); + const lootInventory = getJSONfromString(req.body as string) as IMissionInventoryUpdateRequest; + const { combinedInventoryChanges, TotalCredits, CreditsBonus, MissionCredits } = combineRewardAndLootInventory( + lootInventory, + lootInventory + ); await missionInventoryUpdate(combinedInventoryChanges, accountId); diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 45fecb2ba..cc04209dd 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -694,17 +694,7 @@ const addMissionComplete = (inventory: IInventoryDatabaseDocument, { Tag, Comple }; export const missionInventoryUpdate = async (data: IMissionInventoryUpdateRequest, accountId: string) => { - const { - RawUpgrades, - MiscItems, - RegularCredits, - ChallengeProgress, - FusionPoints, - Consumables, - Recipes, - Missions, - FusionTreasures - } = data; + const { RawUpgrades, MiscItems, RegularCredits, ChallengeProgress, Consumables, Recipes, Missions } = data; const inventory = await getInventory(accountId); // credits diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts index a3d249ae0..e5da093f9 100644 --- a/src/services/missionInventoryUpdateService.ts +++ b/src/services/missionInventoryUpdateService.ts @@ -86,7 +86,7 @@ const combineRewardAndLootInventory = ( combinedInventoryChanges: lootInventory, TotalCredits: [totalCredits, totalCredits], CreditsBonus: [creditsBonus, creditsBonus], - MissionCredits: [missionCredits, missionCredits], + MissionCredits: [missionCredits, missionCredits] }; }; diff --git a/src/types/purchaseTypes.ts b/src/types/purchaseTypes.ts index df83d026b..eb3327496 100644 --- a/src/types/purchaseTypes.ts +++ b/src/types/purchaseTypes.ts @@ -23,17 +23,9 @@ export type IBinChanges = { Extra?: number; }; -export type SlotPurchaseName = - | "SuitSlotItem" - | "TwoSentinelSlotItem" - | "TwoWeaponSlotItem"; +export type SlotPurchaseName = "SuitSlotItem" | "TwoSentinelSlotItem" | "TwoWeaponSlotItem"; -export type SlotNames = - | "SuitBin" - | "WeaponBin" - | "MechBin" - | "PveBonusLoadoutBin" - | "SentinelBin"; +export type SlotNames = "SuitBin" | "WeaponBin" | "MechBin" | "PveBonusLoadoutBin" | "SentinelBin"; export type SlotPurchase = { [P in SlotPurchaseName]: { name: SlotNames; slotsPerPurchase: number };