Notif Fixes

src/database/attendee-db.ts

@@ -1,14 +1,5 @@
 import { prop } from "@typegoose/typegoose";
 
-export class AttendeeMetadata {
-    @prop({ required: true })
-    public userId: string;
-
-    constructor(id: string) {
-        this.userId = id;
-    }
-}
-
 export class AttendeeProfile {
     @prop({ required: true })
     public userId: string;

src/database/models.ts

@@ -2,7 +2,7 @@ import mongoose, { Model } from "mongoose";
 import { getModelForClass } from "@typegoose/typegoose";
 
 import { AuthInfo } from "./auth-db.js";
-import { AttendeeFollowing, AttendeeMetadata, AttendeeProfile } from "./attendee-db.js";
+import { AttendeeFollowing, AttendeeProfile } from "./attendee-db.js";
 import { AdmissionDecision } from "./admission-db.js";
 import { MentorOfficeHours } from "./mentor-db.js";
 import { Event, EventAttendance, EventFollowers } from "./event-db.js";
@@ -31,7 +31,6 @@ export enum Group {
 
 // Collections for each database, where models will be stored
 enum AttendeeCollection {
-    METADATA = "metadata",
     PROFILE = "profile",
     FOLLOWING = "following",
 }
@@ -96,7 +95,6 @@ function getModel<T>(of: AnyParamConstructor<any>, group: Group, collection: str
 // Define models
 export default class Models {
     // Attendee
-    static AttendeeMetadata: Model<AttendeeMetadata> = getModel(AttendeeMetadata, Group.ATTENDEE, AttendeeCollection.METADATA);
     static AttendeeProfile: Model<AttendeeProfile> = getModel(AttendeeProfile, Group.ATTENDEE, AttendeeCollection.PROFILE);
     static AttendeeFollowing: Model<AttendeeFollowing> = getModel(
         AttendeeFollowing,

src/services/notification/notification-router.ts

@@ -4,13 +4,25 @@ import { RouterError } from "../../middleware/error-handler.js";
 import { StatusCode } from "status-code-enum";
 import Models from "../../database/models.js";
 import { JwtPayload } from "../auth/auth-models.js";
-import { hasAdminPerms } from "../auth/auth-lib.js";
+import { hasAdminPerms, hasStaffPerms } from "../auth/auth-lib.js";
 import { NotificationSendFormat, isValidNotificationSendFormat } from "./notification-formats.js";
 import { StaffShift } from "database/staff-db.js";
 import { NotificationsMiddleware } from "../../middleware/fcm.js";
 
 const notificationsRouter: Router = Router();
 
+notificationsRouter.get("/", strongJwtVerification, async (_: Request, res: Response, next: NextFunction) => {
+    const payload: JwtPayload = res.locals.payload as JwtPayload;
+
+    if (!hasStaffPerms(payload)) {
+        return next(new RouterError(StatusCode.ClientErrorForbidden, "Forbidden"));
+    }
+
+    const notifs = await Models.NotificationMessages.find();
+
+    return res.status(StatusCode.SuccessOK).send(notifs ?? []);
+});
+
 // register your current device token as associated with your userId
 notificationsRouter.post("/", strongJwtVerification, async (req: Request, res: Response, next: NextFunction) => {
     const payload: JwtPayload = res.locals.payload as JwtPayload;
@@ -67,7 +79,11 @@ notificationsRouter.post(
             targetUserIds = targetUserIds.concat(staffUserIds);
         }
 
-        // TODO: WAIT ON FOOD WAVE STUFF
+        if (sendRequest.foodWave) {
+            const foodwaves = await Models.AttendeeProfile.find({ foodWave: sendRequest.foodWave });
+            const foodUserIds = foodwaves.map((x) => x.userId);
+            targetUserIds = targetUserIds.concat(foodUserIds);
+        }
 
         const messageTemplate = {
             notification: {

src/services/profile/profile-router.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
-import { AttendeeMetadata, AttendeeProfile } from "database/attendee-db.js";
+import { AttendeeProfile } from "database/attendee-db.js";
 import { StatusCode } from "status-code-enum";
 import Config from "../../config.js";
 import Models from "../../database/models.js";
@@ -15,10 +15,6 @@ const TESTER_USER = {
     foodWave: 1,
 } satisfies AttendeeProfile;
 
-const TESTER_METADATA = {
-    userId: TESTER.id,
-} satisfies AttendeeMetadata;
-
 const TESTER_USER_2 = {
     userId: "tester2",
     displayName: TESTER.name + "2",
@@ -51,7 +47,6 @@ const profile: AttendeeProfile = {
 
 beforeEach(async () => {
     await Models.AttendeeProfile.create(TESTER_USER);
-    await Models.AttendeeMetadata.create(TESTER_METADATA);
     await Models.AttendeeProfile.create(TESTER_USER_2);
     await Models.AttendeeProfile.create(TESTER_USER_3);
 });

src/services/profile/profile-router.ts

@@ -5,7 +5,7 @@ import { NextFunction, Response } from "express-serve-static-core";
 import Config from "../../config.js";
 import { Avatars } from "../../config.js";
 import { isValidLimit, updatePoints, updateCoins } from "./profile-lib.js";
-import { AttendeeMetadata, AttendeeProfile } from "../../database/attendee-db.js";
+import { AttendeeProfile } from "../../database/attendee-db.js";
 import { RegistrationApplication } from "../../database/registration-db.js";
 
 import Models from "../../database/models.js";
@@ -272,9 +272,7 @@ profileRouter.post("/", strongJwtVerification, async (req: Request, res: Respons
 
     // Create a metadata object, and return it
     try {
-        const profileMetadata: AttendeeMetadata = new AttendeeMetadata(profile.userId);
         const newProfile = await Models.AttendeeProfile.create(profile);
-        await Models.AttendeeMetadata.create(profileMetadata);
         return res.status(StatusCode.SuccessOK).send(newProfile);
     } catch (error) {
         console.error(error);
@@ -304,9 +302,8 @@ profileRouter.delete("/", strongJwtVerification, async (_: Request, res: Respons
     const decodedData: JwtPayload = res.locals.payload as JwtPayload;
 
     const attendeeProfileDeleteResponse: DeleteResult = await Models.AttendeeProfile.deleteOne({ userId: decodedData.id });
-    const attendeeMetadataDeleteResponse: DeleteResult = await Models.AttendeeMetadata.deleteOne({ userId: decodedData.id });
 
-    if (attendeeMetadataDeleteResponse.deletedCount == 0 || attendeeProfileDeleteResponse.deletedCount == 0) {
+    if (attendeeProfileDeleteResponse.deletedCount == 0) {
         return next(new RouterError(StatusCode.ClientErrorNotFound, "AttendeeNotFound"));
     }
     return res.status(StatusCode.SuccessOK).send({ success: true });