Fix registration types & cleanup

HackIllinois · Oct 23, 2024 · bb8bca4 · bb8bca4
1 parent 1f00d43
commit bb8bca4
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 140 deletions.
diff --git a/src/services/admission/admission-router.test.ts b/src/services/admission/admission-router.test.ts
@@ -1,9 +1,8 @@
 import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import Models from "../../database/models";
 import { DecisionStatus, DecisionResponse, AdmissionDecision } from "./admission-schemas";
-import { RegistrationFormat } from "../registration/registration-formats";
 import { RegistrationTemplates } from "../../common/config";
-import { Gender, Degree, Race, HackInterest, HackOutreach } from "../registration/registration-schemas";
+import { Gender, Degree, Race, HackInterest, HackOutreach, RegistrationApplication } from "../registration/registration-schemas";
 import { getAsStaff, getAsUser, putAsStaff, putAsUser, getAsAttendee, putAsApplicant, TESTER } from "../../common/testTools";
 import { StatusCode } from "status-code-enum";
 import type * as MailLib from "../../services/mail/mail-lib";
@@ -48,7 +47,8 @@ const TESTER_APPLICATION = {
     race: [Race.NO_ANSWER],
     hackInterest: [HackInterest.TECHNICAL_WORKSHOPS],
     hackOutreach: [HackOutreach.INSTAGRAM],
-} satisfies RegistrationFormat;
+    hasSubmitted: false,
+} satisfies RegistrationApplication;
 
 const updateRequest = [
     {

diff --git a/src/services/admission/admission-router.ts b/src/services/admission/admission-router.ts
@@ -10,10 +10,8 @@ import {
     DecisionRequestSchema,
     DecisionAlreadyRSVPdError,
     DecisionAlreadyRSVPdErrorSchema,
-    ApplicationNotFoundError,
     DecisionNotFoundError,
     DecisionNotFoundErrorSchema,
-    ApplicationNotFoundErrorSchema,
     AdmissionDecisionSchema,
 } from "./admission-schemas";
 import Models from "../../database/models";
@@ -25,6 +23,7 @@ import { sendMail } from "../mail/mail-lib";
 import specification, { Tag } from "../../middleware/specification";
 import { z } from "zod";
 import { SuccessResponseSchema, UserIdSchema } from "../../common/schemas";
+import { RegistrationNotFoundError, RegistrationNotFoundErrorSchema } from "../registration/registration-schemas";
 
 const admissionRouter = Router();
 
@@ -72,9 +71,9 @@ admissionRouter.put(
                     schema: DecisionNotFoundErrorSchema,
                 },
                 {
-                    id: ApplicationNotFoundError.error,
+                    id: RegistrationNotFoundError.error,
                     description: "Couldn't find user's application",
-                    schema: ApplicationNotFoundErrorSchema,
+                    schema: RegistrationNotFoundErrorSchema,
                 },
             ],
             [StatusCode.ClientErrorForbidden]: {
@@ -99,7 +98,7 @@ admissionRouter.put(
         // Verify they have an application
         const application = await Models.RegistrationApplication.findOne({ userId });
         if (!application) {
-            return res.status(StatusCode.ClientErrorNotFound).send(ApplicationNotFoundError);
+            return res.status(StatusCode.ClientErrorNotFound).send(RegistrationNotFoundError);
         }
 
         // Must be accepted to make a decision
@@ -171,7 +170,7 @@ admissionRouter.put(
             },
             [StatusCode.ClientErrorNotFound]: {
                 description: "A applicant's application was not found",
-                schema: ApplicationNotFoundErrorSchema,
+                schema: RegistrationNotFoundErrorSchema,
             },
         },
     }),
@@ -189,7 +188,7 @@ admissionRouter.put(
             if (existingDecision?.status === DecisionStatus.TBD && status !== DecisionStatus.TBD) {
                 const application = await Models.RegistrationApplication.findOne({ userId: existingDecision.userId });
                 if (!application) {
-                    return res.status(StatusCode.ClientErrorNotFound).send(ApplicationNotFoundError);
+                    return res.status(StatusCode.ClientErrorNotFound).send(RegistrationNotFoundError);
                 }
                 recipients.push(application.emailAddress);
             }

diff --git a/src/services/admission/admission-schemas.ts b/src/services/admission/admission-schemas.ts
@@ -67,8 +67,3 @@ export const [DecisionNotFoundError, DecisionNotFoundErrorSchema] = CreateErrorA
     error: "DecisionNotFound",
     message: "Couldn't find your decision!",
 });
-
-export const [ApplicationNotFoundError, ApplicationNotFoundErrorSchema] = CreateErrorAndSchema({
-    error: "ApplicationNotFound",
-    message: "Couldn't find your application!",
-});
diff --git a/src/services/registration/registration-formats.ts b/src/services/registration/registration-formats.ts
diff --git a/src/services/registration/registration-router.test.ts b/src/services/registration/registration-router.test.ts
@@ -3,15 +3,21 @@ import { StatusCode } from "status-code-enum";
 import Models from "../../database/models";
 import { RegistrationTemplates } from "../../common/config";
 import { TESTER, getAsUser, getAsAdmin, postAsUser } from "../../common/testTools";
