From c6980784e12ab9ea0bf257c2da7f9cac80fee89f Mon Sep 17 00:00:00 2001
From: FinleyNeilson <finleyjohnneilson@gmail.com>
Date: Tue, 21 Jul 2026 21:14:08 +1200
Subject: [PATCH 1/2] feat(registration): cap faculty selection and replace
 other faculty with majors

---
 src/app/registration/_pages/NewUoaPage.tsx    | 63 ++++++-------
 src/app/registration/_tests/actions.test.ts   | 92 +++++++++++++------
 src/app/registration/actions.ts               | 79 ++++++++--------
 src/app/registration/types.ts                 |  3 +-
 src/domain/member/_tests/validation.test.ts   |  3 +
 src/domain/member/constants.ts                |  1 +
 .../parseRegistrationFormData.test.ts         |  5 +
 .../parseRegistrationFormData.ts              |  2 +
 8 files changed, 148 insertions(+), 100 deletions(-)

diff --git a/src/app/registration/_pages/NewUoaPage.tsx b/src/app/registration/_pages/NewUoaPage.tsx
index bc4603b..4be9c6d 100644
--- a/src/app/registration/_pages/NewUoaPage.tsx
+++ b/src/app/registration/_pages/NewUoaPage.tsx
@@ -2,18 +2,14 @@
 
 import { useFormError } from "../RegistrationForm";
 import { RegistrationDraft } from "../types";
