refactor(types): PSA types

move to shared types (#4774) add types to ape client (#4786)
monkeytypegame · Feb 7, 2024 · 65120db · 65120db
1 parent f456e1e
commit 65120db
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/backend/src/dal/psa.ts b/backend/src/dal/psa.ts
@@ -1,5 +1,7 @@
 import * as db from "../init/db";
 
-export async function get(): Promise<MonkeyTypes.PSA[]> {
-  return await db.collection<MonkeyTypes.PSA>("psa").find().toArray();
+type PSA = MonkeyTypes.WithObjectId<SharedTypes.PSA>;
+
+export async function get(): Promise<PSA[]> {
+  return await db.collection<PSA>("psa").find().toArray();
 }
diff --git a/backend/src/types/types.d.ts b/backend/src/types/types.d.ts
@@ -185,12 +185,6 @@ declare namespace MonkeyTypes {
     approved: boolean;
   }
 
-  interface PSA {
-    sticky?: boolean;
-    message: string;
-    level?: number;
-  }
-
   type ReportTypes = "quote" | "user";
 
   interface Report {

diff --git a/frontend/src/ts/ape/endpoints/psas.ts b/frontend/src/ts/ape/endpoints/psas.ts
@@ -5,7 +5,7 @@ export default class Psas {
     this.httpClient = httpClient;
   }
 
-  async get(): Ape.EndpointResponse {
+  async get(): Ape.EndpointResponse<SharedTypes.PSA[]> {
     return await this.httpClient.get(BASE_PATH);
   }
 }
diff --git a/frontend/src/ts/elements/psa.ts b/frontend/src/ts/elements/psa.ts
@@ -18,7 +18,7 @@ function setMemory(id: string): void {
   window.localStorage.setItem("confirmedPSAs", JSON.stringify(list));
 }
 
-async function getLatest(): Promise<MonkeyTypes.PSA[] | null> {
+async function getLatest(): Promise<SharedTypes.PSA[] | null> {
   const response = await Ape.psas.get();
 
   if (response.status === 500) {
@@ -54,7 +54,7 @@ async function getLatest(): Promise<MonkeyTypes.PSA[] | null> {
   } else if (response.status !== 200) {
     return null;
   }
-  return response.data as MonkeyTypes.PSA[];
+  return response.data;
 }
 
 export async function show(): Promise<void> {

diff --git a/frontend/src/ts/types/types.d.ts b/frontend/src/ts/types/types.d.ts
@@ -647,14 +647,6 @@ declare namespace MonkeyTypes {
     textSplit?: string[];
   }
 
-  interface PSA {
-    sticky?: boolean;
-    message: string;
-    _id: string;
-    level?: number;
-    date?: number;
-  }
-
   interface ThemeColors {
     bg: string;
     main: string;

diff --git a/shared-types/types.d.ts b/shared-types/types.d.ts
@@ -318,4 +318,12 @@ declare namespace SharedTypes {
       none?: boolean;
     } & Record<string, boolean>;
   }
+
+  interface PSA {
+    _id: string;
+    message: string;
+    sticky?: boolean;
+    level?: number;
+    date?: number;
+  }
 }