feat: add guest group management for sub-events with new routes and service functions

Author: akshit1003

prisma/schema.prisma

@@ -207,6 +207,20 @@ model SubEvent {
 
   guests   String[]
   messages String[]
+  
+  // Add this relation
+  guestGroups SubEventGuestGroup[]
+}
+
+// Add this new model
+model SubEventGuestGroup {
+  sub_event_id   String
+  guest_group_id String
+
+  subEvent   SubEvent   @relation(fields: [sub_event_id], references: [id], onDelete: Cascade)
+  guestGroup GuestGroup @relation(fields: [guest_group_id], references: [id], onDelete: Cascade)
+
+  @@id([sub_event_id, guest_group_id])
 }
 
 model Guest {
@@ -248,12 +262,13 @@ model GuestGroup {
   name      String
   createdBy String
 
-  creator     User              @relation("CreatedGuestGroups", fields: [createdBy], references: [id])
+  creator     User                 @relation("CreatedGuestGroups", fields: [createdBy], references: [id])
   members     GuestGroupUsers[]
   guests      Guest[]
   inviteLinks InviteLink[]
   invites     Invite[]
   events      EventGuestGroup[]
+  subEvents   SubEventGuestGroup[] // Add this line
 }
 
 model EventGuestGroup {

src/routes/subEventRoutes.ts

@@ -2,13 +2,17 @@ import express, { Request, Response } from 'express';
 import {
   createSubEvent,
   getSubEvents,
+  getSubEventsForUser,
   getSubEvent,
   updateSubEvent,
   deleteSubEvent,
   addGuestToSubEvent,
   removeGuestFromSubEvent,
   canManageSubEvent,
-  canManageEventSubEvents
+  canManageEventSubEvents,
+  addGuestGroupToSubEvent,
+  removeGuestGroupFromSubEvent,
+  getSubEventGuestGroups
 } from '../services/subEventService';
 import { verifyIdToken } from '../middleware/verifyIdToken';
 import { parseMultipartForm, uploadFilesToSupabase } from '../lib/fileUpload';
@@ -33,8 +37,7 @@ router.post('/', verifyIdToken, async (req: Request, res: Response) => {
       address,
       start_date_time,
       end_date_time,
-      invite_message,
-      guests
+      invite_message
     } = fields;
 
     if (!title || !location || !address || !start_date_time || !end_date_time) {
@@ -62,9 +65,8 @@ router.post('/', verifyIdToken, async (req: Request, res: Response) => {
       start_date_time,
       end_date_time,
       invite_message,
-            image,
-            guests: guests ? guests.split(',') : [],
-          });
+      image
+    });
 
     if (!result.success) {
       res.status(400).json({ message: result.error });
@@ -81,7 +83,7 @@ router.post('/', verifyIdToken, async (req: Request, res: Response) => {
   }
 });
 
-// Get all sub-events for an event
+// Get all sub-events for an event (filtered by user role)
 router.get('/', verifyIdToken, async (req: Request, res: Response) => {
   try {
     const { eventId } = req.params;
@@ -91,22 +93,16 @@ router.get('/', verifyIdToken, async (req: Request, res: Response) => {
       return;
     }
 
-    // Check if user can manage sub-events for this event
-    // const canManage = await canManageEventSubEvents(userId, eventId);
-    // if (!canManage) {
-    //   res.status(403).json({ message: 'Only event hosts and co-hosts can view sub-events' });
-    //   return;
-    // }
-
-    const result = await getSubEvents(eventId);
+    const result = await getSubEventsForUser(eventId, userId);
 
     if (!result.success) {
       res.status(400).json({ message: result.error });
       return;
     }
 
     res.status(200).json({
-      subEvents: result.subEvents
+      subEvents: result.subEvents,
+      role: result.role
     });
   } catch (error) {
     console.error(error);
@@ -315,4 +311,134 @@ router.delete('/:subEventId/guests/:guestId', verifyIdToken, async (req: Request
   }
 });
 
+// Get guest groups for a sub-event
+router.get('/:subEventId/guest-groups', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const { eventId, subEventId } = req.params;
+    const userId = req.userId;
+    if (!userId) {
+      res.status(401).json({ message: 'Unauthorized' });
+      return;
+    }
+
+    // Check if user can manage this sub-event
+    const canManage = await canManageSubEvent(userId, subEventId);
+    if (!canManage) {
+      res.status(403).json({ message: 'Only event hosts and co-hosts can view sub-event guest groups' });
+      return;
+    }
+
+    const result = await getSubEventGuestGroups(subEventId);
+
+    if (!result.success) {
+      res.status(400).json({ message: result.error });
+      return;
+    }
+
+    res.status(200).json({
+      guestGroups: result.guestGroups
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Add guest group to sub-event
+router.post('/:subEventId/guest-groups', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const { eventId, subEventId } = req.params;
+    const userId = req.userId;
+    if (!userId) {
+      res.status(401).json({ message: 'Unauthorized' });
+      return;
+    }
+    const { guestGroupId, guestGroupIds } = req.body;
+
+    // Support both single guestGroupId and multiple guestGroupIds
+    let groupIds: string[] = [];
+    if (guestGroupId) {
+      groupIds = [guestGroupId];
+    } else if (guestGroupIds && Array.isArray(guestGroupIds)) {
+      groupIds = guestGroupIds;
+    } else {
+      res.status(400).json({ message: 'Either guestGroupId or guestGroupIds array is required' });
+      return;
+    }
+
+    if (groupIds.length === 0) {
+      res.status(400).json({ message: 'At least one guest group ID is required' });
+      return;
+    }
+
+    // Check if user can manage this sub-event
+    const canManage = await canManageSubEvent(userId, subEventId);
+    if (!canManage) {
+      res.status(403).json({ message: 'Only event hosts and co-hosts can add guest groups to sub-events' });
+      return;
+    }
+
+    // Add all guest groups
+    const results = await Promise.all(
+      groupIds.map(groupId => addGuestGroupToSubEvent(subEventId, groupId))
+    );
+
+    // Check if any failed
+    const failures = results.filter(r => !r.success);
+    const successes = results.filter(r => r.success);
+
+    if (failures.length > 0 && successes.length === 0) {
+      res.status(400).json({ 
+        message: 'Failed to add all guest groups',
+        errors: failures.map(f => f.error)
+      });
+      return;
+    }
+
+    res.status(200).json({
+      message: `Successfully added ${successes.length} guest group(s) to sub-event`,
+      addedCount: successes.length,
+      failedCount: failures.length,
+      results: results
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Remove guest group from sub-event
+router.delete('/:subEventId/guest-groups/:guestGroupId', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const { eventId, subEventId, guestGroupId } = req.params;
+    const userId = req.userId;
+    if (!userId) {
+      res.status(401).json({ message: 'Unauthorized' });
+      return;
+    }
+
+    // Check if user can manage this sub-event
+    const canManage = await canManageSubEvent(userId, subEventId);
+    if (!canManage) {
+      res.status(403).json({ message: 'Only event hosts and co-hosts can remove guest groups from sub-events' });
+      return;
+    }
+
+    const result = await removeGuestGroupFromSubEvent(subEventId, guestGroupId);
+
+    if (!result.success) {
+      res.status(400).json({ message: result.error });
+      return;
+    }
+
+    res.status(200).json({
+      message: result.message,
+      subEvent: result.subEvent
+    });
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
 export default router;

src/services/inviteService.ts

@@ -334,7 +334,7 @@ export const submitGroupRsvp = async (
               ...(data.pickup_location && { pickup_location: data.pickup_location }),
               ...(data.dropoff_date_time && { dropoff_date_time: data.dropoff_date_time }),
               ...(data.dropoff_location && { dropoff_location: data.dropoff_location }),
-              ...(data.count && { count: data.count }),
+              ...(data.count !== undefined && { count: data.count }),
             },
             include: {
               user: {
@@ -442,7 +442,7 @@ export const submitGroupRsvp = async (
               ...(data.pickup_location && { pickup_location: data.pickup_location }),
               ...(data.dropoff_date_time && { dropoff_date_time: data.dropoff_date_time }),
               ...(data.dropoff_location && { dropoff_location: data.dropoff_location }),
-              ...(data.count && { count: data.count }),
+              ...(data.count !== undefined && { count: data.count }),
             },
             include: {
               event: {