resolved comments

Author: npunati27

.gitignore

@@ -42,8 +42,7 @@ build/Release
 node_modules/
 jspm_packages/
 
-# Snowpack d:
-ependency directory (https://snowpack.dev/)
+# Snowpack dependency directory (https://snowpack.dev/)
 web_modules/
 
 # TypeScript cache

src/database/decision-db.ts

@@ -1,13 +1,13 @@
 import { prop } from "@typegoose/typegoose";
 
-enum DecisionStatus {
+export enum DecisionStatus {
     TBD = "TBD",
     ACCEPTED = "ACCEPTED",
     REJECTED = "REJECTED",
     WAITLISTED = "WAITLISTED",
 }
 
-enum DecisionResponse {
+export enum DecisionResponse {
     PENDING = "PENDING",
     ACCEPTED = "ACCEPTED",
     DECLINED = "DECLINED",

src/services/admission/admission-formats.ts

@@ -1,18 +1,8 @@
+import { DecisionStatus } from "database/decision-db.js";
+
 export interface ApplicantDecisionFormat {
     _id?: string;
     userId: string;
     name: string;
     status: DecisionStatus;
 }
-
-export enum DecisionStatus {
-    TBD = "TBD",
-    ACCEPTED = "ACCEPTED",
-    REJECTED = "REJECTED",
-    WAITLISTED = "WAITLISTED",
-}
-export enum DecisionResponse {
-    PENDING = "PENDING",
-    ACCEPTED = "ACCEPTED",
-    DECLINED = "DECLINED",
-}

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

@@ -1,9 +1,10 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import Models from "../../database/models.js";
-import { DecisionStatus, DecisionResponse } from "./admission-formats.js";
-import { getAsAttendee, getAsStaff, getAsUser, putAsAttendee, putAsStaff, putAsUser, TESTER } from "../../testTools.js";
+import { DecisionStatus, DecisionResponse } from "../../database/decision-db.js";
+import { getAsAttendee, getAsStaff, getAsUser, putAsStaff, putAsUser, TESTER } from "../../testTools.js";
 import { DecisionInfo } from "../../database/decision-db.js";
 import { StatusCode } from "status-code-enum";
+import { ApplicantDecisionFormat } from "./admission-formats.js";
 
 const TESTER_USER = {
     userId: TESTER.id,
@@ -21,6 +22,19 @@ const OTHER_USER = {
     reviewer: "other-reviewer",
 } satisfies DecisionInfo;
 
+const updateData = [
+    {
+        userId: TESTER.id,
+        name: TESTER.name,
+        status: DecisionStatus.WAITLISTED,
+    },
+    {
+        userId: "other-user",
+        name: "other-name",
+        status: DecisionStatus.ACCEPTED,
+    },
+] satisfies ApplicantDecisionFormat[];
+
 beforeEach(async () => {
     Models.initialize();
     await Models.DecisionInfo.create(TESTER_USER);
@@ -30,11 +44,11 @@ beforeEach(async () => {
 describe("GET /admission", () => {
     it("gives forbidden error for user without elevated perms", async () => {
         const responseUser = await getAsUser("/admission/").expect(StatusCode.ClientErrorForbidden);
-        expect(JSON.parse(responseUser.text)).toHaveProperty("error", "InvalidToken");
+        expect(JSON.parse(responseUser.text)).toHaveProperty("error", "Forbidden");
     });
     it("gives forbidden error for user without elevated perms - attendee", async () => {
         const responseAttendee = await getAsAttendee("/admission/").expect(StatusCode.ClientErrorForbidden);
-        expect(JSON.parse(responseAttendee.text)).toHaveProperty("error", "InvalidToken");
+        expect(JSON.parse(responseAttendee.text)).toHaveProperty("error", "Forbidden");
     });
     it("should return a list of applicants without email sent", async () => {
         const response = await getAsStaff("/admission/").expect(StatusCode.SuccessOK);
@@ -43,25 +57,9 @@ describe("GET /admission", () => {
 });
 
 describe("PUT /admission", () => {
-    const updateData = [
-        {
-            userId: TESTER.id,
-            name: TESTER.name,
-            status: DecisionStatus.WAITLISTED,
-        },
-        {
-            userId: "other-user",
-            name: "other-name",
-            status: DecisionStatus.ACCEPTED,
-        },
-    ];
-    it("gives forbidden error for user without elevated perms (As User)", async () => {
-        const responseAttendee = await putAsAttendee("/admission/").send(updateData).expect(StatusCode.ClientErrorForbidden);
-        expect(JSON.parse(responseAttendee.text)).toHaveProperty("error", "InvalidToken");
-    });
     it("gives forbidden error for user without elevated perms (As Attendee)", async () => {
         const responseUser = await putAsUser("/admission/").send(updateData).expect(StatusCode.ClientErrorForbidden);
-        expect(JSON.parse(responseUser.text)).toHaveProperty("error", "InvalidToken");
+        expect(JSON.parse(responseUser.text)).toHaveProperty("error", "Forbidden");
     });
     it("should update application status of applicants", async () => {
         const response = await putAsStaff("/admission/").send(updateData).expect(StatusCode.SuccessOK);
@@ -70,10 +68,10 @@ describe("PUT /admission", () => {
             return Models.DecisionInfo.findOne({ userId: entry.userId });
         });
         const retrievedEntries = await Promise.all(ops);
-        updateData.forEach((entry) => {
-            expect(retrievedEntries).toMatchObject(
-                expect.arrayContaining([expect.objectContaining({ status: entry.status, userId: entry.userId })]),
-            );
-        });
+        expect(retrievedEntries).toMatchObject(
+            expect.arrayContaining(
+                updateData.map((item) => expect.objectContaining({ status: item.status, userId: item.userId })),
+            ),
+        );
     });
 });

src/services/admission/admission-router.ts

@@ -20,38 +20,35 @@ const admissionRouter: Router = Router();
  * HTTP/1.1 200 OK
  * [
  *         {
- *             "_id": "652c2f0f923bd80603c992f9",
  *             "userId": "user1",
  *             "status": "ACCEPTED",
  *             "response": "ACCEPTED",
  *             "reviewer": "reviewer1",
  *             "emailSent": false
  *         },
  *         {
- *             "_id": "652c2f4a4e5cf39082bbaad8",
  *             "userId": "user3",
  *             "status": "WAITLISTED",
  *             "response": "PENDING",
  *             "reviewer": "reviewer1",
  *             "emailSent": false
  *         },
  *         {
- *             "_id": "652c2f65867cc5b6728ee48c",
  *             "userId": "user4",
  *             "status": "WAITLISTED",
  *             "response": "PENDING",
  *             "reviewer": "reviewer1",
  *             "emailSent": false
  *         }
- *     ]
+ * ]
  * @apiUser strongVerifyErrors
  * @apiError (500: Internal Server Error) {String} InternalError occurred on the server.
  * @apiError (403: Forbidden) {String} Forbidden API accessed by user without valid perms.
  * */
 admissionRouter.get("/", strongJwtVerification, async (_: Request, res: Response) => {
     const token: JwtPayload = res.locals.payload as JwtPayload;
     if (!hasElevatedPerms(token)) {
-        return res.status(StatusCode.ClientErrorForbidden).send({ error: "InvalidToken" });
+        return res.status(StatusCode.ClientErrorForbidden).send({ error: "Forbidden" });
     }
     try {
         const filteredEntries: DecisionInfo[] = await Models.DecisionInfo.find({ emailSent: false });
@@ -72,8 +69,7 @@ admissionRouter.get("/", strongJwtVerification, async (_: Request, res: Response
  *
  * @apiParamExample Example Request (Staff):
  * HTTP/1.1 PUT /admission/
- * {
- *   "entries": [
+ * [
  *     {
  *       "userId": "user1",
  *       "name": "Jason",
@@ -89,8 +85,7 @@ admissionRouter.get("/", strongJwtVerification, async (_: Request, res: Response
  *       "name": "John",
  *       "status": "WAITLISTED"
  *     }
- *   ]
- * }
+ * ]
  *
  * @apiSuccess (200: Success) {String} StatusSuccess
  *
@@ -101,7 +96,7 @@ admissionRouter.get("/", strongJwtVerification, async (_: Request, res: Response
 admissionRouter.put("/", strongJwtVerification, async (req: Request, res: Response) => {
     const token: JwtPayload = res.locals.payload as JwtPayload;
     if (!hasElevatedPerms(token)) {
-        return res.status(StatusCode.ClientErrorForbidden).send({ error: "InvalidToken" });
+        return res.status(StatusCode.ClientErrorForbidden).send({ error: "Forbidden" });
     }
     const updateEntries: ApplicantDecisionFormat[] = req.body as ApplicantDecisionFormat[];
     const ops = updateEntries.map((entry) => {