-import { RegistrationFormat } from "./registration-formats";
-import { Degree, Gender, HackInterest, HackOutreach, Race, RegistrationApplication } from "./registration-schemas";
+import {
+    Degree,
+    Gender,
+    HackInterest,
+    HackOutreach,
+    Race,
+    RegistrationApplication,
+    RegistrationApplicationRequest,
+} from "./registration-schemas";
 import type * as MailLib from "../../services/mail/mail-lib";
 import type { AxiosResponse } from "axios";
 import { MailInfo } from "../mail/mail-schemas";
 
 const APPLICATION = {
     isProApplicant: false,
-    userId: TESTER.id,
     preferredName: TESTER.name,
     legalName: TESTER.name,
     emailAddress: TESTER.email,
@@ -29,14 +35,14 @@ const APPLICATION = {
     race: [Race.NO_ANSWER],
     hackInterest: [HackInterest.TECHNICAL_WORKSHOPS],
     hackOutreach: [HackOutreach.INSTAGRAM],
-} satisfies RegistrationFormat;
+} satisfies RegistrationApplicationRequest;
 
-const UNSUBMITTED_REGISTRATION = { hasSubmitted: false, ...APPLICATION } satisfies RegistrationApplication;
+const UNSUBMITTED_REGISTRATION = { userId: TESTER.id, hasSubmitted: false, ...APPLICATION } satisfies RegistrationApplication;
 const UNSUBMITTED_OTHER_REGISTRATION = {
     ...UNSUBMITTED_REGISTRATION,
     userId: "otherUser",
 } satisfies RegistrationApplication;
-const SUBMITTED_REGISTRATION = { hasSubmitted: true, ...APPLICATION } satisfies RegistrationApplication;
+const SUBMITTED_REGISTRATION = { userId: TESTER.id, hasSubmitted: true, ...APPLICATION } satisfies RegistrationApplication;
 
 describe("GET /registration/", () => {
     beforeEach(async () => {
@@ -83,7 +89,7 @@ describe("GET /registration/userid/:USERID", () => {
 describe("POST /registration/", () => {
     it("should create registration", async () => {
         const response = await postAsUser("/registration/").send(APPLICATION).expect(StatusCode.SuccessOK);
-        expect(JSON.parse(response.text)).toMatchObject(UNSUBMITTED_REGISTRATION);
+        expect(JSON.parse(response.text)).toMatchObject(APPLICATION);
 
         // Stored in DB
         const stored: RegistrationApplication | null = await Models.RegistrationApplication.findOne({
@@ -98,7 +104,7 @@ describe("POST /registration/", () => {
             degree: "PhD of Data Corruption",
         });
         const response = await postAsUser("/registration/").send(APPLICATION).expect(StatusCode.SuccessOK);
-        expect(JSON.parse(response.text)).toMatchObject(UNSUBMITTED_REGISTRATION);
+        expect(JSON.parse(response.text)).toMatchObject(APPLICATION);
 
         // Stored in DB
         const stored: RegistrationApplication | null = await Models.RegistrationApplication.findOne({

diff --git a/src/services/registration/registration-router.ts b/src/services/registration/registration-router.ts
@@ -7,6 +7,7 @@ import Models from "../../database/models";
 import {
     RegistrationAlreadySubmittedError,
     RegistrationAlreadySubmittedErrorSchema,
+    RegistrationApplication,
     RegistrationApplicationRequestSchema,
     RegistrationApplicationSchema,
     RegistrationClosedError,
@@ -141,17 +142,26 @@ registrationRouter.post(
     async (req, res) => {
         const { id: userId } = getAuthenticatedUser(req);
 
-        const registrationData = req.body;
+        const setRequest = req.body;
 
         const registrationInfo = await Models.RegistrationApplication.findOne({ userId: userId });
         if (registrationInfo?.hasSubmitted ?? false) {
             return res.status(StatusCode.ClientErrorBadRequest).send(RegistrationAlreadySubmittedError);
         }
 
-        const newRegistrationInfo = await Models.RegistrationApplication.findOneAndReplace({ userId: userId }, registrationData, {
-            upsert: true,
-            new: true,
-        });
+        const updateRegistration: RegistrationApplication = {
+            ...setRequest,
+            userId,
+            hasSubmitted: false,
+        };
+        const newRegistrationInfo = await Models.RegistrationApplication.findOneAndReplace(
+            { userId: userId },
+            updateRegistration,
+            {
+                upsert: true,
+                new: true,
+            },
+        );
         if (!newRegistrationInfo) {
             throw Error("Failed to update registration info");
         }