Merge pull request #9 from IEEECS-VIT/darsh

Merge Conflicts Resolved

Author: akshit1003

prisma/schema.prisma

@@ -69,15 +69,16 @@ model Event {
   created_at      DateTime   @default(now())
   start_date_time DateTime
   end_date_time   DateTime?
+  bannerImage     String?
 
   hostId String
   host   User   @relation("HostEvents", fields: [hostId], references: [id])
 
-  // Event type-specific details
-  weddingDetails    WeddingEvent?
-  birthdayDetails   BirthdayEvent?
-  housePartyDetails HousePartyEvent?
-  travelDetails     TravelEvent?
+  weddingDetails     WeddingEvent?
+  birthdayDetails    BirthdayEvent?
+  housePartyDetails  HousePartyEvent?
+  travelDetails      TravelEvent?
+  anniversaryDetails AnniversaryEvent?
 
   // Relations
   co_hosts   User[]     @relation("CoHostEvents")
@@ -110,7 +111,9 @@ model BirthdayEvent {
 
 model HousePartyEvent {
   id    String   @id // This ID must match the Event's ID
+  cost  Float?   @default(0.0) // Optional cost for the house party
   rules String?
+  terms String?
   tags  String[]
 
   // Relation back to the main Event
@@ -119,6 +122,8 @@ model HousePartyEvent {
 
 model TravelEvent {
   id                 String   @id // This ID must match the Event's ID
+  cost               Float?   @default(0.0) // Optional cost for the house party
+  terms              String?
   itinerary_included String[]
   itinerary_excluded String[]
   rules              String?
@@ -128,6 +133,17 @@ model TravelEvent {
   event Event @relation(fields: [id], references: [id], onDelete: Cascade)
 }
 
+model AnniversaryEvent {
+  id               String  @id // This ID must match the Event's ID
+  couple_names     String
+  anniversary_year Int?
+  couple_image     String?
+  hashtag          String?
+
+  // Relation back to the main Event
+  event Event @relation(fields: [id], references: [id], onDelete: Cascade)
+}
+
 model SubEvent {
   id              String   @id @default(uuid())
   title           String

src/routes/eventRoutes.ts

@@ -6,7 +6,12 @@ import {
   addCohost, 
   removeCohost,
   updateEvent,
-  deleteEvent, 
+  deleteEvent,
+  addWeddingDetails,
+  addBirthdayDetails,
+  addHousePartyDetails,
+  addTravelDetails,
+  addAnniversaryDetails
 } from '../services/eventService';
 import { getUserByPhoneNumber } from '../services/userService';
 import { verifyIdToken } from '../middleware/verifyIdToken';
@@ -143,9 +148,9 @@ router.patch('/cohost/add', verifyIdToken, async (req: Request, res: Response) =
 router.patch('/cohost/remove', verifyIdToken, async (req: Request, res: Response) => {
   try {
     const userId = req.userId
-    const {eventId, cohostId} = req.body
+    const {eventId, phoneNumber} = req.body
 
-    if (!eventId || !cohostId) {
+    if (!eventId || !phoneNumber) {
       res.status(401).json({message: 'Missing required fields'})
       return
     }
@@ -156,7 +161,13 @@ router.patch('/cohost/remove', verifyIdToken, async (req: Request, res: Response
       return
     }
 
-    const { success, event, error } = await removeCohost(eventId, cohostId);
+    const cohost = await getUserByPhoneNumber(phoneNumber)
+    if (!cohost) {
+      res.status(404).json({message: 'Cohost not found'})
+      return
+    }
+  
+    const { success, event, error } = await removeCohost(eventId, cohost.id);
 
     if (success) {
       res.status(200).json({message: 'Cohost removed successfully', event})
@@ -169,6 +180,184 @@ router.patch('/cohost/remove', verifyIdToken, async (req: Request, res: Response
   }
 })
 
+// Add Wedding Details
+router.post('/add-wedding-details', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const userId = req.userId;
+    const { eventId, bride_name, groom_name, bride_details, groom_details, bride_groom_images, hashtag } = req.body;
+    
+    if (!eventId || !bride_name || !groom_name) {
+      res.status(400).json({ message: 'Missing required fields: eventId, bride_name, groom_name' });
+      return;
+    }
+  
+    const user = await getUser(userId);
+    if (!user) {
+      res.status(404).json({ message: 'User not found' });
+      return;
+    }
+  
+    const { success, weddingDetails, error } = await addWeddingDetails(eventId, {
+      bride_name,
+      groom_name,
+      bride_details,
+      groom_details,
+      bride_groom_images,
+      hashtag
+    });
+  
+    if (success) {
+      res.status(200).json({ message: 'Wedding details added successfully', weddingDetails });
+    } else {
+      res.status(500).json({ message: error ?? 'Internal Server Error' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Add Birthday Details
+router.post('/add-birthday-details', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const userId = req.userId;
+    const { eventId, person_image, hashtag } = req.body;
+    
+    if (!eventId) {
+      res.status(400).json({ message: 'Missing required field: eventId' });
+      return;
+    }
+  
+    const user = await getUser(userId);
+    if (!user) {
+      res.status(404).json({ message: 'User not found' });
+      return;
+    }
+  
+    const { success, birthdayDetails, error } = await addBirthdayDetails(eventId, {
+      person_image,
+      hashtag
+    });
+  
+    if (success) {
+      res.status(200).json({ message: 'Birthday details added successfully', birthdayDetails });
+    } else {
+      res.status(500).json({ message: error ?? 'Internal Server Error' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Add House Party Details
+router.post('/add-houseparty-details', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const userId = req.userId;
+    const { eventId, cost, rules, terms, tags } = req.body;
+    
+    if (!eventId) {
+      res.status(400).json({ message: 'Missing required field: eventId' });
+      return;
+    }
+  
+    const user = await getUser(userId);
+    if (!user) {
+      res.status(404).json({ message: 'User not found' });
+      return;
+    }
+  
+    const { success, housePartyDetails, error } = await addHousePartyDetails(eventId, {
+      cost,
+      rules,
+      terms,
+      tags
+    });
+  
+    if (success) {
+      res.status(200).json({ message: 'House party details added successfully', housePartyDetails });
+    } else {
+      res.status(500).json({ message: error ?? 'Internal Server Error' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Add Travel Details
+router.post('/add-travel-details', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const userId = req.userId;
+    const { eventId, cost, terms, itinerary_included, itinerary_excluded, rules, tags } = req.body;
+    
+    if (!eventId) {
+      res.status(400).json({ message: 'Missing required field: eventId' });
+      return;
+    }
+  
+    const user = await getUser(userId);
+    if (!user) {
+      res.status(404).json({ message: 'User not found' });
+      return;
+    }
+  
+    const { success, travelDetails, error } = await addTravelDetails(eventId, {
+      cost,
+      terms,
+      itinerary_included,
+      itinerary_excluded,
+      rules,
+      tags
+    });
+  
+    if (success) {
+      res.status(200).json({ message: 'Travel details added successfully', travelDetails });
+    } else {
+      res.status(500).json({ message: error ?? 'Internal Server Error' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Add Anniversary Details
+router.post('/add-anniversary-details', verifyIdToken, async (req: Request, res: Response) => {
+  try {
+    const userId = req.userId;
+    const { eventId, couple_names, anniversary_year, couple_image, hashtag } = req.body;
+    
+    if (!eventId || !couple_names) {
+      res.status(400).json({ message: 'Missing required fields: eventId, couple_names' });
+      return;
+    }
+  
+    const user = await getUser(userId);
+    if (!user) {
+      res.status(404).json({ message: 'User not found' });
+      return;
+    }
+  
+    const { success, anniversaryDetails, error } = await addAnniversaryDetails(eventId, {
+      couple_names,
+      anniversary_year,
+      couple_image,
+      hashtag
+    });
+  
+    if (success) {
+      res.status(200).json({ message: 'Anniversary details added successfully', anniversaryDetails });
+    } else {
+      res.status(500).json({ message: error ?? 'Internal Server Error' });
+    }
+  } catch (error) {
+    console.error(error);
+    res.status(500).json({ message: 'Internal Server Error' });
+  }
+});
+
+// Delete Event
 router.delete('/:eventId', verifyIdToken, async (req: Request, res: Response) => {
   try {
     const userId = req.userId;

src/routes/onboardingRoutes.ts

@@ -27,6 +27,10 @@ router.post('/otp/send', async (req: Request, res: Response) => {
 
 router.post('/otp/verify', async (req: Request, res: Response): Promise<void> => {
   const { phone, code } = req.body;
+  if (!phone || !code) {
+    res.status(400).json({ error: 'Phone number and code are required' });
+    return;
+  }
 
   try {
     const result = await verifyOTP(phone, code);