From e1e363b340ce6f37271917c17de2794a035fb323 Mon Sep 17 00:00:00 2001 From: Sainan Date: Wed, 12 Feb 2025 01:49:14 +0100 Subject: [PATCH] add TGuildDatabaseDocument --- src/services/guildService.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/services/guildService.ts b/src/services/guildService.ts index 1fcddad4..07d06b81 100644 --- a/src/services/guildService.ts +++ b/src/services/guildService.ts @@ -3,14 +3,19 @@ import { getAccountIdForRequest } from "@/src/services/loginService"; import { getInventory } from "@/src/services/inventoryService"; import { Guild } from "@/src/models/guildModel"; import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel"; +import { IGuildDatabase } from "@/src/types/guildTypes"; +import { Document, Types } from "mongoose"; -export const getGuildForRequest = async (req: Request) => { +export const getGuildForRequest = async (req: Request): Promise => { const accountId = await getAccountIdForRequest(req); const inventory = await getInventory(accountId); return await getGuildForRequestEx(req, inventory); }; -export const getGuildForRequestEx = async (req: Request, inventory: TInventoryDatabaseDocument) => { +export const getGuildForRequestEx = async ( + req: Request, + inventory: TInventoryDatabaseDocument +): Promise => { const guildId = req.query.guildId as string; if (!inventory.GuildId || inventory.GuildId.toString() != guildId) { throw new Error("Account is not in the guild that it has sent a request for"); @@ -21,3 +26,12 @@ export const getGuildForRequestEx = async (req: Request, inventory: TInventoryDa } return guild; }; + +// eslint-disable-next-line @typescript-eslint/ban-types +type TGuildDatabaseDocument = Document & + IGuildDatabase & + Required<{ + _id: Types.ObjectId; + }> & { + __v: number; + };