From 2d4b139e0e5029d9bd101974d1f4cef7660d2270 Mon Sep 17 00:00:00 2001 From: holmityd Date: Tue, 5 Sep 2023 17:41:32 +0400 Subject: [PATCH] interface-names --- src/controllers/api/missionInventoryUpdateController.ts | 1 + src/models/inventoryModel.ts | 6 +++--- src/services/inventoryService.ts | 1 + src/types/genericUpdate.ts | 2 +- src/types/inventoryTypes/inventoryTypes.ts | 7 ++++--- src/types/session.ts | 1 + 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/controllers/api/missionInventoryUpdateController.ts b/src/controllers/api/missionInventoryUpdateController.ts index 65472338..ad75a9a2 100644 --- a/src/controllers/api/missionInventoryUpdateController.ts +++ b/src/controllers/api/missionInventoryUpdateController.ts @@ -52,6 +52,7 @@ import { modNames, relicNames, miscNames, resourceNames, gearNames, blueprintNam // eslint-disable-next-line @typescript-eslint/no-misused-promises const missionInventoryUpdateController: RequestHandler = async (req, res) => { + const [data] = String(req.body).split("\n"); const id = req.query.accountId as string; try { diff --git a/src/models/inventoryModel.ts b/src/models/inventoryModel.ts index ae9c504a..3e663eb4 100644 --- a/src/models/inventoryModel.ts +++ b/src/models/inventoryModel.ts @@ -7,7 +7,7 @@ import { IBooster } from "../types/inventoryTypes/inventoryTypes"; import { IOid } from "../types/commonTypes"; -import { ISuitDatabase, ISuitDocument } from "@/src/types/inventoryTypes/SuitTypes"; +import { ISuitDatabase } from "@/src/types/inventoryTypes/SuitTypes"; import { IWeaponDatabase } from "@/src/types/inventoryTypes/weaponTypes"; const abilityOverrideSchema = new Schema({ @@ -85,7 +85,7 @@ const RawUpgrades = new Schema({ RawUpgrades.set("toJSON", { transform(_document, returnedObject) { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call - returnedObject.LastAdded = { $oid: returnedObject._id.toString() } satisfies Oid; + returnedObject.LastAdded = { $oid: returnedObject._id.toString() } satisfies IOid; delete returnedObject._id; delete returnedObject.__v; } @@ -99,7 +99,7 @@ const Upgrade = new Schema({ Upgrade.set("toJSON", { transform(_document, returnedObject) { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call - returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies Oid; + returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies IOid; delete returnedObject._id; delete returnedObject.__v; } diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts index 40c90c08..0ec34668 100644 --- a/src/services/inventoryService.ts +++ b/src/services/inventoryService.ts @@ -15,6 +15,7 @@ import { IRawUpgrade } from "@/src/types/inventoryTypes/inventoryTypes"; import { IMissionInventoryUpdate, IMissionInventoryUpdateGear } from "../types/missionInventoryUpdateType"; +import { IGenericUpdate } from "../types/genericUpdate"; const createInventory = async (accountOwnerId: Types.ObjectId) => { try { diff --git a/src/types/genericUpdate.ts b/src/types/genericUpdate.ts index 3f61f671..fa231be9 100644 --- a/src/types/genericUpdate.ts +++ b/src/types/genericUpdate.ts @@ -1,4 +1,4 @@ export interface IGenericUpdate { NodeIntrosCompleted: string | string[]; // AffiliationMods: any[]; -} \ No newline at end of file +} diff --git a/src/types/inventoryTypes/inventoryTypes.ts b/src/types/inventoryTypes/inventoryTypes.ts index 259fe2df..f1a30e11 100644 --- a/src/types/inventoryTypes/inventoryTypes.ts +++ b/src/types/inventoryTypes/inventoryTypes.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { Document, Types } from "mongoose"; import { IOid } from "../commonTypes"; import { IAbilityOverride, IColor, FocusSchool, IPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes"; @@ -33,7 +34,7 @@ export interface IInventoryResponse { DailyFocus: number; GiftsRemaining: number; HandlerPoints: number; - MiscItems: IConsumable[]; + MiscItems: IMiscItem[]; ChallengesFixVersion: number; ChallengeProgress: IChallengeProgress[]; RawUpgrades: IRawUpgrade[]; @@ -319,7 +320,7 @@ export interface ICrewShipSalvageBinClass { export interface ICrewShipSalvagedWeaponSkin { ItemType: string; UpgradeFingerprint?: string; - ItemId?: Oid; + ItemId?: IOid; _id?: Types.ObjectId; } @@ -931,7 +932,7 @@ export interface IProgress { export interface IRawUpgrade { ItemType: string; ItemCount: number; - LastAdded?: Oid; + LastAdded?: IOid; } export interface IScoop { diff --git a/src/types/session.ts b/src/types/session.ts index 66408991..222ccdf5 100644 --- a/src/types/session.ts +++ b/src/types/session.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ export interface ISession { sessionId: string; creatorId: string;