put events-router

package.json

@@ -11,6 +11,7 @@
         "test": "jest --config=testing/jest.config.ts"
     },
     "devDependencies": {
+        "@jest/globals": "^29.7.0",
         "@types/dotenv": "^8.2.0",
         "@types/express": "^4.17.21",
         "@types/express-rate-limit": "^6.0.0",

src/app.ts

@@ -10,7 +10,7 @@ import morgan from "morgan";
 import bodyParser from "body-parser";
 import errorHandler from "./middleware/error-handler";
 
-import attendeeRouter from "./services/attendees/attendee-router";
+import attendeeRouter from "./services/attendee/attendee-router";
 import authRouter from "./services/auth/auth-router";
 import eventsRouter from "./services/events/events-router";
 import notificationsRouter from "./services/notifications/notifications-router";

src/database.ts

@@ -2,12 +2,20 @@ import mongoose, { Schema, Document } from "mongoose";
 import {
     AttendeeSchema,
     AttendeeValidator,
-} from "./services/attendees/attendee-schema";
-import { RoleValidator, RoleSchema } from "./services/auth/auth-schema";
+} from "./services/attendee/attendee-schema";
+import {
+    AttendeeAttendanceSchema,
+    AttendeeAttendanceValidator,
+} from "./services/attendee/attendee-schema";
 import {
     EventSchema,
     privateEventValidator,
 } from "./services/events/events-schema";
