From ffdf2eb04c07c6d26fe79832a0e363cf3b7b5937 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sat, 12 Oct 2024 20:51:22 +0100
Subject: [PATCH] Fix Trade command not giving a card if they don't already
 have it in their inventory

---
 src/buttonEvents/Trade.ts              | 12 ++++++------
 src/database/entities/app/Inventory.ts |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/buttonEvents/Trade.ts b/src/buttonEvents/Trade.ts
index d0d7b38..ef0d1c5 100644
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@@ -72,8 +72,8 @@ export default class Trade extends ButtonEvent {
             return;
         }
 
-        user1UserInventory1.SetQuantity(user1UserInventory1.Quantity - 1);
-        user2UserInventory1.SetQuantity(user2UserInventory1.Quantity - 1);
+        user1UserInventory1.RemoveQuantity(1);
+        user2UserInventory1.RemoveQuantity(1);
 
         await user1UserInventory1.Save(Inventory, user1UserInventory1);
         await user2UserInventory1.Save(Inventory, user2UserInventory1);
@@ -82,15 +82,15 @@ export default class Trade extends ButtonEvent {
         let user2UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user1CardNumber);
 
         if (!user1UserInventory2) {
-            user1UserInventory2 = new Inventory(user1UserId, user1CardNumber, 1);
+            user1UserInventory2 = new Inventory(user1UserId, user2CardNumber, 1);
         } else {
-            user1UserInventory2.SetQuantity(user1UserInventory2.Quantity + 1);
+            user1UserInventory2.AddQuantity(1);
         }
 
         if (!user2UserInventory2) {
-            user2UserInventory2 = new Inventory(user2UserId, user2CardNumber, 1);
+            user2UserInventory2 = new Inventory(user2UserId, user1CardNumber, 1);
         } else {
-            user2UserInventory2.SetQuantity(user2UserInventory2.Quantity + 1);
+            user2UserInventory2.AddQuantity(1);
         }
 
         await user1UserInventory2.Save(Inventory, user1UserInventory2);
diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts
index 7d659fe..469cbdc 100644
--- a/src/database/entities/app/Inventory.ts
+++ b/src/database/entities/app/Inventory.ts
@@ -29,6 +29,10 @@ export default class Inventory extends AppBaseEntity {
         this.Quantity = quantity;
     }
 
+    public AddQuantity(amount: number) {
+        this.Quantity += amount;
+    }
+
     public RemoveQuantity(amount: number) {
         if (this.Quantity < amount) return;