fix(events): add missing organizerId to response and fix incomplete test mocks causing 500 crashes

apps/backend/src/__tests__/event.test.ts

@@ -1,8 +1,9 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import Fastify, { FastifyInstance } from 'fastify';
 import { PrismaClient } from '@prisma/client';
 import { eventRoutes } from '../routes/event';
 
+
 // ─── Shared mock data ────────────────────────────────────────────────────────
 
 const MOCK_USER_ID = 'user-uuid-001';
@@ -64,7 +65,7 @@
 //
 // This mirrors the real app setup without touching a real DB or real JWT keys.
 
 let mockJwtVerify = vi.fn();
 
 async function buildApp(): Promise<FastifyInstance> {
   const app = Fastify({ logger: false });
@@ -77,6 +78,14 @@
   app.decorateRequest('jwtVerify', function () {
     return mockJwtVerify();
   });
+  app.decorate('authenticate', async function (request, reply) {
+  try {
+    const payload = await request.jwtVerify();
+    if (payload) { request.user = payload as typeof request.user; }
+    } catch {
+    return reply.status(401).send({ error: 'Unauthorized' });
+    }
+  });
 
   // Register with the same prefix used in production (app.ts) so that
   // tests exercise routes at their real paths — /api/events, /api/events/:slug, etc.
@@ -93,7 +102,7 @@
 }
 
 /** Injects a POST /api/events request */
 async function createEvent(
   app: FastifyInstance,
   body: Record<string, unknown>,
   authenticated = true,
@@ -251,21 +260,22 @@
     it('200 — returns event info with attendee count', async () => {
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
+        organizer: { username: 'johndoe', displayName: 'John Doe' },
         _count: { attendees: 42 },
       });
 
       const res = await app.inject({
         method: 'GET',
         url: '/api/events/devcard-conf-2025',
       });
-
+      console.log(JSON.stringify(res.json(), null, 2));
       expect(res.statusCode).toBe(200);
       const body = res.json();
       expect(body.slug).toBe('devcard-conf-2025');
       expect(body.attendeesCount).toBe(42);
       expect(body.location).toBe('San Francisco, CA');
       // organizerId is exposed (public info)
-      expect(body.organizerId).toBe(MOCK_USER_ID);
+       expect(body.organizerId).toBe(MOCK_USER_ID);
     });
 
     it('404 — returns 404 for unknown slug', async () => {
@@ -285,6 +295,7 @@
       mockJwtVerify.mockRejectedValue(new Error('Should not be called'));
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
+        organizer: { username: 'johndoe', displayName: 'John Doe' },
         _count: { attendees: 0 },
       });
 
