From 067b524af1fdbde41ee9171eb7590ebfb9a39ed4 Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Sat, 5 Apr 2025 03:50:15 +0200
Subject: [PATCH] remove instances of HydratedDocument<IInventoryDatabase>

---
 src/services/inventoryService.ts              | 13 ++++---------
 src/services/missionInventoryUpdateService.ts |  8 ++++----
 src/services/questService.ts                  | 17 ++++++-----------
 3 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
index c12daf51..4a711c6c 100644
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@@ -1,10 +1,6 @@
-import {
-    Inventory,
-    InventoryDocumentProps,
-    TInventoryDatabaseDocument
-} from "@/src/models/inventoryModels/inventoryModel";
+import { Inventory, TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
-import { HydratedDocument, Types } from "mongoose";
+import { Types } from "mongoose";
 import { SlotNames, IInventoryChanges, IBinChanges, slotNames } from "@/src/types/purchaseTypes";
 import {
     IChallengeProgress,
@@ -19,7 +15,6 @@ import {
     TEquipmentKey,
     IFusionTreasure,
     IDailyAffiliations,
-    IInventoryDatabase,
     IKubrowPetEggDatabase,
     IKubrowPetEggClient,
     ILibraryDailyTaskInfo,
@@ -129,7 +124,7 @@ const awakeningRewards = [
 ];
 
 export const addStartingGear = async (
-    inventory: HydratedDocument<IInventoryDatabase, InventoryDocumentProps>,
+    inventory: TInventoryDatabaseDocument,
     startingGear: TPartialStartingGear | undefined = undefined
 ): Promise<IInventoryChanges> => {
     const { LongGuns, Pistols, Suits, Melee } = startingGear || {
@@ -1375,7 +1370,7 @@ export const addBooster = (ItemType: string, time: number, inventory: TInventory
 };
 
 export const updateSyndicate = (
-    inventory: HydratedDocument<IInventoryDatabase, InventoryDocumentProps>,
+    inventory: TInventoryDatabaseDocument,
     syndicateUpdate: IMissionInventoryUpdateRequest["AffiliationChanges"]
 ): void => {
     syndicateUpdate?.forEach(affiliation => {
diff --git a/src/services/missionInventoryUpdateService.ts b/src/services/missionInventoryUpdateService.ts
index 70ca6eea..d3f6be64 100644
--- a/src/services/missionInventoryUpdateService.ts
+++ b/src/services/missionInventoryUpdateService.ts
@@ -32,10 +32,10 @@ import {
     updateSyndicate
 } from "@/src/services/inventoryService";
 import { updateQuestKey } from "@/src/services/questService";
-import { HydratedDocument, Types } from "mongoose";
+import { Types } from "mongoose";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { getLevelKeyRewards, toStoreItem } from "@/src/services/itemDataService";
-import { InventoryDocumentProps, TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { getEntriesUnsafe } from "@/src/utils/ts-utils";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { handleStoreItemAcquisition } from "./purchaseService";
@@ -73,7 +73,7 @@ const getRandomRewardByChance = (pool: IReward[]): IRngResult | undefined => {
 //const knownUnhandledKeys: readonly string[] = ["test"] as const; // for unimplemented but important keys
 
 export const addMissionInventoryUpdates = async (
-    inventory: HydratedDocument<IInventoryDatabase, InventoryDocumentProps>,
+    inventory: TInventoryDatabaseDocument,
     inventoryUpdates: IMissionInventoryUpdateRequest
 ): Promise<IInventoryChanges> => {
     const inventoryChanges: IInventoryChanges = {};
@@ -661,7 +661,7 @@ interface IMissionCredits {
 //creditBonus is not entirely accurate.
 //TODO: consider ActiveBoosters
 export const addCredits = (
-    inventory: HydratedDocument<IInventoryDatabase>,
+    inventory: TInventoryDatabaseDocument,
     {
         missionDropCredits,
         missionCompletionCredits,
diff --git a/src/services/questService.ts b/src/services/questService.ts
index 8e46ba35..6319a724 100644
--- a/src/services/questService.ts
+++ b/src/services/questService.ts
@@ -9,14 +9,9 @@ import {
     getLevelKeyRewards,
     getQuestCompletionItems
 } from "@/src/services/itemDataService";
-import {
-    IInventoryDatabase,
-    IQuestKeyClient,
-    IQuestKeyDatabase,
-    IQuestStage
-} from "@/src/types/inventoryTypes/inventoryTypes";
+import { IQuestKeyClient, IQuestKeyDatabase, IQuestStage } from "@/src/types/inventoryTypes/inventoryTypes";
 import { logger } from "@/src/utils/logger";
-import { HydratedDocument, Types } from "mongoose";
+import { Types } from "mongoose";
 import { ExportKeys } from "warframe-public-export-plus";
 import { addFixedLevelRewards } from "./missionInventoryUpdateService";
 import { IInventoryChanges } from "../types/purchaseTypes";
@@ -31,7 +26,7 @@ export interface IUpdateQuestRequest {
 }
 
 export const updateQuestKey = async (
-    inventory: HydratedDocument<IInventoryDatabase>,
+    inventory: TInventoryDatabaseDocument,
     questKeyUpdate: IUpdateQuestRequest["QuestKeys"]
 ): Promise<IInventoryChanges> => {
     if (questKeyUpdate.length > 1) {
@@ -45,7 +40,7 @@ export const updateQuestKey = async (
         throw new Error(`quest key ${questKeyUpdate[0].ItemType} not found`);
     }
 
-    inventory.QuestKeys[questKeyIndex] = questKeyUpdate[0];
+    inventory.QuestKeys[questKeyIndex].overwrite(questKeyUpdate[0]);
 
     let inventoryChanges: IInventoryChanges = {};
     if (questKeyUpdate[0].Completed) {
@@ -57,12 +52,12 @@ export const updateQuestKey = async (
         logger.debug(`quest completion items`, questCompletionItems);
 
         if (questCompletionItems) {
-            inventoryChanges = await addItems(inventory as TInventoryDatabaseDocument, questCompletionItems);
+            inventoryChanges = await addItems(inventory, questCompletionItems);
         }
         inventory.ActiveQuest = "";
 
         if (questKeyUpdate[0].ItemType == "/Lotus/Types/Keys/NewWarQuest/NewWarQuestKeyChain") {
-            setupKahlSyndicate(inventory as TInventoryDatabaseDocument);
+            setupKahlSyndicate(inventory);
         }
     }
     return inventoryChanges;