+import {
+    EventAttendanceSchema,
+    EventAttendanceValidator,
+} from "./services/events/events-schema";
+import { RoleValidator, RoleSchema } from "./services/auth/auth-schema";
 import {
     RegistrationSchema,
     RegistrationValidator,
@@ -55,12 +63,22 @@ function initializeModel(
 export const Database = {
     ROLES: initializeModel("roles", RoleSchema, RoleValidator),
     EVENTS: initializeModel("events", EventSchema, privateEventValidator),
+    EVENTS_ATTENDANCE: initializeModel(
+        "events_attendance",
+        EventAttendanceSchema,
+        EventAttendanceValidator
+    ),
+    ATTENDEE: initializeModel("attendee", AttendeeSchema, AttendeeValidator),
+    ATTENDEE_ATTENDANCE: initializeModel(
+        "attendee_attendance",
+        AttendeeAttendanceSchema,
+        AttendeeAttendanceValidator
+    ),
     SUBSCRIPTIONS: initializeModel(
         "subscriptions",
         SubscriptionSchema,
         SubscriptionSchemaValidator
     ),
-    ATTENDEES: initializeModel("attendees", AttendeeSchema, AttendeeValidator),
     REGISTRATION: initializeModel(
         "registration",
         RegistrationSchema,

src/services/attendees/attendee-router.ts → src/services/attendee/attendee-router.ts

@@ -5,7 +5,7 @@ import { Database } from "../../database";
 import RoleChecker from "../../middleware/role-checker";
 import { Role } from "../auth/auth-models";
 import dotenv from "dotenv";
-import { generateQrHash } from "./attendees-utils";
+import { generateQrHash } from "./attendee-utils";
 
 dotenv.config();
 
@@ -21,15 +21,15 @@ attendeeRouter.post(
         const { eventId } = EventIdValidator.parse(req.params);
 
         try {
-            const attendee = await Database.ATTENDEES.findOne({ userId });
+            const attendee = await Database.ATTENDEE.findOne({ userId });
 
             if (!attendee) {
                 return res
                     .status(StatusCodes.NOT_FOUND)
                     .json({ error: "UserNotFound" });
             }
 
-            await Database.ATTENDEES.updateOne(
+            await Database.ATTENDEE.updateOne(
                 { userId: userId },
                 { $addToSet: { favorites: eventId } }
             );
@@ -51,15 +51,15 @@ attendeeRouter.delete(
         const { eventId } = EventIdValidator.parse(req.params);
 
         try {
-            const attendee = await Database.ATTENDEES.findOne({ userId });
+            const attendee = await Database.ATTENDEE.findOne({ userId });
 
             if (!attendee) {
                 return res
                     .status(StatusCodes.NOT_FOUND)
                     .json({ error: "UserNotFound" });
             }
 
-            await Database.ATTENDEES.updateOne(
+            await Database.ATTENDEE.updateOne(
                 { userId: userId },
                 { $pull: { favorites: eventId } }
             );
@@ -80,7 +80,7 @@ attendeeRouter.get(
         const userId = payload.userId;
 
         try {
-            const attendee = await Database.ATTENDEES.findOne({ userId });
+            const attendee = await Database.ATTENDEE.findOne({ userId });
 
             if (!attendee) {
                 return res
@@ -99,7 +99,7 @@ attendeeRouter.get(
 attendeeRouter.post("/", async (req, res, next) => {
     try {
         const attendeeData = AttendeeValidator.parse(req.body);
-        const attendee = new Database.ATTENDEES(attendeeData);
+        const attendee = new Database.ATTENDEE(attendeeData);
         await attendee.save();
 
         return res.status(StatusCodes.CREATED).json(attendeeData);
@@ -135,7 +135,7 @@ attendeeRouter.get(
             const userId = payload.userId;
 
             // Check if the user exists in the database
-            const user = await Database.ATTENDEES.findOne({ userId });
+            const user = await Database.ATTENDEE.findOne({ userId });
 
             if (!user) {
                 return res

src/services/attendees/attendee-schema.ts → src/services/attendee/attendee-schema.ts

@@ -1,8 +1,8 @@
-import mongoose from "mongoose";
+import { Schema } from "mongoose";
 import { z } from "zod";
 
 // Zod schema for attendee
-const AttendeeValidator = z.object({
+export const AttendeeValidator = z.object({
     userId: z.string(),
     name: z.string(),
     email: z.string().email(),
@@ -30,20 +30,18 @@ const AttendeeValidator = z.object({
 });
 
 // Mongoose schema for attendee
-const AttendeeSchema = new mongoose.Schema({
+export const AttendeeSchema = new Schema({
     userId: { type: String, required: true, unique: true },
     name: { type: String, required: true },
     email: { type: String, required: true, unique: true },
-    events: [
-        { type: mongoose.Schema.Types.ObjectId, ref: "Event", default: [] },
-    ],
+    events: [{ type: String, ref: "Event", default: [] }],
     dietaryRestrictions: { type: [String], required: true },
     allergies: { type: [String], required: true },
     hasCheckedIn: { type: Boolean, default: false },
     points: { type: Number, default: 0 },
     foodWave: { type: Number, default: 0 },
     hasPriority: {
-        type: new mongoose.Schema(
+        type: new Schema(
             {
                 dayOne: { type: Boolean, default: false },
                 dayTwo: { type: Boolean, default: false },
@@ -58,8 +56,19 @@ const AttendeeSchema = new mongoose.Schema({
     favorites: [{ type: String }],
 });
 
-const EventIdValidator = z.object({
-    eventId: z.string().uuid(),
+export const AttendeeAttendanceSchema = new Schema({
+    userId: {
+        type: String,
+        ref: "Attendee",
+        required: true,
+    },
+    eventsAttended: [{ type: String, ref: "Event", required: true }],
 });
 
-export { AttendeeSchema, AttendeeValidator, EventIdValidator };
+export const AttendeeAttendanceValidator = z.object({
+    userId: z.string(),
+    eventsAttended: z.array(z.string()),
+});
+export const EventIdValidator = z.object({
+    eventId: z.string().uuid(),
+});

src/services/auth/auth-models.ts

@@ -7,3 +7,5 @@ export const JwtPayloadValidator = z.object({
     displayName: z.string(),
     roles: Role.array(),
 });
+
+export type JwtPayloadType = z.infer<typeof JwtPayloadValidator>;

src/services/auth/auth-utils.ts

@@ -2,7 +2,7 @@
 import { Strategy as GoogleStrategy } from "passport-google-oauth20";
 import { Config } from "../../config";
 import { Database } from "../../database";
-import { Role } from "./auth-models";
+import { JwtPayloadType, Role } from "./auth-models";
 
 export function createGoogleStrategy(device: string) {
     return new GoogleStrategy(
@@ -47,3 +47,15 @@ export async function getJwtPayloadFromDatabase(userId: string) {
 
     return payload;
 }
+
+export function isUser(payload?: JwtPayloadType) {
+    return payload?.roles.includes(Role.Enum.USER);
+}
+
+export function isStaff(payload?: JwtPayloadType) {
+    return payload?.roles.includes(Role.Enum.STAFF);
+}
+
+export function isAdmin(payload?: JwtPayloadType) {
+    return payload?.roles.includes(Role.Enum.ADMIN);
+}