From f7f4b2042234da94ca65788afe06b2b88c3374ee Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Thu, 21 Aug 2025 21:20:04 +0200
Subject: [PATCH] add updateEntratiVault

---
 .../api/entratiLabConquestModeController.ts   | 25 +++----------------
 src/services/inventoryService.ts              | 23 +++++++++++++++++
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/controllers/api/entratiLabConquestModeController.ts b/src/controllers/api/entratiLabConquestModeController.ts
index e5b6c818..c16595ee 100644
--- a/src/controllers/api/entratiLabConquestModeController.ts
+++ b/src/controllers/api/entratiLabConquestModeController.ts
@@ -1,6 +1,6 @@
 import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getInventory } from "@/src/services/inventoryService";
+import { getInventory, updateEntratiVault } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
@@ -11,26 +11,7 @@ export const entratiLabConquestModeController: RequestHandler = async (req, res)
         "EntratiVaultCountResetDate EntratiVaultCountLastPeriod EntratiLabConquestUnlocked EchoesHexConquestUnlocked EchoesHexConquestActiveFrameVariants EchoesHexConquestActiveStickers EntratiLabConquestActiveFrameVariants EntratiLabConquestCacheScoreMission EchoesHexConquestCacheScoreMission"
     );
     const body = getJSONfromString<IEntratiLabConquestModeRequest>(String(req.body));
-    if (!inventory.EntratiVaultCountResetDate || Date.now() >= inventory.EntratiVaultCountResetDate.getTime()) {
-        const EPOCH = 1734307200 * 1000; // Mondays, amirite?
-        const day = Math.trunc((Date.now() - EPOCH) / 86400000);
-        const week = Math.trunc(day / 7);
-        const weekStart = EPOCH + week * 604800000;
-        const weekEnd = weekStart + 604800000;
-        inventory.EntratiVaultCountLastPeriod = 0;
-        inventory.EntratiVaultCountResetDate = new Date(weekEnd);
-        if (inventory.EntratiLabConquestUnlocked) {
-            inventory.EntratiLabConquestUnlocked = 0;
-            inventory.EntratiLabConquestCacheScoreMission = 0;
-            inventory.EntratiLabConquestActiveFrameVariants = [];
-        }
-        if (inventory.EchoesHexConquestUnlocked) {
-            inventory.EchoesHexConquestUnlocked = 0;
-            inventory.EchoesHexConquestCacheScoreMission = 0;
-            inventory.EchoesHexConquestActiveFrameVariants = [];
-            inventory.EchoesHexConquestActiveStickers = [];
-        }
-    }
+    updateEntratiVault(inventory);
     if (body.BuyMode) {
         inventory.EntratiVaultCountLastPeriod! += 2;
         if (body.IsEchoesDeepArchemedea) {
@@ -51,7 +32,7 @@ export const entratiLabConquestModeController: RequestHandler = async (req, res)
     }
     await inventory.save();
     res.json({
-        EntratiVaultCountResetDate: toMongoDate(inventory.EntratiVaultCountResetDate),
+        EntratiVaultCountResetDate: toMongoDate(inventory.EntratiVaultCountResetDate!),
         EntratiVaultCountLastPeriod: inventory.EntratiVaultCountLastPeriod,
         EntratiLabConquestUnlocked: inventory.EntratiLabConquestUnlocked,
         EntratiLabConquestCacheScoreMission: inventory.EntratiLabConquestCacheScoreMission,
diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
index c6f16b08..acf7374d 100644
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@@ -2449,3 +2449,26 @@ export const giveNemesisPetRecipe = (
 export const getEffectiveAvatarImageType = (inventory: TInventoryDatabaseDocument): string => {
     return inventory.ActiveAvatarImageType ?? "/Lotus/Types/StoreItems/AvatarImages/AvatarImageDefault";
 };
+
+export const updateEntratiVault = (inventory: TInventoryDatabaseDocument): void => {
+    if (!inventory.EntratiVaultCountResetDate || Date.now() >= inventory.EntratiVaultCountResetDate.getTime()) {
+        const EPOCH = 1734307200 * 1000; // Mondays, amirite?
+        const day = Math.trunc((Date.now() - EPOCH) / 86400000);
+        const week = Math.trunc(day / 7);
+        const weekStart = EPOCH + week * 604800000;
+        const weekEnd = weekStart + 604800000;
+        inventory.EntratiVaultCountLastPeriod = 0;
+        inventory.EntratiVaultCountResetDate = new Date(weekEnd);
+        if (inventory.EntratiLabConquestUnlocked) {
+            inventory.EntratiLabConquestUnlocked = 0;
+            inventory.EntratiLabConquestCacheScoreMission = 0;
+            inventory.EntratiLabConquestActiveFrameVariants = [];
+        }
+        if (inventory.EchoesHexConquestUnlocked) {
+            inventory.EchoesHexConquestUnlocked = 0;
+            inventory.EchoesHexConquestCacheScoreMission = 0;
+            inventory.EchoesHexConquestActiveFrameVariants = [];
+            inventory.EchoesHexConquestActiveStickers = [];
+        }
+    }
+};