Added /api/events to get all events created by user or participated b…

…y them
gohanko · Aug 21, 2024 · 2bc209b · 2bc209b
1 parent 4f5ed99
commit 2bc209b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/controllers/event.controller.ts b/controllers/event.controller.ts
@@ -220,12 +220,23 @@ export const attendEvent = async (
     })
 }
 
-// TODO
-export const getAllEvents = async (
+export const getEvents = async (
     req: Request,
     res: Response
 ) => {
-    const events = await Event.findAll({ where: { createdByUserId: req.user.id }})
+    const eventsCreatedByUser = await Event.findAll({ where: { createdBy: req.user.id }})
+    const eventsParticipatedByUser = await EventParticipation.findAll({
+        where: { userId: req.user.id },
+        include: [{
+            model: Event
+        }]
+    })
+
+    const events: any = eventsCreatedByUser
+    eventsParticipatedByUser.map((eventParticipation) => {
+        events.push(eventParticipation.dataValues.event)
+    })
+
 
     return res.status(200).json({
         status: "success",

diff --git a/routes/event.route.ts b/routes/event.route.ts
@@ -4,11 +4,11 @@ import {
     readEvent,
     updateEvent,
     deleteEvent,
-    getAllEvents,
     getEventCode,
     joinEvent,
     leaveEvent,
     attendEvent,
+    getEvents,
 } from '../controllers/event.controller'
 import inputValidation from '../middlewares/inputValidation.middleware'
 import { body, check, param } from 'express-validator'
@@ -90,12 +90,11 @@ eventRouter.put(
     attendEvent
 )
 
-// TODO later
 eventRouter.get(
-    '/event/all/',
+    '/events/',
     inputValidation,
     mustBeAuthorized,
-    getAllEvents
+    getEvents
 )
 
 export default eventRouter
diff --git a/tests/api/event.test.ts b/tests/api/event.test.ts
@@ -241,4 +241,4 @@ describe('POST /api/event/:eventId/attend', () => {
 
         expect(response.status).toBe(201)
     })
-})
+})