From 621067c50a0d5f36e30febd63c38856a44845b0e Mon Sep 17 00:00:00 2001 From: Sainan Date: Mon, 24 Mar 2025 14:30:08 +0100 Subject: [PATCH] chore: use model.findById where possible --- src/controllers/api/addToGuildController.ts | 2 +- src/controllers/api/confirmGuildInvitationController.ts | 2 +- src/controllers/api/contributeGuildClassController.ts | 2 +- src/controllers/api/getGuildController.ts | 2 +- src/controllers/api/getGuildDojoController.ts | 2 +- src/controllers/api/getGuildLogController.ts | 2 +- src/controllers/api/logoutController.ts | 2 +- src/controllers/api/removeFromGuildController.ts | 2 +- src/controllers/api/setGuildMotdController.ts | 2 +- src/controllers/custom/getAccountInfoController.ts | 2 +- src/controllers/dynamic/getProfileViewingDataController.ts | 6 +++--- src/services/guildService.ts | 2 +- src/services/inboxService.ts | 2 +- src/services/shipService.ts | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/controllers/api/addToGuildController.ts b/src/controllers/api/addToGuildController.ts index 0d24cd00..ee1c0fc4 100644 --- a/src/controllers/api/addToGuildController.ts +++ b/src/controllers/api/addToGuildController.ts @@ -18,7 +18,7 @@ export const addToGuildController: RequestHandler = async (req, res) => { return; } - const guild = (await Guild.findOne({ _id: payload.GuildId.$oid }, "Name"))!; + const guild = (await Guild.findById(payload.GuildId.$oid, "Name"))!; const senderAccount = await getAccountForRequest(req); if (!(await hasGuildPermission(guild, senderAccount._id.toString(), GuildPermission.Recruiter))) { res.status(400).json("Invalid permission"); diff --git a/src/controllers/api/confirmGuildInvitationController.ts b/src/controllers/api/confirmGuildInvitationController.ts index 7331af03..2685be99 100644 --- a/src/controllers/api/confirmGuildInvitationController.ts +++ b/src/controllers/api/confirmGuildInvitationController.ts @@ -19,7 +19,7 @@ export const confirmGuildInvitationController: RequestHandler = async (req, res) new Types.ObjectId(req.query.clanId as string) ); - const guild = (await Guild.findOne({ _id: req.query.clanId as string }))!; + const guild = (await Guild.findById(req.query.clanId as string))!; guild.RosterActivity ??= []; guild.RosterActivity.push({ diff --git a/src/controllers/api/contributeGuildClassController.ts b/src/controllers/api/contributeGuildClassController.ts index 629ec2ff..854f5223 100644 --- a/src/controllers/api/contributeGuildClassController.ts +++ b/src/controllers/api/contributeGuildClassController.ts @@ -11,7 +11,7 @@ import { Types } from "mongoose"; export const contributeGuildClassController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); const payload = getJSONfromString(String(req.body)); - const guild = (await Guild.findOne({ _id: payload.GuildId }))!; + const guild = (await Guild.findById(payload.GuildId))!; // First contributor initiates ceremony and locks the pending class. if (!guild.CeremonyContributors) { diff --git a/src/controllers/api/getGuildController.ts b/src/controllers/api/getGuildController.ts index 37a9ed26..8a803bfe 100644 --- a/src/controllers/api/getGuildController.ts +++ b/src/controllers/api/getGuildController.ts @@ -9,7 +9,7 @@ const getGuildController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); const inventory = await getInventory(accountId, "GuildId"); if (inventory.GuildId) { - const guild = await Guild.findOne({ _id: inventory.GuildId }); + const guild = await Guild.findById(inventory.GuildId); if (guild) { // Handle guilds created before we added discriminators if (guild.Name.indexOf("#") == -1) { diff --git a/src/controllers/api/getGuildDojoController.ts b/src/controllers/api/getGuildDojoController.ts index d03252d8..3c48a4f4 100644 --- a/src/controllers/api/getGuildDojoController.ts +++ b/src/controllers/api/getGuildDojoController.ts @@ -6,7 +6,7 @@ import { getDojoClient } from "@/src/services/guildService"; export const getGuildDojoController: RequestHandler = async (req, res) => { const guildId = req.query.guildId as string; - const guild = await Guild.findOne({ _id: guildId }); + const guild = await Guild.findById(guildId); if (!guild) { res.status(404).end(); return; diff --git a/src/controllers/api/getGuildLogController.ts b/src/controllers/api/getGuildLogController.ts index a0386e76..037d07be 100644 --- a/src/controllers/api/getGuildLogController.ts +++ b/src/controllers/api/getGuildLogController.ts @@ -9,7 +9,7 @@ export const getGuildLogController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); const inventory = await getInventory(accountId, "GuildId"); if (inventory.GuildId) { - const guild = await Guild.findOne({ _id: inventory.GuildId }); + const guild = await Guild.findById(inventory.GuildId); if (guild) { const log: Record = { RoomChanges: [], diff --git a/src/controllers/api/logoutController.ts b/src/controllers/api/logoutController.ts index 735014d4..f6f8863f 100644 --- a/src/controllers/api/logoutController.ts +++ b/src/controllers/api/logoutController.ts @@ -4,7 +4,7 @@ import { Account } from "@/src/models/loginModel"; const logoutController: RequestHandler = async (req, res) => { const accountId = await getAccountIdForRequest(req); - const account = await Account.findOne({ _id: accountId }); + const account = await Account.findById(accountId); if (account) { account.Nonce = 0; await account.save(); diff --git a/src/controllers/api/removeFromGuildController.ts b/src/controllers/api/removeFromGuildController.ts index 3a794634..352c58d3 100644 --- a/src/controllers/api/removeFromGuildController.ts +++ b/src/controllers/api/removeFromGuildController.ts @@ -42,7 +42,7 @@ export const removeFromGuildController: RequestHandler = async (req, res) => { guild.RosterActivity ??= []; if (isKick) { - const kickee = (await Account.findOne({ _id: payload.userId }))!; + const kickee = (await Account.findById(payload.userId))!; guild.RosterActivity.push({ dateTime: new Date(), entryType: 12, diff --git a/src/controllers/api/setGuildMotdController.ts b/src/controllers/api/setGuildMotdController.ts index e0eb2aac..374ae0f1 100644 --- a/src/controllers/api/setGuildMotdController.ts +++ b/src/controllers/api/setGuildMotdController.ts @@ -8,7 +8,7 @@ import { RequestHandler } from "express"; export const setGuildMotdController: RequestHandler = async (req, res) => { const account = await getAccountForRequest(req); const inventory = await getInventory(account._id.toString(), "GuildId"); - const guild = (await Guild.findOne({ _id: inventory.GuildId! }))!; + const guild = (await Guild.findById(inventory.GuildId!))!; if (!(await hasGuildPermission(guild, account._id, GuildPermission.Herald))) { res.status(400).json("Invalid permission"); return; diff --git a/src/controllers/custom/getAccountInfoController.ts b/src/controllers/custom/getAccountInfoController.ts index 41e59a77..5d83b56b 100644 --- a/src/controllers/custom/getAccountInfoController.ts +++ b/src/controllers/custom/getAccountInfoController.ts @@ -12,7 +12,7 @@ export const getAccountInfoController: RequestHandler = async (req, res) => { } const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank"); if (guildMember) { - const guild = (await Guild.findOne({ _id: guildMember.guildId }, "Ranks"))!; + const guild = (await Guild.findById(guildMember.guildId, "Ranks"))!; info.GuildId = guildMember.guildId.toString(); info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions; } diff --git a/src/controllers/dynamic/getProfileViewingDataController.ts b/src/controllers/dynamic/getProfileViewingDataController.ts index 9e9c764f..b02189d0 100644 --- a/src/controllers/dynamic/getProfileViewingDataController.ts +++ b/src/controllers/dynamic/getProfileViewingDataController.ts @@ -26,13 +26,13 @@ export const getProfileViewingDataController: RequestHandler = async (req, res) res.status(400).end(); return; } - const account = await Account.findOne({ _id: req.query.playerId as string }, "DisplayName"); + const account = await Account.findById(req.query.playerId as string, "DisplayName"); if (!account) { res.status(400).send("No account or guild ID specified"); return; } const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!; - const loadout = (await Loadout.findOne({ _id: inventory.LoadOutPresets }, "NORMAL"))!; + const loadout = (await Loadout.findById(inventory.LoadOutPresets, "NORMAL"))!; const result: IPlayerProfileViewingDataResult = { AccountId: toOid(account._id), @@ -88,7 +88,7 @@ export const getProfileViewingDataController: RequestHandler = async (req, res) } } if (inventory.GuildId) { - const guild = (await Guild.findOne({ _id: inventory.GuildId }, "Name Tier XP Class"))!; + const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class"))!; result.GuildId = toOid(inventory.GuildId); result.GuildName = guild.Name; result.GuildTier = guild.Tier; diff --git a/src/services/guildService.ts b/src/services/guildService.ts index 5b00b622..0237cd2b 100644 --- a/src/services/guildService.ts +++ b/src/services/guildService.ts @@ -37,7 +37,7 @@ export const getGuildForRequestEx = async ( if (!inventory.GuildId || inventory.GuildId.toString() != guildId) { throw new Error("Account is not in the guild that it has sent a request for"); } - const guild = await Guild.findOne({ _id: guildId }); + const guild = await Guild.findById(guildId); if (!guild) { throw new Error("Account thinks it is in a guild that doesn't exist"); } diff --git a/src/services/inboxService.ts b/src/services/inboxService.ts index fa7a3812..49b5cca3 100644 --- a/src/services/inboxService.ts +++ b/src/services/inboxService.ts @@ -11,7 +11,7 @@ export const getAllMessagesSorted = async (accountId: string): Promise> => { - const message = await Inbox.findOne({ _id: messageId }); + const message = await Inbox.findById(messageId); if (!message) { throw new Error(`Message not found ${messageId}`); diff --git a/src/services/shipService.ts b/src/services/shipService.ts index cc97d52d..7552fb97 100644 --- a/src/services/shipService.ts +++ b/src/services/shipService.ts @@ -21,7 +21,7 @@ export const createShip = async ( }; export const getShip = async (shipId: Types.ObjectId, fieldSelection: string = ""): Promise => { - const ship = await Ship.findOne({ _id: shipId }, fieldSelection); + const ship = await Ship.findById(shipId, fieldSelection); if (!ship) { throw new Error(`error finding a ship with id ${shipId.toString()}`);