pulled changes into this branch

ReflectionsProjections · Sep 18, 2024 · 3cd5414 · 3cd5414
1 parent 93d05c5
commit 3cd5414
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/services/checkin/checkin-router.ts b/src/services/checkin/checkin-router.ts
@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { StatusCodes } from "http-status-codes";
-import { ScanValidator, MerchScanValidator } from "./checkin-schema";
+import { ScanValidator, MerchScanValidator, EventValidator } from "./checkin-schema";
 import RoleChecker from "../../middleware/role-checker";
 import { Role } from "../auth/auth-models";
 import { validateQrHash } from "./checkin-utils";
@@ -23,8 +23,31 @@ checkinRouter.post(
                     .status(StatusCodes.UNAUTHORIZED)
                     .json({ error: "QR code has expired" });
             }
+
+            try {
+                await checkInUserToEvent(eventId, userId);
+            } catch (error: any) {
+                if (error instanceof Error && error.message == "IsDuplicate") {
+                    return res.status(StatusCodes.FORBIDDEN).json({error: "IsDuplicate"});
+                }
+                return res.sendStatus(StatusCodes.INTERNAL_SERVER_ERROR);
+            }
+
+            return res.status(StatusCodes.OK).json(userId);
+        } catch (error) {
+            next(error);
+        }
+    }
+);
+
+checkinRouter.post(
+    "/event",
+    RoleChecker([Role.Enum.ADMIN, Role.Enum.STAFF]),
+    async (req, res, next) => {
+        try {
+            const { eventId, userId, isCheckin } = EventValidator.parse(req.body);
 
-            await checkInUserToEvent(eventId, userId, true);
+            await checkInUserToEvent(eventId, userId, isCheckin);
 
             return res.status(StatusCodes.OK).json(userId);
         } catch (error) {
@@ -93,4 +116,4 @@ checkinRouter.post(
     }
 );
 
-export default checkinRouter;
+export default checkinRouter;
diff --git a/src/services/checkin/checkin-schema.ts b/src/services/checkin/checkin-schema.ts
@@ -9,4 +9,10 @@ const MerchScanValidator = z.object({
     qrCode: z.string(),
 });
 
-export { ScanValidator, MerchScanValidator };
+const EventValidator = z.object({
+    eventId: z.string(),
+    userId: z.string(),
+    isCheckin: z.boolean(),
+});
+
+export { ScanValidator, MerchScanValidator, EventValidator };
diff --git a/src/services/checkin/checkin-utils.ts b/src/services/checkin/checkin-utils.ts
@@ -34,7 +34,7 @@ async function checkForDuplicateAttendance(eventId: string, userId: string) {
     ]);
 
     if (isRepeatEvent || isRepeatAttendee) {
-        throw new Error("Is Duplicate");
+        throw new Error("IsDuplicate");
     }
 }
 
@@ -131,4 +131,4 @@ export function validateQrHash(qrCode: string) {
     }
 
     return { userId, expTime };
-}
+}