From b62b62f4866bfed95350f71e9db3224d9dc04e18 Mon Sep 17 00:00:00 2001
From: Sainan <sainan@calamity.inc>
Date: Wed, 5 Mar 2025 05:28:05 +0100
Subject: [PATCH] fix response for decos aborted

---
 src/controllers/api/abortDojoComponentController.ts | 2 +-
 src/services/guildService.ts                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controllers/api/abortDojoComponentController.ts b/src/controllers/api/abortDojoComponentController.ts
index 76db786a..02c69cec 100644
--- a/src/controllers/api/abortDojoComponentController.ts
+++ b/src/controllers/api/abortDojoComponentController.ts
@@ -17,7 +17,7 @@ export const abortDojoComponentController: RequestHandler = async (req, res) =>
     }
 
     await guild.save();
-    res.json(getDojoClient(guild, 0));
+    res.json(getDojoClient(guild, 0, request.ComponentId));
 };
 
 interface IAbortDojoComponentRequest {
diff --git a/src/services/guildService.ts b/src/services/guildService.ts
index 12c45a3c..19a273f2 100644
--- a/src/services/guildService.ts
+++ b/src/services/guildService.ts
@@ -32,7 +32,7 @@ export const getGuildForRequestEx = async (
 export const getDojoClient = (
     guild: TGuildDatabaseDocument,
     status: number,
-    componentId: Types.ObjectId | undefined = undefined
+    componentId: Types.ObjectId | string | undefined = undefined
 ): IDojoClient => {
     const dojo: IDojoClient = {
         _id: { $oid: guild._id.toString() },
@@ -47,7 +47,7 @@ export const getDojoClient = (
         DojoComponents: []
     };
     guild.DojoComponents.forEach(dojoComponent => {
-        if (!componentId || componentId == dojoComponent._id) {
+        if (!componentId || dojoComponent._id.equals(componentId)) {
             const clientComponent: IDojoComponentClient = {
                 id: toOid(dojoComponent._id),
                 pf: dojoComponent.pf,