rename accountId to ownerId

src/controllers/custom/deleteAccountController.ts

@@ -18,7 +18,7 @@ export const deleteAccountController: RequestHandler = async (req, res) => {
         GuildMember.deleteMany({ accountId: accountId }),
         Inbox.deleteMany({ ownerId: accountId }),
         Inventory.deleteOne({ accountOwnerId: accountId }),
-        Leaderboard.deleteMany({ accountId: accountId }),
+        Leaderboard.deleteMany({ ownerId: accountId }),
         Loadout.deleteOne({ loadoutOwnerId: accountId }),
         PersonalRooms.deleteOne({ personalRoomsOwnerId: accountId }),
         Ship.deleteMany({ ShipOwnerId: accountId }),

src/models/leaderboardModel.ts

@@ -5,7 +5,7 @@ const leaderboardEntrySchema = new Schema<ILeaderboardEntryDatabase>(
     {
         leaderboard: { type: String, required: true },
         displayName: { type: String, required: true },
-        accountId: { type: Schema.Types.ObjectId, required: true },
+        ownerId: { type: Schema.Types.ObjectId, required: true },
         score: { type: Number, required: true },
         expiry: { type: Date, required: true }
     },

src/services/leaderboardService.ts

@@ -3,7 +3,7 @@ import { ILeaderboardEntryClient } from "../types/leaderboardTypes";
 
 export const submitLeaderboardScore = async (
     leaderboard: string,
-    accountId: string,
+    ownerId: string,
     displayName: string,
     score: number
 ): Promise<void> => {
@@ -21,7 +21,7 @@ export const submitLeaderboardScore = async (
     }
     await Leaderboard.findOneAndUpdate(
         { leaderboard, displayName },
-        { $max: { score }, $set: { accountId, expiry } },
+        { $max: { score }, $set: { ownerId, expiry } },
         { upsert: true }
     );
 };
@@ -35,7 +35,7 @@ export const getLeaderboard = async (
     let entries: TLeaderboardEntryDocument[];
     let r: number;
     if (pivotId) {
-        const pivotDoc = await Leaderboard.findOne({ leaderboard, accountId: pivotId });
+        const pivotDoc = await Leaderboard.findOne({ leaderboard, ownerId: pivotId });
         if (!pivotDoc) {
             return [];
         }
@@ -67,7 +67,7 @@ export const getLeaderboard = async (
     const res: ILeaderboardEntryClient[] = [];
     for (const entry of entries) {
         res.push({
-            _id: entry.accountId.toString(),
+            _id: entry.ownerId.toString(),
             s: entry.score,
             r: ++r,
             n: entry.displayName

src/types/leaderboardTypes.ts

@@ -2,14 +2,14 @@ import { Types } from "mongoose";
 
 export interface ILeaderboardEntryDatabase {
     leaderboard: string;
-    accountId: Types.ObjectId;
     displayName: string;
+    ownerId: Types.ObjectId;
     score: number;
     expiry: Date;
 }
 
 export interface ILeaderboardEntryClient {
-    _id: string; // player id
+    _id: string; // owner id
     s: number; // score
     r: number; // rank
     n: string; // displayName