From ce75d8fab6ac9c4ccd1c8acbbfff19c06545e9ba Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Fri, 20 Oct 2023 17:33:22 +0100
Subject: [PATCH] Add quantity claimed to drop embed (#61)

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Add the quantity which the user has claimed to the drop embed

#37

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

- This has been tested by running the command for a card which has no claimed card and ensure it says 0
- Then reran the command for that card and ensured it says 1

# Checklist

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/61
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>
---
 src/buttonEvents/Reroll.ts | 10 +++++++++-
 src/commands/drop.ts       | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts
index bc91c90..7e37a81 100644
--- a/src/buttonEvents/Reroll.ts
+++ b/src/buttonEvents/Reroll.ts
@@ -6,6 +6,7 @@ import { CardRarityToColour, CardRarityToString } from "../constants/CardRarity"
 import { v4 } from "uuid";
 import { CoreClient } from "../client/client";
 import Card from "../database/entities/card/Card";
+import Inventory from "../database/entities/app/Inventory";
 
 export default class Reroll extends ButtonEvent {
     public override async execute(interaction: ButtonInteraction) {
@@ -32,9 +33,16 @@ export default class Reroll extends ButtonEvent {
 
         const attachment = new AttachmentBuilder(image, { name: randomCard.FileName });
 
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.CardNumber);
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+        let embedDescription = "";
+        embedDescription += `Series: ${randomCard.Series.Name}\n`;
+        embedDescription += `Claimed: ${quantityClaimed || 0}\n`;
+
         const embed = new EmbedBuilder()
             .setTitle(randomCard.Name)
-            .setDescription(randomCard.Series.Name)
+            .setDescription(embedDescription)
             .setFooter({ text: CardRarityToString(randomCard.Rarity) })
             .setColor(CardRarityToColour(randomCard.Rarity))
             .setImage(`attachment://${randomCard.FileName}`);
diff --git a/src/commands/drop.ts b/src/commands/drop.ts
index 7503bf7..260f58e 100644
--- a/src/commands/drop.ts
+++ b/src/commands/drop.ts
@@ -6,6 +6,7 @@ import { readFileSync } from "fs";
 import { CoreClient } from "../client/client";
 import { v4 } from "uuid";
 import Card from "../database/entities/card/Card";
+import Inventory from "../database/entities/app/Inventory";
 
 export default class Drop extends Command {
     constructor() {
@@ -38,9 +39,16 @@ export default class Drop extends Command {
 
         const attachment = new AttachmentBuilder(image, { name: randomCard.FileName });
 
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.CardNumber);
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+        let embedDescription = "";
+        embedDescription += `Series: ${randomCard.Series.Name}\n`;
+        embedDescription += `Claimed: ${quantityClaimed || 0}\n`;
+
         const embed = new EmbedBuilder()
             .setTitle(randomCard.Name)
-            .setDescription(randomCard.Series.Name)
+            .setDescription(embedDescription)
             .setFooter({ text: CardRarityToString(randomCard.Rarity) })
             .setColor(CardRarityToColour(randomCard.Rarity))
             .setImage(`attachment://${randomCard.FileName}`);