feat: Enhance inventory management by adding dataItemIndex parameter for item removal and selling operations

fox3000foxy · fox3000foxy · commit b589a4535e5c · 2025-08-15T18:27:45.000+02:00
diff --git a/dist/controllers/ItemController.js b/dist/controllers/ItemController.js
@@ -326,7 +326,7 @@ let Items = class Items {
     }
     async sellItem(req, res) {
         const { itemId } = req.params;
-        const { amount, purchasePrice } = req.body; // Ajouter purchasePrice
+        const { amount, purchasePrice, dataItemIndex } = req.body; // Ajouter purchasePrice
         if (!itemId || isNaN(amount)) {
             await this.createLog(req, "inventory", 400, req.user?.user_id, {
                 reason: "invalid_input",
@@ -370,7 +370,7 @@ let Items = class Items {
                     });
                 }
                 // Supprimer les items avec le prix d'achat spécifique
-                await this.inventoryService.removeSellableItemWithPrice(user.user_id, itemId, amount, purchasePrice);
+                await this.inventoryService.removeSellableItemWithPrice(user.user_id, itemId, amount, purchasePrice, dataItemIndex);
                 const sellValue = purchasePrice * amount * 0.75; // 75% du prix d'achat
                 const isOwner = user.user_id === item.owner;
                 // Augmenter le balance seulement si l'utilisateur n'est PAS le propriétaire
@@ -619,7 +619,7 @@ let Items = class Items {
     }
     async dropItem(req, res) {
         const { itemId } = req.params;
-        const { amount, uniqueId } = req.body;
+        const { amount, uniqueId, dataItemIndex } = req.body;
         if (!itemId) {
             await this.createLog(req, "inventory", 400, req.user?.user_id, {
                 reason: "missing_itemId",
@@ -680,7 +680,7 @@ let Items = class Items {
                         message: "You don't have enough items without metadata to drop",
                     });
                 }
-                await this.inventoryService.removeItem(user.user_id, itemId, amount);
+                await this.inventoryService.removeItem(user.user_id, itemId, amount, dataItemIndex);
                 await this.createLog(req, "inventory", 200, req.user?.user_id, {
                     itemId,
                     action: "drop",
diff --git a/dist/index.js b/dist/index.js
@@ -34,12 +34,8 @@ function backupDatabase() {
         return;
     }
     const command = `mysqldump -h ${dbHost} -u ${dbUser} -p'${dbPassword}' ${dbName} > ${backupPath}`;
-    (0, child_process_1.exec)(command, (error, stdout, stderr) => {
-        if (error) {
-            // console.error("MySQL database backup failed:", error);
-            // console.error("stderr:", stderr);
-        }
-        else {
+    (0, child_process_1.exec)(command, (error) => {
+        if (!error) {
             console.log("MySQL database backup created:", backupPath);
         }
     });
diff --git a/dist/repositories/InventoryRepository.d.ts b/dist/repositories/InventoryRepository.d.ts
@@ -11,11 +11,11 @@ export declare class InventoryRepository {
     } | undefined, sellable: boolean, purchasePrice: number | undefined, uuidv4: () => string): Promise<void>;
     setItemAmount(userId: string, itemId: string, amount: number): Promise<void>;
     updateItemMetadata(userId: string, itemId: string, uniqueId: string, metadata: object): Promise<void>;
-    removeItem(userId: string, itemId: string, amount: number): Promise<void>;
+    removeItem(userId: string, itemId: string, amount: number, dataItemIndex?: number): Promise<void>;
     removeItemByUniqueId(userId: string, itemId: string, uniqueId: string): Promise<void>;
     hasItemWithoutMetadata(userId: string, itemId: string, amount: number): Promise<boolean>;
     hasItemWithoutMetadataSellable(userId: string, itemId: string, amount: number): Promise<boolean>;
     removeSellableItem(userId: string, itemId: string, amount: number): Promise<void>;
-    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number): Promise<void>;
+    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number, dataItemIndex?: number): Promise<void>;
     transferItem(fromUserId: string, toUserId: string, itemId: string, uniqueId: string): Promise<void>;
 }
diff --git a/dist/repositories/InventoryRepository.js b/dist/repositories/InventoryRepository.js
@@ -13,7 +13,7 @@ class InventoryRepository {
        )`, [userId]);
     }
     async getInventoryItems(userId) {
-        return await this.databaseService.read(`SELECT 
+        const items = await this.databaseService.read(`SELECT 
          inv.user_id, 
          inv.item_id, 
          inv.amount, 
@@ -32,6 +32,29 @@ class InventoryRepository {
        FROM inventories inv
        INNER JOIN items i ON inv.item_id = i.itemId AND (i.deleted IS NULL OR i.deleted = 0)
        WHERE inv.user_id = ? AND inv.amount > 0`, [userId]);
+        return items.sort((a, b) => {
+            const nameCompare = a.name?.localeCompare(b.name || '') || 0;
+            if (nameCompare !== 0)
+                return nameCompare;
+            if (!a.metadata && b.metadata)
+                return -1;
+            if (a.metadata && !b.metadata)
+                return 1;
+            return 0;
+        }).map((item) => ({
+            user_id: item.user_id,
+            item_id: item.item_id,
+            amount: item.amount,
+            metadata: item.metadata,
+            sellable: !!item.sellable,
+            purchasePrice: item.purchasePrice,
+            name: item.name,
+            description: item.description,
+            iconHash: item.iconHash,
+            price: item.purchasePrice,
+            rarity: item.rarity,
+            custom_url_link: item.custom_url_link
+        }));
     }
     async getItemAmount(userId, itemId) {
         const items = await this.databaseService.read("SELECT SUM(amount) as amount FROM inventories WHERE user_id = ? AND item_id = ?", [userId, itemId]);
@@ -73,21 +96,34 @@ class InventoryRepository {
         const metadataJson = JSON.stringify(metadataWithUniqueId);
         await this.databaseService.request("UPDATE inventories SET metadata = ? WHERE user_id = ? AND item_id = ? AND JSON_EXTRACT(metadata, '$._unique_id') = ?", [metadataJson, userId, itemId, uniqueId]);
     }
-    async removeItem(userId, itemId, amount) {
-        const items = await this.databaseService.read(`SELECT * FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL ORDER BY amount DESC`, [userId, itemId]);
-        console.log(`Removing ${amount} of item ${itemId} from user ${userId}`);
-        console.log(`Found items:`, items);
+    async removeItem(userId, itemId, amount, dataItemIndex) {
+        // On récupère tous les stacks correspondants, triés par amount DESC pour vider les plus gros d'abord
+        const items = await this.getInventoryItems(userId);
+        // Si dataItemIndex est défini, on ne retire que sur ce stack précis
+        if (typeof dataItemIndex === "number" && items[dataItemIndex]) {
+            const item = items[dataItemIndex];
+            const toRemoveFromStack = Math.min(amount, item.amount);
+            const newAmount = item.amount - toRemoveFromStack;
+            if (newAmount <= 0) {
+                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND sellable = ? AND amount = ?  AND purchasePrice = ? LIMIT 1`, [userId, item.item_id, item.sellable ? 1 : 0, item.amount, item.purchasePrice]);
+            }
+            else {
+                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = ? AND amount = ? AND purchasePrice = ? LIMIT 1`, [newAmount, userId, item.item_id, item.sellable ? 1 : 0, item.amount, item.purchasePrice]);
+            }
+            return;
+        }
+        // Sinon, comportement classique (réparti sur tous les stacks)
         let remainingToRemove = amount;
         for (const item of items) {
             if (remainingToRemove <= 0)
                 break;
             const toRemoveFromStack = Math.min(remainingToRemove, item.amount);
             const newAmount = item.amount - toRemoveFromStack;
             if (newAmount <= 0) {
-                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = ?`, [userId, itemId, item.sellable ? 1 : 0]);
+                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = ? AND amount = ? LIMIT 1`, [userId, itemId, item.sellable ? 1 : 0, item.amount]);
             }
             else {
-                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = ?`, [newAmount, userId, itemId, item.sellable ? 1 : 0]);
+                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = ? AND amount = ? LIMIT 1`, [newAmount, userId, itemId, item.sellable ? 1 : 0, item.amount]);
             }
             remainingToRemove -= toRemoveFromStack;
         }
@@ -122,19 +158,33 @@ class InventoryRepository {
             remainingToRemove -= toRemoveFromStack;
         }
     }
-    async removeSellableItemWithPrice(userId, itemId, amount, purchasePrice) {
+    async removeSellableItemWithPrice(userId, itemId, amount, purchasePrice, dataItemIndex) {
         const items = await this.databaseService.read(`SELECT * FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND purchasePrice = ? ORDER BY amount DESC`, [userId, itemId, purchasePrice]);
+        // Si dataItemIndex est défini, on ne retire que sur ce stack précis
+        if (typeof dataItemIndex === "number" && items[dataItemIndex]) {
+            const item = items[dataItemIndex];
+            const toRemoveFromStack = Math.min(amount, item.amount);
+            const newAmount = item.amount - toRemoveFromStack;
+            if (newAmount <= 0) {
+                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND amount = ? AND purchasePrice = ? LIMIT 1`, [userId, itemId, item.amount, purchasePrice]);
+            }
+            else {
+                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND amount = ? AND purchasePrice = ? LIMIT 1`, [newAmount, userId, itemId, item.amount, purchasePrice]);
+            }
+            return;
+        }
+        // Sinon, comportement classique (réparti sur tous les stacks)
         let remainingToRemove = amount;
         for (const item of items) {
             if (remainingToRemove <= 0)
                 break;
             const toRemoveFromStack = Math.min(remainingToRemove, item.amount);
             const newAmount = item.amount - toRemoveFromStack;
             if (newAmount <= 0) {
-                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND purchasePrice = ?`, [userId, itemId, purchasePrice]);
+                await this.databaseService.request(`DELETE FROM inventories WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND amount = ? AND purchasePrice = ? LIMIT 1`, [userId, itemId, item.amount, purchasePrice]);
             }
             else {
-                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND purchasePrice = ?`, [newAmount, userId, itemId, purchasePrice]);
+                await this.databaseService.request(`UPDATE inventories SET amount = ? WHERE user_id = ? AND item_id = ? AND metadata IS NULL AND sellable = 1 AND amount = ? AND purchasePrice = ? LIMIT 1`, [newAmount, userId, itemId, item.amount, purchasePrice]);
             }
             remainingToRemove -= toRemoveFromStack;
         }
diff --git a/dist/services/InventoryService.d.ts b/dist/services/InventoryService.d.ts
@@ -7,7 +7,7 @@ export interface IInventoryService {
     addItem(userId: string, itemId: string, amount: number, metadata?: {
         [key: string]: unknown;
     }, sellable?: boolean, purchasePrice?: number): Promise<void>;
-    removeItem(userId: string, itemId: string, amount: number): Promise<void>;
+    removeItem(userId: string, itemId: string, amount: number, dataItemIndex?: number): Promise<void>;
     removeItemByUniqueId(userId: string, itemId: string, uniqueId: string): Promise<void>;
     setItemAmount(userId: string, itemId: string, amount: number): Promise<void>;
     updateItemMetadata(userId: string, itemId: string, uniqueId: string, metadata: {
@@ -18,7 +18,7 @@ export interface IInventoryService {
     transferItem(fromUserId: string, toUserId: string, itemId: string, uniqueId: string): Promise<void>;
     hasItemWithoutMetadataSellable(userId: string, itemId: string, amount?: number): Promise<boolean>;
     removeSellableItem(userId: string, itemId: string, amount: number): Promise<void>;
-    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number): Promise<void>;
+    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number, dataItemIndex?: number): Promise<void>;
 }
 export declare class InventoryService implements IInventoryService {
     private databaseService;
@@ -35,12 +35,12 @@ export declare class InventoryService implements IInventoryService {
     updateItemMetadata(userId: string, itemId: string, uniqueId: string, metadata: {
         [key: string]: unknown;
     }): Promise<void>;
-    removeItem(userId: string, itemId: string, amount: number): Promise<void>;
+    removeItem(userId: string, itemId: string, amount: number, dataItemIndex?: number): Promise<void>;
     removeItemByUniqueId(userId: string, itemId: string, uniqueId: string): Promise<void>;
     hasItem(userId: string, itemId: string, amount?: number): Promise<boolean>;
     hasItemWithoutMetadata(userId: string, itemId: string, amount?: number): Promise<boolean>;
     hasItemWithoutMetadataSellable(userId: string, itemId: string, amount?: number): Promise<boolean>;
     removeSellableItem(userId: string, itemId: string, amount: number): Promise<void>;
-    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number): Promise<void>;
+    removeSellableItemWithPrice(userId: string, itemId: string, amount: number, purchasePrice: number, dataItemIndex: number): Promise<void>;
     transferItem(fromUserId: string, toUserId: string, itemId: string, uniqueId: string): Promise<void>;
 }
diff --git a/dist/services/InventoryService.js b/dist/services/InventoryService.js
@@ -30,31 +30,7 @@ let InventoryService = class InventoryService {
         const correctedUserId = await this.getCorrectedUserId(userId);
         await this.inventoryRepository.deleteNonExistingItems(correctedUserId);
         const items = await this.inventoryRepository.getInventoryItems(correctedUserId);
-        items.sort((a, b) => {
-            const nameCompare = a.name?.localeCompare(b.name || '') || 0;
-            if (nameCompare !== 0)
-                return nameCompare;
-            if (!a.metadata && b.metadata)
-                return -1;
-            if (a.metadata && !b.metadata)
-                return 1;
-            return 0;
-        });
-        const processedItems = items.map((item) => ({
-            user_id: item.user_id,
-            item_id: item.item_id,
-            amount: item.amount,
-            metadata: item.metadata,
-            sellable: !!item.sellable,
-            purchasePrice: item.purchasePrice,
-            name: item.name,
-            description: item.description,
-            iconHash: item.iconHash,
-            price: item.purchasePrice,
-            rarity: item.rarity,
-            custom_url_link: item.custom_url_link
-        }));
-        return { user_id: userId, inventory: processedItems };
+        return { user_id: userId, inventory: items };
     }
     async getItemAmount(userId, itemId) {
         const correctedUserId = await this.getCorrectedUserId(userId);
@@ -72,9 +48,9 @@ let InventoryService = class InventoryService {
         const correctedUserId = await this.getCorrectedUserId(userId);
         await this.inventoryRepository.updateItemMetadata(correctedUserId, itemId, uniqueId, metadata);
     }
-    async removeItem(userId, itemId, amount) {
+    async removeItem(userId, itemId, amount, dataItemIndex) {
         const correctedUserId = await this.getCorrectedUserId(userId);
-        await this.inventoryRepository.removeItem(correctedUserId, itemId, amount);
+        await this.inventoryRepository.removeItem(correctedUserId, itemId, amount, dataItemIndex);
     }
     async removeItemByUniqueId(userId, itemId, uniqueId) {
         const correctedUserId = await this.getCorrectedUserId(userId);
@@ -99,9 +75,9 @@ let InventoryService = class InventoryService {
         await this.inventoryRepository.removeSellableItem(correctedUserId, itemId, amount);
     }
     // Nouvelle méthode pour supprimer spécifiquement les items sellable avec un prix donné
-    async removeSellableItemWithPrice(userId, itemId, amount, purchasePrice) {
+    async removeSellableItemWithPrice(userId, itemId, amount, purchasePrice, dataItemIndex) {
         const correctedUserId = await this.getCorrectedUserId(userId);
-        await this.inventoryRepository.removeSellableItemWithPrice(correctedUserId, itemId, amount, purchasePrice);
+        await this.inventoryRepository.removeSellableItemWithPrice(correctedUserId, itemId, amount, purchasePrice, dataItemIndex);
     }
     async transferItem(fromUserId, toUserId, itemId, uniqueId) {
         const correctedFromUserId = await this.getCorrectedUserId(fromUserId);
diff --git a/src/controllers/ItemController.ts b/src/controllers/ItemController.ts
@@ -464,7 +464,7 @@ export class Items {
  @httpPost("/sell/:itemId", LoggedCheck.middleware)
  public async sellItem(req: AuthenticatedRequest, res: Response) {
   const { itemId } = req.params;
-  const { amount, purchasePrice } = req.body; // Ajouter purchasePrice
+  const { amount, purchasePrice, dataItemIndex } = req.body; // Ajouter purchasePrice
   if (!itemId || isNaN(amount)) {
    await this.createLog(req, "inventory", 400, req.user?.user_id, {
     reason: "invalid_input",
@@ -513,7 +513,7 @@ export class Items {
     }
 
     // Supprimer les items avec le prix d'achat spécifique
-    await this.inventoryService.removeSellableItemWithPrice(user.user_id, itemId, amount, purchasePrice);
+    await this.inventoryService.removeSellableItemWithPrice(user.user_id, itemId, amount, purchasePrice, dataItemIndex);
 
     const sellValue = purchasePrice * amount * 0.75; // 75% du prix d'achat
     const isOwner = user.user_id === item.owner;
@@ -838,7 +838,7 @@ export class Items {
  @httpPost("/drop/:itemId", LoggedCheck.middleware)
  public async dropItem(req: AuthenticatedRequest, res: Response) {
   const { itemId } = req.params;
-  const { amount, uniqueId } = req.body;
+  const { amount, uniqueId, dataItemIndex } = req.body;
 
   if (!itemId) {
    await this.createLog(req, "inventory", 400, req.user?.user_id, {
@@ -905,7 +905,7 @@ export class Items {
      });
     }
 
-    await this.inventoryService.removeItem(user.user_id, itemId, amount);
+    await this.inventoryService.removeItem(user.user_id, itemId, amount, dataItemIndex);
     await this.createLog(req, "inventory", 200, req.user?.user_id, {
      itemId,
      action: "drop",
diff --git a/src/repositories/InventoryRepository.ts b/src/repositories/InventoryRepository.ts
diff --git a/src/services/InventoryService.ts b/src/services/InventoryService.ts