-
-import { useRef } from "react";
+import { MAX_MAJORS } from "@/domain/member/constants";
 
 export function NewUoaPage({ fields }: { fields: Partial<RegistrationDraft> }) {
   const state = useFormError();
   const errorFields = state?.fields;
   const field = errorFields ?? fields;
 
-  /* Client JS enhancement:
-   * Used to create a reference to the Other checkbox so it automatically checks when user enters text
-   */
-  const otherFacultyCheckboxRef = useRef<HTMLInputElement>(null);
+  const majorCount = Math.min(field?.majorCount ?? 1, MAX_MAJORS);
 
   return (
     <>
@@ -136,41 +132,36 @@ export function NewUoaPage({ fields }: { fields: Partial<RegistrationDraft> }) {
             />
             Auckland Bioengineering Institute
           </label>
+        </div>
+      </fieldset>
 
-          <label>
+      <fieldset>
+        <legend>What are you majoring/specialising in?</legend>
+        <p>Majors are independent of the faculties you selected above.</p>
+
+        {Array.from({ length: majorCount }).map((_, i) => (
+          <div key={i}>
+            <label htmlFor={`majors-${i}`} className="sr-only">
+              Major/specialisation {i + 1}
+            </label>
             <input
-              ref={otherFacultyCheckboxRef}
-              type="checkbox"
-              name="faculty"
-              value="other"
-              defaultChecked={
-                field?.faculty?.includes("other") ||
-                Boolean(field?.otherFaculty?.trim())
-              }
+              type="text"
+              name="majors"
+              id={`majors-${i}`}
+              placeholder="Your answer"
+              defaultValue={field?.majors?.[i] ?? ""}
+              maxLength={40}
             />
-            Other
-          </label>
+          </div>
+        ))}
 
-          <label htmlFor="otherFaculty" className="sr-only">
-            Please specify other faculty
-          </label>
-          <input
-            type="text"
-            name="otherFaculty"
-            id="otherFaculty"
-            placeholder="Specify other"
-            defaultValue={field?.otherFaculty || ""}
-            maxLength={100}
-            onInput={(event) => {
-              const userHasTypedSomething =
-                event.currentTarget.value.trim().length > 0;
+        <input type="hidden" name="majorCount" value={majorCount} />
 
-              if (userHasTypedSomething && otherFacultyCheckboxRef.current) {
-                otherFacultyCheckboxRef.current.checked = true;
-              }
-            }}
-          />
-        </div>
+        {majorCount < MAX_MAJORS && (
+          <button type="submit" name="intent" value="addMajor">
+            Add another major
+          </button>
+        )}
       </fieldset>
 
       <div>
diff --git a/src/app/registration/_tests/actions.test.ts b/src/app/registration/_tests/actions.test.ts
index fb917bd..d342fb6 100644
--- a/src/app/registration/_tests/actions.test.ts
+++ b/src/app/registration/_tests/actions.test.ts
@@ -295,7 +295,7 @@ describe("case: newUoa", () => {
     expect(result?.error).toMatch(/9-10 digits/);
   });
 
-  it("rejects when no faculty is selected and no otherFaculty is given", async () => {
+  it("rejects when no faculty is selected", async () => {
     const result = await submitRegistrationStep(
       null,
       buildFormData({ ...validBase, faculty: [] }),
@@ -303,24 +303,31 @@ describe("case: newUoa", () => {
     expect(result?.error).toMatch(/at least 1 faculty/);
   });
 
-  it("rejects 'other' selected without otherFaculty text", async () => {
+  it("rejects more than MAX_FACULTIES faculties", async () => {
     const fd = buildFormData({
       ...validBase,
-      faculty: ["other"],
-      otherFaculty: "",
+      faculty: ["science", "law", "business"],
     });
     const result = await submitRegistrationStep(null, fd);
-    expect(result?.error).toMatch(/specify your other faculty/);
+    expect(result?.error).toMatch(/at most 2 faculties/);
   });
 
-  it("rejects an otherFaculty value over the max length", async () => {
+  it("rejects more than MAX_MAJORS majors", async () => {
     const fd = buildFormData({
       ...validBase,
-      faculty: ["other"],
-      otherFaculty: "a".repeat(101),
+      majors: ["a", "b", "c", "d", "e"],
     });
     const result = await submitRegistrationStep(null, fd);
-    expect(result?.error).toMatch(/Other faculty must be under 100 characters/);
+    expect(result?.error).toMatch(/at most 4 majors/);
+  });
+
+  it("rejects a major value over the max length", async () => {
+    const fd = buildFormData({
+      ...validBase,
+      majors: ["a".repeat(41)],
+    });
+    const result = await submitRegistrationStep(null, fd);
+    expect(result?.error).toMatch(/Each major must be under 40 characters/);
   });
 
   it("rejects a missing programme", async () => {
@@ -359,6 +366,45 @@ describe("case: newUoa", () => {
     ).rejects.toThrow("REDIRECT:/registration");
     expect(JSON.parse(cookieStore.get("formState")!).page).toBe("final");
   });
+
+  describe("addMajor intent", () => {
+    it("increments majorCount and preserves already-typed fields without advancing the page", async () => {
+      setCookieDraft({ page: "newUoa", pageStack: ["start", "newMember"] });
+      const fd = buildFormData({
+        ...validBase,
+        intent: "addMajor",
+        majorCount: "1",
+        majors: ["Computer Science"],
+      });
+
+      await expect(submitRegistrationStep(null, fd)).rejects.toThrow(
+        "REDIRECT:/registration",
+      );
+
+      const saved = JSON.parse(cookieStore.get("formState")!);
+      expect(saved.page).toBe("newUoa");
+      expect(saved.pageStack).toEqual(["start", "newMember"]);
+      expect(saved.majorCount).toBe(2);
+      expect(saved.majors).toEqual(["Computer Science"]);
+      expect(saved.upi).toBe("abcd123");
+    });
+
+    it("caps majorCount at MAX_MAJORS", async () => {
+      setCookieDraft({ page: "newUoa", pageStack: ["start", "newMember"] });
+      const fd = buildFormData({
+        ...validBase,
+        intent: "addMajor",
+        majorCount: "4",
+      });
+
+      await expect(submitRegistrationStep(null, fd)).rejects.toThrow(
+        "REDIRECT:/registration",
+      );
+
+      const saved = JSON.parse(cookieStore.get("formState")!);
+      expect(saved.majorCount).toBe(4);
+    });
+  });
 });
 
 describe("case: newNonUoa", () => {
@@ -554,13 +600,13 @@ describe("case: final", () => {
     expect(result?.error).toBe("It looks like you've already registered.");
   });
 
-  describe("otherFaculty merge into faculty", () => {
-    it("folds otherFaculty into faculty and removes the 'other' placeholder", async () => {
+  describe("majors flow through to submission", () => {
+    it("includes majors from the draft in the parsed submission", async () => {
       setCookieDraft({
         page: "final",
         pageStack: ["start", "newMember", "newUoa"],
-        faculty: ["science", "other"],
-        otherFaculty: "Faculty of Made Up Studies",
+        faculty: ["science"],
+        majors: ["Computer Science", "Statistics"],
       });
       const fd = buildFormData({
         page: "final",
@@ -572,34 +618,26 @@ describe("case: final", () => {
       );
 
       const submittedData = submitMemberRegistrationMock.mock.calls[0][0];
-      expect(submittedData.faculty).toEqual([
-        "science",
-        "Faculty of Made Up Studies",
-      ]);
+      expect(submittedData.majors).toEqual(["Computer Science", "Statistics"]);
     });
 
-    it("does not mutate the object read from the cookie", async () => {
+    it("defaults majors to an empty array when absent from the draft", async () => {
       setCookieDraft({
         page: "final",
         pageStack: ["start", "newMember", "newUoa"],
-        faculty: ["other"],
-        otherFaculty: "Faculty of Made Up Studies",
+        faculty: ["science"],
       });
-      const rawBefore = cookieStore.get("formState")!;
-
       const fd = buildFormData({
         page: "final",
         linuxSkillLevel: "BEGINNER_USER",
       });
+
       await expect(submitRegistrationStep(null, fd)).rejects.toThrow(
         "REDIRECT:/registration/success",
       );
 
-      // Re-parsing the string captured *before* the call proves nothing
-      // mutated the underlying data during the request — this is the
-      // test for the prev.faculty = [...] mutation bug.
-      const reparsed = JSON.parse(rawBefore);
-      expect(reparsed.faculty).toEqual(["other"]);
+      const submittedData = submitMemberRegistrationMock.mock.calls[0][0];
+      expect(submittedData.majors).toEqual([]);
     });
   });
 
diff --git a/src/app/registration/actions.ts b/src/app/registration/actions.ts
index 3d59eac..9585b3c 100644
--- a/src/app/registration/actions.ts
+++ b/src/app/registration/actions.ts
@@ -14,6 +14,8 @@ import {
   VALID_SKILL_LEVELS,
   VALID_YEAR_LEVELS,
   MAX_LENGTHS,
+  MAX_FACULTIES,
+  MAX_MAJORS,
 } from "@/domain/member/constants";
 
 import { exceedsMax } from "@/domain/member/exceedsMax";
@@ -47,7 +49,6 @@ function stripIrrelevantFields(
       lastName,
       isCurrentUoaStudent,
       faculty,
-      otherFaculty,
       programme,
       yearLevel,
       primaryAffiliation,
@@ -57,24 +58,12 @@ function stripIrrelevantFields(
     } = draftFields;
     return stripped;
   } else if (lastPage == "newUoa") {
-    const {
-      primaryAffiliation,
-      nonUoaExcerpt,
-      nonUoaPitch,
-      otherFaculty,
-      ...stripped
-    } = draftFields;
+    const { primaryAffiliation, nonUoaExcerpt, nonUoaPitch, ...stripped } =
+      draftFields;
     return stripped;
   } else {
-    const {
-      upi,
-      studentId,
-      faculty,
-      otherFaculty,
-      programme,
-      yearLevel,
-      ...stripped
-    } = draftFields;
+    const { upi, studentId, faculty, programme, yearLevel, ...stripped } =
+      draftFields;
     return stripped;
   }
 }
@@ -91,6 +80,7 @@ function toParsedSubmission(
     upi: draft.upi ?? null,
     studentId: draft.studentId ?? null,
     faculty: draft.faculty ?? [],
+    majors: draft.majors ?? [],
     programme: draft.programme ?? null,
     yearLevel: draft.yearLevel ?? null,
     primaryAffiliation: draft.primaryAffiliation ?? null,
@@ -227,18 +217,36 @@ export async function submitRegistrationStep(
       const upi = formData.get("upi") as string;
       const studentId = formData.get("studentId") as string;
       const faculty = formData.getAll("faculty") as string[];
-      const otherFaculty = formData.get("otherFaculty") as string;
+      const majors = (formData.getAll("majors") as string[])
+        .map((major) => major.trim())
+        .filter((major) => major !== "");
+      const majorCount = Math.min(
+        Number(formData.get("majorCount")) || prev.majorCount || 1,
+        MAX_MAJORS,
+      );
       const programme = formData.get("programme") as string;
       const yearLevel = formData.get("yearLevel") as string;
       const fields = {
         upi,
         studentId,
         faculty,
-        otherFaculty,
+        majors,
+        majorCount,
         programme,
         yearLevel,
       };
 
+      if (intent == "addMajor") {
+        const newDraft: Partial<RegistrationDraft> = {
+          ...prev,
+          ...fields,
+          majorCount: Math.min(majorCount + 1, MAX_MAJORS),
+        };
+
+        cookieStore.set("formState", JSON.stringify(newDraft), COOKIE_OPTIONS);
+        redirect("/registration");
+      }
+
       if (!upi) {
         return { error: "UPI is required.", fields };
       }
@@ -252,17 +260,27 @@ export async function submitRegistrationStep(
         return { error: "Student ID must be 9-10 digits.", fields };
       }
 
-      if (faculty.length == 0 && !otherFaculty) {
+      if (faculty.length == 0) {
         return { error: "Please select at least 1 faculty.", fields };
       }
 
-      if (faculty.includes("other") && !otherFaculty) {
-        return { error: "Please specify your other faculty.", fields };
+      if (faculty.length > MAX_FACULTIES) {
+        return {
+          error: `Please select at most ${MAX_FACULTIES} faculties.`,
+          fields,
+        };
       }
 
-      if (exceedsMax(otherFaculty, "otherFaculty")) {
+      if (majors.length > MAX_MAJORS) {
         return {
-          error: `Other faculty must be under ${MAX_LENGTHS.otherFaculty} characters.`,
+          error: `Please enter at most ${MAX_MAJORS} majors.`,
+          fields,
+        };
+      }
+
+      if (majors.some((major) => exceedsMax(major, "major"))) {
+        return {
+          error: `Each major must be under ${MAX_LENGTHS.major} characters.`,
           fields,
         };
       }
@@ -387,20 +405,9 @@ export async function submitRegistrationStep(
         };
       }
 
-      // Merge otherFaculty into faculty without mutating prev
-      const mergedPrev = prev.otherFaculty
-        ? {
-            ...prev,
-            faculty: [
-              ...(prev.faculty ?? []).filter((f) => f !== "other"),
-              prev.otherFaculty,
-            ],
-          }
-        : prev;
-
       // Merge final step data with full draft
       const fullDraft: Partial<RegistrationDraft> = {
-        ...stripIrrelevantFields(mergedPrev),
+        ...stripIrrelevantFields(prev),
         linuxSkillLevel,
         potentialInvolvement,
         discordUsername,
diff --git a/src/app/registration/types.ts b/src/app/registration/types.ts
index 115c252..6eda756 100644
--- a/src/app/registration/types.ts
+++ b/src/app/registration/types.ts
@@ -25,9 +25,10 @@ export type RegistrationDraft = {
 
   // Current UoA only
   faculty?: string[];
-  otherFaculty?: string;
   programme?: string;
   yearLevel?: string;
+  majors?: string[];
+  majorCount?: number;
 
   // Non-UoA only
   primaryAffiliation?: string;
diff --git a/src/domain/member/_tests/validation.test.ts b/src/domain/member/_tests/validation.test.ts
index a8efe87..89cd776 100644
--- a/src/domain/member/_tests/validation.test.ts
+++ b/src/domain/member/_tests/validation.test.ts
@@ -15,6 +15,7 @@ const validReturningMember: ParsedRegistrationFormSubmission = {
   upi: "lmes910",
   studentId: "123456789",
   faculty: [],
+  majors: [],
   programme: null,
   yearLevel: null,
   primaryAffiliation: null,
@@ -34,6 +35,7 @@ const validCurrentUoaStudent: ParsedRegistrationFormSubmission = {
   upi: "ehaa909",
   studentId: "123456788",
   faculty: ["science"],
+  majors: ["Computer Science"],
   programme: "Bachelor of Science",
   yearLevel: "FIRST_YEAR",
   primaryAffiliation: null,
@@ -53,6 +55,7 @@ const validNonUoaStudent: ParsedRegistrationFormSubmission = {
   upi: null,
   studentId: null,
   faculty: [],
+  majors: [],
   programme: null,
   yearLevel: null,
   primaryAffiliation: "Independent",
diff --git a/src/domain/member/constants.ts b/src/domain/member/constants.ts
index de667ab..957eb3c 100644
--- a/src/domain/member/constants.ts
+++ b/src/domain/member/constants.ts
@@ -27,6 +27,7 @@ export const MAX_LENGTHS = {
   firstName: 100,
   lastName: 100,
   otherFaculty: 100,
+  major: 40,
   primaryAffiliation: 150,
   nonUoaExcerpt: 500,
   nonUoaPitch: 500,
diff --git a/src/features/membership-registration/parseRegistrationFormData.test.ts b/src/features/membership-registration/parseRegistrationFormData.test.ts
index 183f2d1..216dc4a 100644
--- a/src/features/membership-registration/parseRegistrationFormData.test.ts
+++ b/src/features/membership-registration/parseRegistrationFormData.test.ts
@@ -18,6 +18,9 @@ describe("parseRegistrationFormData", () => {
     formData.append("faculty", "science");
     formData.append("faculty", "  engineeringDesign  ");
 
+    formData.append("majors", "  Computer Science  ");
+    formData.append("majors", "  Software Engineering  ");
+
     formData.set("programme", "  Bachelor of Science  ");
     formData.set("yearLevel", "  year2  ");
 
@@ -44,6 +47,7 @@ describe("parseRegistrationFormData", () => {
       studentId: "123456789",
 
       faculty: ["science", "engineeringDesign"],
+      majors: ["Computer Science", "Software Engineering"],
       programme: "Bachelor of Science",
       yearLevel: "year2",
 
@@ -71,6 +75,7 @@ describe("parseRegistrationFormData", () => {
       studentId: null,
 
       faculty: [],
+      majors: [],
       programme: null,
       yearLevel: null,
 
diff --git a/src/features/membership-registration/parseRegistrationFormData.ts b/src/features/membership-registration/parseRegistrationFormData.ts
index 0c96838..edcdba1 100644
--- a/src/features/membership-registration/parseRegistrationFormData.ts
+++ b/src/features/membership-registration/parseRegistrationFormData.ts
@@ -10,6 +10,7 @@ export type ParsedRegistrationFormSubmission = {
   studentId: string | null;
 
   faculty: string[];
+  majors: string[];
   programme: string | null;
   yearLevel: string | null;
 
@@ -65,6 +66,7 @@ export function parseRegistrationFormData(
     upi: getLowercaseTextField(formData, "upi"),
     studentId: getTextField(formData, "studentId"),
     faculty: getCheckboxGroup(formData, "faculty"),
+    majors: getCheckboxGroup(formData, "majors"),
     programme: getTextField(formData, "programme"),
     yearLevel: getTextField(formData, "yearLevel"),
 

From cfeece9da49bb9921bf731e0b8299dec2e2da31e Mon Sep 17 00:00:00 2001
From: FinleyNeilson <finleyjohnneilson@gmail.com>
Date: Mon, 27 Jul 2026 08:57:34 +1200
Subject: [PATCH 2/2] fix(registration): strip major fields and drop stale
 otherFaculty length check

---
 src/app/registration/actions.ts | 14 ++++++++++++--
 src/domain/member/constants.ts  |  1 -
 src/domain/member/validation.ts |  5 +----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/app/registration/actions.ts b/src/app/registration/actions.ts
index 9585b3c..9d4c711 100644
--- a/src/app/registration/actions.ts
+++ b/src/app/registration/actions.ts
@@ -51,6 +51,8 @@ function stripIrrelevantFields(
       faculty,
       programme,
       yearLevel,
+      majors,
+      majorCount,
       primaryAffiliation,
       nonUoaExcerpt,
       nonUoaPitch,
@@ -62,8 +64,16 @@ function stripIrrelevantFields(
       draftFields;
     return stripped;
   } else {
-    const { upi, studentId, faculty, programme, yearLevel, ...stripped } =
-      draftFields;
+    const {
+      upi,
+      studentId,
+      faculty,
+      programme,
+      yearLevel,
+      majors,
+      majorCount,
+      ...stripped
+    } = draftFields;
     return stripped;
   }
 }
diff --git a/src/domain/member/constants.ts b/src/domain/member/constants.ts
index 957eb3c..d5e7f79 100644
--- a/src/domain/member/constants.ts
+++ b/src/domain/member/constants.ts
@@ -26,7 +26,6 @@ export const MAX_LENGTHS = {
   email: 254,
   firstName: 100,
   lastName: 100,
-  otherFaculty: 100,
   major: 40,
   primaryAffiliation: 150,
   nonUoaExcerpt: 500,
diff --git a/src/domain/member/validation.ts b/src/domain/member/validation.ts
index 0608aca..639146b 100644
--- a/src/domain/member/validation.ts
+++ b/src/domain/member/validation.ts
@@ -294,10 +294,7 @@ function validateFieldValues(
     }
 
     for (const facultyOption of parsed.faculty) {
-      if (
-        facultyOption.trim() === "" ||
-        facultyOption.length > MAX_LENGTHS.otherFaculty
-      ) {
+      if (facultyOption.trim() === "") {
         return {
           fieldsValid: false,
           error: {