New SQL tables structure

server/api/character/[id].get.ts

@@ -1,7 +1,8 @@
 import { and, eq, sql } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 import { characterTable } from '~/db/schema';
-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) => {
     const id = getRouterParam(e, "id");
@@ -21,17 +22,43 @@ export default defineEventHandler(async (e) => {
     }
 
     const db = useDatabase();
-    const character = db.select({
-        id: characterTable.id,
-        name: characterTable.name,
-        progress: characterTable.progress,
-        owner: characterTable.owner,
-        visibility: characterTable.visibility,
-    }).from(characterTable).where(and(eq(characterTable.id, id), eq(characterTable.owner, session.user.id))).get();
+    const character = db.query.characterTable.findFirst({
+        with: {
+            abilities: true,
+            levels: true,
+            modifiers: true,
+            spells: true,
+            training: true,
+            user: {
+                columns: { username: true }
+            }
+        },
+        where: (character, { eq, and }) => and(eq(character.id, parseInt(id, 10)), eq(characterTable.owner, session.user!.id)),
+    }).sync();
 
     if(character !== undefined)
     {
-        return character as Character;
+        return {
+            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);