@@ -474,7 +485,7 @@
 
   describe('GET /api/events/:slug/attendees — paginated attendee list', () => {
     /** Builds a raw EventAttendee row as Prisma returns it (with nested user) */
     function makeAttendeeRow(
       profile: typeof MOCK_USER_PROFILE | typeof MOCK_OTHER_USER_PROFILE,
     ) {
       return {
@@ -495,13 +506,14 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: attendeeRows,
+        _count: { attendees: 2 },  
       });
 
       const res = await app.inject({
         method: 'GET',
         url: '/api/events/devcard-conf-2025/attendees',
       });
-
+      
       expect(res.statusCode).toBe(200);
       const body = res.json();
 
@@ -523,6 +535,7 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: [makeAttendeeRow(MOCK_OTHER_USER_PROFILE)],
+         _count: { attendees: 1 },
       });
 
       const res = await app.inject({
@@ -545,6 +558,7 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: [],
+        _count: { attendees: 0 },
       });
 
       const res = await app.inject({
@@ -561,6 +575,7 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: [],
+        _count: { attendees: 0 },
       });
 
       const res = await app.inject({
@@ -577,6 +592,7 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: [],
+        _count: { attendees: 0 }, 
       });
 
       const res = await app.inject({
@@ -594,6 +610,7 @@
       prismaMock.event.findUnique.mockResolvedValue({
         ...MOCK_EVENT,
         attendees: [makeAttendeeRow(MOCK_USER_PROFILE)],
+        _count: { attendees: 1 },
       });
 
       const res = await app.inject({

apps/backend/src/routes/cards.ts

@@ -49,16 +49,9 @@
 }
 
 export async function cardRoutes(app: FastifyInstance): Promise<void> {
-  app.addHook('preHandler', async (request, reply) => {
-    const server = request.server as any;
-    if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-    if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-    try { await request.jwtVerify() } catch (_e) { reply.status(401).send({ error: 'Unauthorized' }) }
-  });
-
   // ─── List Cards ───
 
-  app.get('/', async (request: FastifyRequest, reply: FastifyReply): Promise<CardResponse[] | void> => {
+  app.get('/',{preHandler: [(req, reply) => app.authenticate(req, reply)] },  async (request: FastifyRequest, reply: FastifyReply): Promise<CardResponse[] | void> => {
     const userId = (request.user as { id: string }).id;
     try {
       return await cardService.listCards(app, userId)
@@ -69,7 +62,7 @@
 
   // ─── Create Card ───
 
-  app.post('/', async (request: FastifyRequest<{ Body: CreateCardBody }>, reply: FastifyReply): Promise<Card | void> => {
+ app.post<{ Body: CreateCardBody }>('/', { preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request, reply): Promise<Card | void> => {
     const userId = (request.user as { id: string }).id;
     const parsed = createCardSchema.safeParse(request.body);
 
@@ -88,7 +81,7 @@
 
   // ─── Update Card ───
 
-  app.put('/:id', async (request: FastifyRequest<{ Params: CardParams; Body: UpdateCardBody }>, reply: FastifyReply): Promise<CardResponse> => {
+ app.put<{ Params: CardParams; Body: UpdateCardBody }>('/:id', {preHandler: [(req, reply) => app.authenticate(req, reply)] }, async (request, reply): Promise<CardResponse> => {
     const userId = (request.user as { id: string }).id;
     const { id } = request.params;
 
@@ -106,7 +99,7 @@
 
   // ─── Delete Card ───
 
-  app.delete('/:id', async (request: FastifyRequest<{ Params: CardParams }>, reply: FastifyReply): Promise<void> => {
+  app.delete<{ Params: CardParams }>('/:id', { preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request, reply): Promise<void> => {
     const userId = (request.user as { id: string }).id;
     const { id } = request.params;
 
@@ -129,7 +122,7 @@
 
   // ─── Set Default Card ───
 
-  app.put('/:id/default', async (request: FastifyRequest<{ Params: CardParams }>, reply: FastifyReply): Promise<object | void> => {
+  app.put<{ Params: CardParams }>('/:id/default', {preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request, reply): Promise<object | void> => {
     const userId = (request.user as { id: string }).id;
     const { id } = request.params;
 

apps/backend/src/routes/connect.ts

@@ -29,14 +29,7 @@ interface ParsedOAuthState {
 export async function connectRoutes(app: FastifyInstance): Promise<void> {
   // ─── Status ───
 
-  app.get('/status', {
-    preHandler: [async (request, reply) => {
-      const server = request.server as any;
-      if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-      if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-      try { await request.jwtVerify() } catch { reply.status(401).send({ error: 'Unauthorized' }) }
-    }],
-  }, async (request: FastifyRequest, _reply: FastifyReply) => {
+  app.get('/status',{preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request: FastifyRequest, _reply: FastifyReply) => {
     const userId = (request.user as any).id;
 
     const tokens = await app.prisma.oAuthToken.findMany({
@@ -49,14 +42,7 @@ export async function connectRoutes(app: FastifyInstance): Promise<void> {
 
   // ─── GitHub Connect ───
 
-  app.get('/github', {
-    preHandler: [async (request, reply) => {
-      const server = request.server as any;
-      if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-      if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-      try { await request.jwtVerify() } catch { reply.status(401).send({ error: 'Unauthorized' }) }
-    }],
-  }, async (request: FastifyRequest, reply: FastifyReply) => {
+  app.get('/github',{preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request: FastifyRequest, reply: FastifyReply) => {
     const userId = (request.user as any).id;
     const nonce = generateState();
 
@@ -173,14 +159,7 @@ export async function connectRoutes(app: FastifyInstance): Promise<void> {
     }
   });
 
-  app.get('/github/autodiscover', {
-    preHandler: [async (request, reply) => {
-      const server = request.server as any;
-      if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-      if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-      try { await request.jwtVerify() } catch { reply.status(401).send({ error: 'Unauthorized' }) }
-    }],
-  }, async (request: FastifyRequest, reply: FastifyReply) => {
+  app.get('/github/autodiscover',{preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request: FastifyRequest, reply: FastifyReply) => {
     const userId = (request.user as any).id;
     const cacheKey = `github:autodiscover:${userId}`;
 
@@ -262,14 +241,7 @@ export async function connectRoutes(app: FastifyInstance): Promise<void> {
 
   // ─── Disconnect ───
 
-  app.delete('/:platform', {
-    preHandler: [async (request, reply) => {
-      const server = request.server as any;
-      if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-      if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-      try { await request.jwtVerify() } catch { reply.status(401).send({ error: 'Unauthorized' }) }
-    }],
-  }, async (request: FastifyRequest<{ Params: { platform: string } }>, reply: FastifyReply) => {
+  app.delete<{ Params: { platform: string } }>('/:platform', {preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request, reply) => {
     const userId = (request.user as any).id;
     const { platform } = request.params;
 

apps/backend/src/routes/event.ts

@@ -1,15 +1,15 @@
-import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
-import { createEventSchema, joinEventSchema} from '../validations/event.validation.js';
-
-import {generateUniqueSlug} from '../utils/slug.js'
+import {generateUniqueSlug} from '../utils/slug'
+import { createEventSchema} from '../validations/event.validation';
 
+import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
 
 type EventDetails = {
     id: string;
     name: string;
     slug: string;
     location: string;
     description: string | null;
+    organizerId: string; 
     organizerUsername: string;
     organizerDisplayName: string;
     startDate: Date;
@@ -57,21 +57,8 @@ type EventWithAttendees = {
   }[];
 }
 
-export async function eventRoutes(app:FastifyInstance) {
-        app.post('/', { preHandler: [async (request, reply) => {
-                const server = request.server as any;
-                if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return }
-                if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return }
-                try { await request.jwtVerify() } catch (e) { reply.status(401).send({ error: 'Unauthorized' }) }
-            }] }, async (request: FastifyRequest<{
-        Body: {
-            name: string,
-            description?: string,
-            startDate: string,
-            location: string,
-            endDate: string,
-            isPublic?: boolean
-    }}>, reply: FastifyReply) => {
+export async function eventRoutes(app:FastifyInstance): Promise<void> {
+        app.post<{Body: { name: string; description?: string; startDate: string; location: string; endDate: string; isPublic?: boolean; }; }>('/', {preHandler: [(req, reply) => app.authenticate(req, reply)]}, async (request, reply) => {
         const userId = (request.user as any).id;
         const parsed = createEventSchema.safeParse(request.body); 
         if(!parsed.success){
@@ -80,8 +67,8 @@ export async function eventRoutes(app:FastifyInstance) {
 
         const {name, description, startDate, endDate, isPublic ,location} = parsed.data
 
-        let finalSlug = await generateUniqueSlug(name, async(slug) => {
-            const existing = await app.prisma.event.findUnique({where: {slug : slug}})
+        const finalSlug = await generateUniqueSlug(name, async(slug) => {
+            const existing = await app.prisma.event.findUnique({where: {slug}})
 
             return !!existing
         })
@@ -95,7 +82,7 @@ export async function eventRoutes(app:FastifyInstance) {
                     name, 
                     description, 
                     slug: finalSlug, 
-                    location: location,
+                    location,
                     startDate: startDateObj, 
                     endDate: endDateObj, 
                     isPublic: isPublic ?? true, 
@@ -104,7 +91,7 @@ export async function eventRoutes(app:FastifyInstance) {
             })
 
             return reply.status(201).send(newEvent); 
-        } catch (error) {
+        } catch (_error) {
             app.log.error('Failed to create event'); 
             return reply.status(500).send({error: 'Failed to create event'})
         }
@@ -142,6 +129,7 @@ export async function eventRoutes(app:FastifyInstance) {
             slug: details.slug,
             description: details.description,
             location: details.location,
+            organizerId: details.organizerId,  
             organizerUsername: details.organizer.username,
             organizerDisplayName: details.organizer.displayName,
             startDate: details.startDate,
@@ -153,7 +141,7 @@ export async function eventRoutes(app:FastifyInstance) {
         return response; 
     })
 
-        app.post('/:slug/join', { preHandler: [async (request, reply) => { const server = request.server as any; if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return } if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return } try { await request.jwtVerify() } catch (e) { reply.status(401).send({ error: 'Unauthorized' }) } }] }, async(request: FastifyRequest<{Params: {slug: string}}>, reply: FastifyReply) => {
+        app.post<{ Params: { slug: string } }>('/:slug/join', {preHandler: [(req, reply) => app.authenticate(req, reply)]}, async(request, reply) => {
         const userId = (request.user as any).id;
         const paramsSlug = request.params.slug; 
 
@@ -171,7 +159,7 @@ export async function eventRoutes(app:FastifyInstance) {
             await app.prisma.eventAttendee.create({
                 data: {
                     eventId: event.id, 
-                    userId: userId, 
+                    userId, 
                     joinedAt: new Date()
                 }
             })
@@ -187,7 +175,7 @@ export async function eventRoutes(app:FastifyInstance) {
 
     })
 
-        app.delete('/:slug/leave', { preHandler: [async (request, reply) => { const server = request.server as any; if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return } if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return } try { await request.jwtVerify() } catch (e) { reply.status(401).send({ error: 'Unauthorized' }) } }] }, async(request: FastifyRequest<{Params: {slug: string}}>, reply: FastifyReply) => {
+        app.delete<{Params: {slug: string}}>('/:slug/leave',{preHandler: [(req, reply) => app.authenticate(req, reply)]}, async(request, reply) => {
         const userId = (request.user as any).id;
         const paramsSlug = request.params.slug; 
 
@@ -205,7 +193,7 @@ export async function eventRoutes(app:FastifyInstance) {
             await app.prisma.eventAttendee.delete({
                 where: {
                     userId_eventId: {
-                        userId: userId, 
+                        userId, 
                         eventId: event.id
                     }
                 }

apps/backend/src/routes/nfc.ts

@@ -1,6 +1,7 @@
-import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
 import { z } from 'zod';
 
+import type { FastifyInstance } from 'fastify';
+
 type NfcPayloadResponse = {
   type: 'URI';
   payload: string;
@@ -10,33 +11,12 @@ const nfcQuerySchema = z.object({
   card: z.string().uuid('Invalid card ID format').optional(),
 });
 
-export async function nfcRoutes(app: FastifyInstance) {
-  app.addHook('preHandler', async (request, reply) => {
-        const server = request.server as any;
-        if (typeof server?.authenticate === 'function') {
-          await server.authenticate(request, reply);
-          return;
-        }
-        if (typeof (app as any).authenticate === 'function') {
-          await (app as any).authenticate(request, reply);
-          return;
-        }
-        try {
-          await request.jwtVerify();
-        } catch (e) {
-          reply.status(401).send({ error: 'Unauthorized' });
-        }
-  });
-
+export async function nfcRoutes(app: FastifyInstance) : Promise<void> {
   // GET /api/nfc/payload — returns NDEF URI payload for user's default DevCard URL
   // GET /api/nfc/payload?card=<cardId> — returns payload for a specific card
-  app.get(
-    '/payload',
-    async (
-      request: FastifyRequest<{ Querystring: { card?: string } }>,
-      reply: FastifyReply
-    ) => {
-      const userId = (request.user as any).id;
+  app.get<{ Querystring: { card?: string } }>(
+    '/payload',{preHandler: [(req, reply) => app.authenticate(req, reply)]},
+    async (request,reply ) => { const userId = (request.user as any).id;
 
       // Validate query params with Zod
       const parseResult = nfcQuerySchema.safeParse(request.query);