New SQL tables structure

server/api/character.get.ts

@@ -1,8 +1,9 @@
-import { and, eq, sql } from 'drizzle-orm';
+import { and, eq, SQL, sql, type Operators } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 import { characterTable, userPermissionsTable } from '~/db/schema';
 import { hasPermissions } from '~/shared/auth.util';
-import type { Character } from '~/types/character';
+import { group } from '~/shared/general.util';
+import type { Character, DoubleIndex, Level, MainStat, TrainingLevel } from '~/types/character';
 
 export default defineEventHandler(async (e) => {
     let { visibility } = getQuery(e) as { visibility?: "public" | "own" | "admin" };
@@ -12,6 +13,9 @@ export default defineEventHandler(async (e) => {
         visibility = "own";
     }
 
+    let where: ((character: typeof characterTable._.config.columns, sql: Operators) => SQL | undefined) | undefined = undefined;
+    const db = useDatabase();
+
     if(visibility === "own")
     {
         const session = await getUserSession(e);
@@ -20,34 +24,12 @@ export default defineEventHandler(async (e) => {
             setResponseStatus(e, 401);
             return;
         }
-        
-        const db = useDatabase();
-        const characters = db.select({
-            id: characterTable.id,
-            name: characterTable.name,
-            progress: characterTable.progress,
-            visibility: characterTable.visibility,
-        }).from(characterTable).where(eq(characterTable.owner, session.user.id)).all();
 
-        if(characters !== undefined)
-        {
-            return characters as Character[];
-        }
+        where = (character, { eq, and }) => and(eq(character.owner, session.user!.id), eq(character.visibility, "private"));
     }
     else if(visibility === 'public')
     {
-        const db = useDatabase();
-        const characters = db.select({
-            id: characterTable.id,
-            name: characterTable.name,
-            progress: characterTable.progress,
-            visibility: characterTable.visibility,
-        }).from(characterTable).where(eq(characterTable.visibility, "public")).all();
-
-        if(characters !== undefined)
-        {
-            return characters as Character[];
-        }
+        where = (character, { eq, and }) => eq(character.visibility, "public");
     }
     else if(visibility === 'admin')
     {
@@ -66,17 +48,46 @@ export default defineEventHandler(async (e) => {
             return;
         }
 
-        const characters = db.select({
-            id: characterTable.id,
-            name: characterTable.name,
-            progress: characterTable.progress,
-            visibility: characterTable.visibility,
-        }).from(characterTable).all();
+        where = undefined;
+    }
+    
+    const characters = db.query.characterTable.findMany({
+        with: {
+            abilities: true,
+            levels: true,
+            modifiers: true,
+            spells: true,
+            training: true,
+            user: {
+                columns: { username: true }
+            }
+        },
+        where: where,
+    }).sync();
 
-        if(characters !== undefined)
-        {
-            return characters as Character[];
-        }
+    if(characters !== undefined)
+    {
+        return characters.map(character => ({
+            id: character.id,
+
+            name: character.name,
+            people: character.people,
+            level: character.level,
+            aspect: character.aspect,
+            notes: character.notes,
+            health: character.health,
+            mana: character.mana,
+
+            training: character.training.reduce((p, v) => { if(!(v.stat in p)) p[v.stat] = []; p[v.stat].push([v.level as TrainingLevel, v.choice]); return p; }, {} as Record<MainStat, DoubleIndex<TrainingLevel>[]>),
+            leveling: character.levels.map(e => [e.level as Level, e.choice] as DoubleIndex<Level>),
+            abilities: group(character.abilities.map(e => ({ ...e, value: [e.value, e.max] as [number, number] })), "ability", "value"),
+            spells: character.spells.map(e => e.value),
+            modifiers: group(character.modifiers, "modifier", "value"),
+
+            owner: character.owner,
+            username: character.user.username,
+            visibility: character.visibility,
+        } as Character));
     }
     
     setResponseStatus(e, 404);