pr comments

ReflectionsProjections · Jul 1, 2024 · e00f0e5 · e00f0e5
1 parent e716b5a
commit e00f0e5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/services/attendees/attendee-router.ts b/src/services/attendees/attendee-router.ts
@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { StatusCodes } from "http-status-codes";
-import { AttendeeValidator } from "./attendee-schema";
+import { AttendeeValidator, EventIdValidator } from "./attendee-schema";
 import { Database } from "../../database";
 import RoleChecker from "../../middleware/role-checker";
 import { Role } from "../auth/auth-models";
@@ -13,14 +13,14 @@ const attendeeRouter = Router();
 
 // Favorite an event for an attendee
 attendeeRouter.post(
-    "/favoriteEvents/:eventId",
+    "/favorites/:eventId",
     RoleChecker([Role.Enum.USER]),
     async (req, res, next) => {
-        try {
-            const payload = res.locals.payload;
-            const userId = payload.userId;
-            const { eventId } = req.params;
+        const payload = res.locals.payload;
+        const userId = payload.userId;
+        const { eventId } = EventIdValidator.parse(req.params);
 
+        try {
             const attendee = await Database.ATTENDEES.findOne({ userId });
 
             if (!attendee) {
@@ -43,14 +43,14 @@ attendeeRouter.post(
 
 // Unfavorite an event for an attendee
 attendeeRouter.delete(
-    "/favoriteEvents/:eventId",
+    "/favorites/:eventId",
     RoleChecker([Role.Enum.USER]),
     async (req, res, next) => {
-        try {
-            const payload = res.locals.payload;
-            const userId = payload.userId;
-            const { eventId } = req.params;
+        const payload = res.locals.payload;
+        const userId = payload.userId;
+        const { eventId } = EventIdValidator.parse(req.params);
 
+        try {
             const attendee = await Database.ATTENDEES.findOne({ userId });
 
             if (!attendee) {
@@ -73,24 +73,22 @@ attendeeRouter.delete(
 
 // Get favorite events for an attendee
 attendeeRouter.get(
-    "/favoriteEvents",
+    "/favorites",
     RoleChecker([Role.Enum.USER]),
     async (req, res, next) => {
-        try {
-            const payload = res.locals.payload;
-            const userId = payload.userId;
+        const payload = res.locals.payload;
+        const userId = payload.userId;
 
-            const attendee = await Database.ATTENDEES.findOne({
-                userId,
-            }).populate("favorites");
+        try {
+            const attendee = await Database.ATTENDEES.findOne({ userId });
 
             if (!attendee) {
                 return res
                     .status(StatusCodes.NOT_FOUND)
                     .json({ error: "UserNotFound" });
             }
 
-            return res.status(StatusCodes.OK).json(attendee.favorites);
+            return res.status(StatusCodes.OK).json(attendee);
         } catch (error) {
             next(error);
         }

diff --git a/src/services/attendees/attendee-schema.ts b/src/services/attendees/attendee-schema.ts
@@ -49,4 +49,8 @@ const AttendeeSchema = new mongoose.Schema({
     favorites: [{ type: String }],
 });
 
-export { AttendeeSchema, AttendeeValidator };
+const EventIdValidator = z.object({
+    eventId: z.string().uuid(),
+});
+
+export { AttendeeSchema, AttendeeValidator, EventIdValidator };