Beginning campaign UI and WS to get player state.

server/api/campaign.get.ts

@@ -6,17 +6,15 @@ export default defineEventHandler(async (e) => {
 
     const session = await getUserSession(e);
 
-    if(!session || !session.user)
-    {
-        setResponseStatus(e, 401);
-        return;
-    }
+    if(!session || !session.user)     return setResponseStatus(e, 401);
     
-    return db.query.campaignTable.findMany({
+    const data = db.query.campaignTable.findMany({
         with: {
             members: { with: { member: { columns: { username: true, id: true } } }, columns: {  } },
             characters: { where: ({ id }) => eq(id, session.user!.id), columns: { character: true } },
-            owner: { columns: { username: true, id: true } }
+            owner: { columns: { username: true, id: true } },
         },
     }).sync();
+
+    return data.filter(e => e.owner.id === session.user!.id || e.members.find(e => e.member?.id === session.user!.id));
 });

server/api/campaign.post.ts

@@ -1,7 +1,9 @@
+import { eq } from 'drizzle-orm';
 import { z } from 'zod/v4';
 import useDatabase from '~/composables/useDatabase';
 import { campaignMembersTable, campaignTable } from '~/db/schema';
 import { CampaignValidation } from '~/shared/campaign.util';
+import { cryptURI } from '~/shared/general.util';
 
 export default defineEventHandler(async (e) => {
     const body = await readValidatedBody(e, CampaignValidation.extend({ id: z.unknown(), }).safeParse);
@@ -26,8 +28,10 @@ export default defineEventHandler(async (e) => {
                 name: body.data.name,
                 description: body.data.description,
                 owner: session.user!.id,
-                joinby: body.data.joinby,
+                link: '',
             }).returning({ id: campaignTable.id }).get().id;
+
+            tx.update(campaignTable).set({ link: cryptURI('campaign', id) }).where(eq(campaignTable.id, id)).run();
     
             tx.insert(campaignMembersTable).values({ id, rights: 'dm', user: session.user!.id }).run();
     

server/api/campaign/[id].delete.ts

@@ -20,6 +20,7 @@ export default defineEventHandler(async (e) => {
     }
     catch(_e)
     {
+        console.error(_e);
         return setResponseStatus(e, 500);
     }
 });

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

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { eq, not, sql } from 'drizzle-orm';
 import useDatabase from '~/composables/useDatabase';
 
 export default defineEventHandler(async (e) => {
@@ -19,14 +19,18 @@ export default defineEventHandler(async (e) => {
     const db = useDatabase();
     const data = db.query.campaignTable.findFirst({
         with: {
-            members: { with: { member: { columns: { username: true, id: true } } }, columns: {  } },
-            characters: { columns: { character: true } },
-            owner: { columns: { username: true, id: true } }
+            members: { with: { member: { columns: { username: true, id: true } } }, columns: {  }, where: ({ rights }) => not(eq(rights, 'dm')), extras: { 'characters': sql`NULL`.as('characters') } },
+            characters: { with: { character: { columns: { id: true, name: true, owner: true } } } },
+            owner: { columns: { username: true, id: true } },
         },
         where: ({ id: _id }) => eq(_id, parseInt(id, 10)),
     }).sync();
 
-    if(data && (data.owner === session.user.id || data.members.find(e => e.member?.id === session.user!.id))) return data;
+    if(data && (data.owner.id === session.user.id || data.members.find(e => e.member?.id === session.user!.id)))
+    {
+        data.members.forEach(e => e.characters = data.characters.filter(_e => _e.character?.owner === e.member?.id))
+        return data;
+    }
     else if(!data) return setResponseStatus(e, 404);
     else return setResponseStatus(e, 403);
 });

server/api/campaign/[id].post.ts

@@ -40,7 +40,6 @@ export default defineEventHandler(async (e) => {
             tx.update(campaignTable).set({
                 name: body.data.name,
                 description: body.data.description,
-                joinby: body.data.joinby,
             }).where(eq(campaignTable.id, id)).run();
         });
     }

server/api/campaign/[id]/join.post.ts

@@ -1,37 +0,0 @@
-import { and, eq, sql } from "drizzle-orm";
-import { campaignMembersTable, campaignTable } from "~/db/schema";
-
-export default defineEventHandler(async (e) => {
-    const _id = getRouterParam(e, "id");
-    if(!_id)
-    {
-        setResponseStatus(e, 400);
-        return;
-    }
-    const id = parseInt(_id, 10);
-
-    const session = await getUserSession(e);
-    if(!session || !session.user)
-    {
-        setResponseStatus(e, 401);
-        return;
-    }
-
-    const db = useDatabase();
-    try
-    {
-        const campaign = db.select({ owner: campaignTable.owner }).from(campaignTable).where(and(eq(campaignTable.id, sql.placeholder('id')))).get({ id: id });
-        if(campaign && campaign.owner === session.user.id)      return setResponseStatus(e, 403);
-
-        const members = db.select({ id: campaignMembersTable.user }).from(campaignMembersTable).where(and(eq(campaignMembersTable.id, sql.placeholder('id')), eq(campaignMembersTable.user, sql.placeholder('user')))).get({ id: id, user: session.user.id });
-        if(members)      return setResponseStatus(e, 403);
-
-        db.insert(campaignMembersTable).values({ id, rights: 'player', user: session.user!.id });
-        
-        return setResponseStatus(e, 200);
-    }
-    catch(_e)
-    {
-        return setResponseStatus(e, 500);
-    }
-});

server/api/campaign/[id]/leave.post.ts

@@ -1,4 +1,5 @@
 import { and, eq, sql } from "drizzle-orm";
+import useDatabase from "~/composables/useDatabase";
 import { campaignMembersTable, campaignTable } from "~/db/schema";
 
 export default defineEventHandler(async (e) => {