From 807c87d4243130e7d1c67ae6bc43f67430daa47a Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 12 Jul 2024 17:33:09 +0100 Subject: [PATCH] Fix quantity checker not factoring in entities with 0 count --- src/database/entities/app/Inventory.ts | 8 -------- src/helpers/ImageHelper.ts | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index a0aee18..7d659fe 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -47,14 +47,6 @@ export default class Inventory extends AppBaseEntity { return single; } - public static async ExistsByCardNumberAndUserId(userId: string, cardNumber: string): Promise { - const repository = AppDataSource.getRepository(Inventory); - - const count = await repository.count({ where: { UserId: userId, CardNumber: cardNumber }}); - - return count != 0; - } - public static async FetchAllByUserId(userId: string): Promise { const repository = AppDataSource.getRepository(Inventory); diff --git a/src/helpers/ImageHelper.ts b/src/helpers/ImageHelper.ts index 3a04b92..3b64dd5 100644 --- a/src/helpers/ImageHelper.ts +++ b/src/helpers/ImageHelper.ts @@ -39,9 +39,9 @@ export default class ImageHelper { const imageData = await Jimp.read(filePath); if (userId != null) { - const claimed = await Inventory.ExistsByCardNumberAndUserId(userId, card.id); + const claimed = await Inventory.FetchOneByCardNumberAndUserId(userId, card.id); - if (!claimed) { + if (!claimed || claimed.Quantity == 0) { imageData.greyscale(); } }