refactor(api): 🎨 Move User methods into their own class similar to Note

tests/api/accounts.test.ts

@@ -72,7 +72,7 @@ describe("API Tests", () => {
 
             const account = (await response.json()) as APIAccount;
 
-            expect(account.username).toBe(user.username);
+            expect(account.username).toBe(user.getUser().username);
             expect(account.bot).toBe(false);
             expect(account.locked).toBe(false);
             expect(account.created_at).toBeDefined();
@@ -81,7 +81,10 @@ describe("API Tests", () => {
             expect(account.statuses_count).toBe(0);
             expect(account.note).toBe("");
             expect(account.url).toBe(
-                new URL(`/@${user.username}`, config.http.base_url).toString(),
+                new URL(
+                    `/@${user.getUser().username}`,
+                    config.http.base_url,
+                ).toString(),
             );
             expect(account.avatar).toBeDefined();
             expect(account.avatar_static).toBeDefined();

tests/oauth.test.ts

@@ -61,7 +61,7 @@ describe("POST /api/auth/login/", () => {
     test("should get a JWT", async () => {
         const formData = new FormData();
 
-        formData.append("email", users[0]?.email ?? "");
+        formData.append("email", users[0]?.getUser().email ?? "");
         formData.append("password", passwords[0]);
 
         const response = await sendTestRequest(

tests/utils.ts

@@ -1,15 +1,12 @@
 import { randomBytes } from "node:crypto";
 import { asc, inArray, like } from "drizzle-orm";
 import type { Status } from "~database/entities/Status";
-import {
-    type User,
-    type UserWithRelations,
-    createNewLocalUser,
-} from "~database/entities/User";
+import { createNewLocalUser } from "~database/entities/User";
 import { db } from "~drizzle/db";
 import { Notes, Tokens, Users } from "~drizzle/schema";
 import { server } from "~index";
 import { Note } from "~packages/database-interface/note";
+import type { User } from "~packages/database-interface/user";
 /**
  * This allows us to send a test request to the server even when it isnt running
  * CURRENTLY NOT WORKING, NEEDS TO BE FIXED
@@ -30,7 +27,7 @@ export const deleteOldTestUsers = async () => {
 };
 
 export const getTestUsers = async (count: number) => {
-    const users: UserWithRelations[] = [];
+    const users: User[] = [];
     const passwords: string[] = [];
 
     for (let i = 0; i < count; i++) {