From cf38738cb4ff6b90ae5b85a57ffed5fa275a7ed9 Mon Sep 17 00:00:00 2001
From: reehals <sunny.reehal@gmail.com>
Date: Mon, 29 Sep 2025 21:54:27 -0700
Subject: [PATCH 1/3] Fix panel judging opt in

---
 app/(api)/_actions/auth/verifyCode.ts         |  15 +-
 .../_actions/logic/assignJudgesToPanels.ts    |   8 +-
 app/(pages)/_components/AuthForm/AuthForm.tsx |  39 ++--
 app/(pages)/_hooks/useAuthForm.ts             |  10 +-
 .../admin/_components/Judges/JudgeCard.tsx    |   3 +
 .../admin/_components/Judges/JudgeForm.tsx    |  43 ++++-
 .../_components/AuthForms/CheckInForm.tsx     |  13 +-
 app/_types/panel.ts                           |   2 +-
 app/_types/user.ts                            |   1 +
 ...0042214-add-opted-into-panels-to-users.mjs | 176 ++++++++++++++++++
 ...930045209-fix-panels-domain-validation.mjs | 112 +++++++++++
 11 files changed, 389 insertions(+), 33 deletions(-)
 create mode 100644 migrations/20250930042214-add-opted-into-panels-to-users.mjs
 create mode 100644 migrations/20250930045209-fix-panels-domain-validation.mjs

diff --git a/app/(api)/_actions/auth/verifyCode.ts b/app/(api)/_actions/auth/verifyCode.ts
index a49dfa38..3aebe2f5 100644
--- a/app/(api)/_actions/auth/verifyCode.ts
+++ b/app/(api)/_actions/auth/verifyCode.ts
@@ -2,17 +2,24 @@
 
 import { updateUser } from '@actions/users/updateUser';
 
-export default async function verifyCode(id: string, code: string) {
+export default async function verifyCode(
+  id: string,
+  code: string,
+  optedIntoPanels?: boolean
+) {
   try {
     const validCode = code === (process.env.CHECK_IN_CODE as string);
     if (!validCode) {
       throw new Error('Invalid code.');
     }
 
+    const update: any = { has_checked_in: true };
+    if (typeof optedIntoPanels === 'boolean') {
+      update.opted_into_panels = optedIntoPanels;
+    }
+
     const res = await updateUser(id, {
-      $set: {
-        has_checked_in: true,
-      },
+      $set: update,
     });
 
     if (!res.ok) {
diff --git a/app/(api)/_actions/logic/assignJudgesToPanels.ts b/app/(api)/_actions/logic/assignJudgesToPanels.ts
index 0ffa6a6f..aa95b860 100644
--- a/app/(api)/_actions/logic/assignJudgesToPanels.ts
+++ b/app/(api)/_actions/logic/assignJudgesToPanels.ts
@@ -35,7 +35,13 @@ export default async function assignJudgesToPanels(panelSize: number = 5) {
     };
   }
 
-  const judgesRes = await GetManyUsers({ role: 'judge', has_checked_in: true });
+  // only judges who have checked in and explicitly opted into panels
+  const judgesRes = await GetManyUsers({
+    role: 'judge',
+    has_checked_in: true,
+    opted_into_panels: true,
+  });
+  console.log(judgesRes);
   if (!judgesRes.ok || judgesRes.body.length === 0) {
     return {
       ok: false,
diff --git a/app/(pages)/_components/AuthForm/AuthForm.tsx b/app/(pages)/_components/AuthForm/AuthForm.tsx
index 53bd3873..491f3f79 100644
--- a/app/(pages)/_components/AuthForm/AuthForm.tsx
+++ b/app/(pages)/_components/AuthForm/AuthForm.tsx
@@ -11,10 +11,9 @@ import hackerStyles from './HackerAuthForm.module.scss';
 import judgeStyles from './JudgeAuthForm.module.scss';
 
 type Role = 'hacker' | 'judge';
-type FieldName = 'email' | 'password' | 'passwordDupe' | 'code';
 
 interface FormField {
-  name: FieldName;
+  name: string;
   type: string;
   label: string;
   placeholder?: string;
@@ -27,8 +26,8 @@ interface AuthFormProps {
   buttonText: string;
   linkText?: string;
   linkHref?: string;
-  initialValues: Record<string, string>;
-  onSubmit: (values: Record<string, string>) => Promise<any>;
+  initialValues: Record<string, any>;
+  onSubmit: (values: Record<string, any>) => Promise<any>;
   onSuccess: () => void;
 }
 
@@ -68,17 +67,27 @@ export default function AuthForm({
                 <p className={styles.error_msg}>{errors[field.name]}</p>
                 <div className={styles.input_container}>
                   <label htmlFor={field.name}>{field.label}</label>
-                  <input
-                    name={field.name}
-                    type={field.type}
-                    placeholder={field.placeholder}
-                    value={formValues[field.name] || ''}
-                    onInput={handleChange}
-                    readOnly={field.readOnly}
-                    style={{
-                      cursor: field.readOnly ? 'not-allowed' : 'auto',
-                    }}
-                  />
+                  {field.type === 'checkbox' ? (
+                    <input
+                      name={field.name}
+                      type="checkbox"
+                      checked={!!formValues[field.name]}
+                      onChange={handleChange}
+                      readOnly={field.readOnly}
+                    />
+                  ) : (
+                    <input
+                      name={field.name}
+                      type={field.type}
+                      placeholder={field.placeholder}
+                      value={formValues[field.name] || ''}
+                      onInput={handleChange}
+                      readOnly={field.readOnly}
+                      style={{
+                        cursor: field.readOnly ? 'not-allowed' : 'auto',
+                      }}
+                    />
+                  )}
                 </div>
               </div>
             ))}
diff --git a/app/(pages)/_hooks/useAuthForm.ts b/app/(pages)/_hooks/useAuthForm.ts
index 38470da9..bb0bf941 100644
--- a/app/(pages)/_hooks/useAuthForm.ts
+++ b/app/(pages)/_hooks/useAuthForm.ts
@@ -3,7 +3,7 @@
 import { useEffect, useState, ChangeEvent, FormEvent } from 'react';
 
 interface FieldValues {
-  [key: string]: string;
+  [key: string]: any;
 }
 
 interface FieldErrors {
@@ -77,8 +77,12 @@ export default function useAuthForm(
   };
 
   const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = e.target;
-    setFieldValue(name, value);
+    const { name, value, type, checked } = e.target as any;
+    if (type === 'checkbox') {
+      setFieldValue(name, checked);
+    } else {
+      setFieldValue(name, value);
+    }
   };
 
   const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
diff --git a/app/(pages)/admin/_components/Judges/JudgeCard.tsx b/app/(pages)/admin/_components/Judges/JudgeCard.tsx
index 48a29ce7..fdc0ad12 100644
--- a/app/(pages)/admin/_components/Judges/JudgeCard.tsx
+++ b/app/(pages)/admin/_components/Judges/JudgeCard.tsx
@@ -36,6 +36,9 @@ export default function JudgeCard({
             )}
           </span>
           <p className={styles.email}>{judge.email}</p>
+          <p className={styles.panel_status}>
+            Panel Opt-in: {judge.opted_into_panels ? 'Yes' : 'No'}
+          </p>
         </div>
         <div className={styles.header_details}>
           {editable && (
diff --git a/app/(pages)/admin/_components/Judges/JudgeForm.tsx b/app/(pages)/admin/_components/Judges/JudgeForm.tsx
index f4e51a45..49d36ee9 100644
--- a/app/(pages)/admin/_components/Judges/JudgeForm.tsx
+++ b/app/(pages)/admin/_components/Judges/JudgeForm.tsx
@@ -49,10 +49,16 @@ export default function JudgeForm({
     teams.body.map((team: any) => [team._id, team])
   );
 
-  if (data?._id) {
-    data.teams = data.teams.map((team: any) => {
-      return teamMap[team._id];
-    });
+  if (data?._id && data.teams) {
+    data.teams = data.teams
+      .map((team: any) => {
+        // Handle case where team might be just an ID string or already be a full team object
+        if (typeof team === 'string') {
+          return teamMap[team] || team;
+        }
+        return team._id ? teamMap[team._id] || team : team;
+      })
+      .filter(Boolean); // Remove any undefined teams
   }
 
   const onSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
@@ -91,6 +97,11 @@ export default function JudgeForm({
           validation: (has_checked_in: any) =>
             has_checked_in === true || has_checked_in === false,
         },
+        {
+          field: 'opted_into_panels',
+          validation: (opted_into_panels: any) =>
+            opted_into_panels === true || opted_into_panels === false,
+        },
       ];
 
       verificationList.forEach(({ field, validation }) => {
@@ -104,13 +115,23 @@ export default function JudgeForm({
       return;
     }
 
-    const { _id, name, email, role, specialties, teams, has_checked_in } = data;
+    const {
+      _id,
+      name,
+      email,
+      role,
+      specialties,
+      teams,
+      has_checked_in,
+      opted_into_panels,
+    } = data;
     const body = {
       name,
       email,
       role,
       specialties,
       has_checked_in,
+      opted_into_panels,
     };
 
     const res = await updateJudgeWithTeams(_id, { $set: body }, teams);
@@ -195,7 +216,7 @@ export default function JudgeForm({
         itemRenderer={({ key, item, deleteItem, shiftUp, shiftDown }) => {
           return (
             <div key={key} className={styles.team_card_wrapper}>
-              <TeamCard team={item} editable={false} />
+              {/* <TeamCard team={item} editable={false} /> */}
               <div className={styles.team_card_list_options}>
                 <div className={styles.trash_icon} onClick={deleteItem}>
                   <IoTrashOutline />
@@ -232,6 +253,16 @@ export default function JudgeForm({
           { option: 'false', value: false },
         ]}
       />
+      <DropdownInput
+        label="opted into panels"
+        value={data.opted_into_panels}
+        updateValue={(value: any) => updateField('opted_into_panels', value)}
+        width="400px"
+        options={[
+          { option: 'true', value: true },
+          { option: 'false', value: false },
+        ]}
+      />
       <div className={styles.action_buttons}>
         <button className={styles.submit_button} type="submit">
           Submit
diff --git a/app/(pages)/judges/_components/AuthForms/CheckInForm.tsx b/app/(pages)/judges/_components/AuthForms/CheckInForm.tsx
index fe3f23f1..bb240f74 100644
--- a/app/(pages)/judges/_components/AuthForms/CheckInForm.tsx
+++ b/app/(pages)/judges/_components/AuthForms/CheckInForm.tsx
@@ -8,9 +8,9 @@ import AuthForm from '@components/AuthForm/AuthForm';
 export default function CheckInForm({ id }: any) {
   const router = useRouter();
 
-  const onSubmit = async (fields: any) => {
-    return verifyCode(id, fields.code);
-  };
+  const onSubmit = async (fields: any) =>
+    // include opt-in boolean when verifying
+    verifyCode(id, fields.code, !!fields.opted_into_panels);
 
   const onSuccess = () => {
     router.push('/judges');
@@ -24,6 +24,12 @@ export default function CheckInForm({ id }: any) {
       placeholder: '',
       readOnly: false,
     },
+    {
+      name: 'opted_into_panels',
+      type: 'checkbox',
+      label: "I'd like to be on a judging panel",
+      readOnly: false,
+    },
   ];
 
   return (
@@ -33,6 +39,7 @@ export default function CheckInForm({ id }: any) {
       buttonText="Check in →"
       initialValues={{
         code: '',
+        opted_into_panels: false,
       }}
       onSubmit={onSubmit}
       onSuccess={onSuccess}
diff --git a/app/_types/panel.ts b/app/_types/panel.ts
index f8a03fd9..8a3eea88 100644
--- a/app/_types/panel.ts
+++ b/app/_types/panel.ts
@@ -3,7 +3,7 @@ import User from './user';
 interface Panel {
   _id?: string;
   track: string;
-  domain: string;
+  domain?: string;
   user_ids: string[];
   users?: User[]; // populated by aggregation
 }
diff --git a/app/_types/user.ts b/app/_types/user.ts
index 17d8e85d..0ae3270f 100644
--- a/app/_types/user.ts
+++ b/app/_types/user.ts
@@ -8,6 +8,7 @@ interface User {
   position?: string; // for hackers only
   is_beginner?: boolean; // for hackers only
   has_checked_in: boolean;
+  opted_into_panels?: boolean; // for judges only
 }
 
 export default User;
diff --git a/migrations/20250930042214-add-opted-into-panels-to-users.mjs b/migrations/20250930042214-add-opted-into-panels-to-users.mjs
new file mode 100644
index 00000000..201fc72a
--- /dev/null
+++ b/migrations/20250930042214-add-opted-into-panels-to-users.mjs
@@ -0,0 +1,176 @@
+export const up = async (db) => {
+  // Import validation data for domains
+  const fs = await import('fs');
+  const path = await import('path');
+
+  const dataPath = path.resolve(
+    process.cwd(),
+    'app/_data/db_validation_data.json'
+  );
+  const data = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
+  const domains = [...new Set(data.domains)];
+
+  // Update users collection validator to include opted_into_panels
+  await db.command({
+    collMod: 'users',
+    validator: {
+      $jsonSchema: {
+        bsonType: 'object',
+        title: 'Users Object Validation',
+        required: ['name', 'email', 'password', 'role', 'has_checked_in'],
+        properties: {
+          _id: {
+            bsonType: 'objectId',
+            description: '_id must be an ObjectId',
+          },
+          name: {
+            bsonType: 'string',
+            description: 'name must be a string',
+          },
+          email: {
+            bsonType: 'string',
+            pattern: '^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,})$',
+            description: 'email must be a string and have a valid format',
+          },
+          password: {
+            bsonType: 'string',
+            description: 'encrypted password must be a string',
+          },
+          role: {
+            enum: ['hacker', 'judge', 'admin'],
+            description: 'role must be either hacker, judge, or admin',
+          },
+          specialties: {
+            bsonType: 'array',
+            description: 'specialties must be an array of valid string values',
+            maxItems: domains.length,
+            minItems: domains.length,
+            items: {
+              enum: domains,
+              description: `specialty must be one of: ${domains.join(', ')}`,
+            },
+            uniqueItems: true,
+          },
+          position: {
+            enum: ['developer', 'designer', 'pm', 'other'],
+            description:
+              'position must be either developer, designer, pm, or other',
+          },
+          is_beginner: {
+            bsonType: 'bool',
+            description: 'is_beginner must be a boolean',
+          },
+          has_checked_in: {
+            bsonType: 'bool',
+            description: 'has_checked_in must be a boolean',
+          },
+          opted_into_panels: {
+            bsonType: 'bool',
+            description:
+              'opted_into_panels must be a boolean indicating if judge wants to be on panels',
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    validationLevel: 'strict',
+    validationAction: 'error',
+  });
+
+  // Add opted_into_panels field to all existing users
+  // Default to false for existing users, so they need to explicitly opt-in
+  await db
+    .collection('users')
+    .updateMany(
+      { opted_into_panels: { $exists: false } },
+      { $set: { opted_into_panels: false } }
+    );
+
+  console.log(
+    'Updated users validator and added opted_into_panels field to existing users'
+  );
+};
+
+export const down = async (db) => {
+  // Import validation data for domains (needed to restore original validator)
+  const fs = await import('fs');
+  const path = await import('path');
+
+  const dataPath = path.resolve(
+    process.cwd(),
+    'app/_data/db_validation_data.json'
+  );
+  const data = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
+  const domains = [...new Set(data.domains)];
+
+  // Restore original users collection validator (without opted_into_panels)
+  await db.command({
+    collMod: 'users',
+    validator: {
+      $jsonSchema: {
+        bsonType: 'object',
+        title: 'Users Object Validation',
+        required: ['name', 'email', 'password', 'role', 'has_checked_in'],
+        properties: {
+          _id: {
+            bsonType: 'objectId',
+            description: '_id must be an ObjectId',
+          },
+          name: {
+            bsonType: 'string',
+            description: 'name must be a string',
+          },
+          email: {
+            bsonType: 'string',
+            pattern: '^([a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,})$',
+            description: 'email must be a string and have a valid format',
+          },
+          password: {
+            bsonType: 'string',
+            description: 'encrypted password must be a string',
+          },
+          role: {
+            enum: ['hacker', 'judge', 'admin'],
+            description: 'role must be either hacker, judge, or admin',
+          },
+          specialties: {
+            bsonType: 'array',
+            description: 'specialties must be an array of valid string values',
+            maxItems: domains.length,
+            minItems: domains.length,
+            items: {
+              enum: domains,
+              description: `specialty must be one of: ${domains.join(', ')}`,
+            },
+            uniqueItems: true,
+          },
+          position: {
+            enum: ['developer', 'designer', 'pm', 'other'],
+            description:
+              'position must be either developer, designer, pm, or other',
+          },
+          is_beginner: {
+            bsonType: 'bool',
+            description: 'is_beginner must be a boolean',
+          },
+          has_checked_in: {
+            bsonType: 'bool',
+            description: 'has_checked_in must be a boolean',
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    validationLevel: 'strict',
+    validationAction: 'error',
+  });
+
+  // Remove opted_into_panels field from all users
+  await db
+    .collection('users')
+    .updateMany({}, { $unset: { opted_into_panels: 1 } });
+
+  console.log(
+    'Restored original users validator and removed opted_into_panels field from users'
+  );
+};
diff --git a/migrations/20250930045209-fix-panels-domain-validation.mjs b/migrations/20250930045209-fix-panels-domain-validation.mjs
new file mode 100644
index 00000000..c37d294f
--- /dev/null
+++ b/migrations/20250930045209-fix-panels-domain-validation.mjs
@@ -0,0 +1,112 @@
+export const up = async (db) => {
+  // Import validation data for domains and tracks
+  const fs = await import('fs');
+  const path = await import('path');
+
+  const dataPath = path.resolve(
+    process.cwd(),
+    'app/_data/db_validation_data.json'
+  );
+  const data = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
+  const domains = [...new Set(data.domains)];
+  const tracks = [...new Set(data.tracks)];
+
+  // Update panels collection validator to make domain optional
+  await db.command({
+    collMod: 'panels',
+    validator: {
+      $jsonSchema: {
+        bsonType: 'object',
+        title: 'Panels Object Validation',
+        required: ['track', 'user_ids'], // removed 'domain' from required fields
+        properties: {
+          _id: {
+            bsonType: 'objectId',
+            description: '_id must be an ObjectId',
+          },
+          track: {
+            enum: tracks,
+            description: 'track must be a a valid track string',
+          },
+          domain: {
+            anyOf: [
+              { enum: domains },
+              { type: 'string', maxLength: 0 }, // allow empty string
+            ],
+            description: `domain must be one of: ${domains.join(
+              ', '
+            )} or empty string`,
+          },
+          user_ids: {
+            bsonType: 'array',
+            description: 'user_ids must be an array of object IDs',
+            maxItems: 5,
+            items: {
+              bsonType: 'objectId',
+              description: 'user_ids must be an array of object IDs',
+            },
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    validationLevel: 'strict',
+    validationAction: 'error',
+  });
+
+  console.log('Updated panels validator to make domain field optional');
+};
+
+export const down = async (db) => {
+  // Import validation data for domains and tracks
+  const fs = await import('fs');
+  const path = await import('path');
+
+  const dataPath = path.resolve(
+    process.cwd(),
+    'app/_data/db_validation_data.json'
+  );
+  const data = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
+  const domains = [...new Set(data.domains)];
+  const tracks = [...new Set(data.tracks)];
+
+  // Restore original panels collection validator (domain required)
+  await db.command({
+    collMod: 'panels',
+    validator: {
+      $jsonSchema: {
+        bsonType: 'object',
+        title: 'Panels Object Validation',
+        required: ['track', 'domain', 'user_ids'], // domain is required again
+        properties: {
+          _id: {
+            bsonType: 'objectId',
+            description: '_id must be an ObjectId',
+          },
+          track: {
+            enum: tracks,
+            description: 'track must be a a valid track string',
+          },
+          domain: {
+            enum: domains,
+            description: `domain must be one of: ${domains.join(', ')}`,
+          },
+          user_ids: {
+            bsonType: 'array',
+            description: 'user_ids must be an array of object IDs',
+            maxItems: 5,
+            items: {
+              bsonType: 'objectId',
+              description: 'user_ids must be an array of object IDs',
+            },
+          },
+        },
+        additionalProperties: false,
+      },
+    },
+    validationLevel: 'strict',
+    validationAction: 'error',
+  });
+
+  console.log('Restored original panels validator with required domain field');
+};

From 88822780e2123bebc1532abc4aea8f30709f0e76 Mon Sep 17 00:00:00 2001
From: reehals <sunny.reehal@gmail.com>
Date: Mon, 29 Sep 2025 21:57:11 -0700
Subject: [PATCH 2/3] Add back teamcard for judge form

---
 app/(pages)/admin/_components/Judges/JudgeForm.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/(pages)/admin/_components/Judges/JudgeForm.tsx b/app/(pages)/admin/_components/Judges/JudgeForm.tsx
index 49d36ee9..4604a45a 100644
--- a/app/(pages)/admin/_components/Judges/JudgeForm.tsx
+++ b/app/(pages)/admin/_components/Judges/JudgeForm.tsx
@@ -216,7 +216,7 @@ export default function JudgeForm({
         itemRenderer={({ key, item, deleteItem, shiftUp, shiftDown }) => {
           return (
             <div key={key} className={styles.team_card_wrapper}>
-              {/* <TeamCard team={item} editable={false} /> */}
+              <TeamCard team={item} editable={false} />
               <div className={styles.team_card_list_options}>
                 <div className={styles.trash_icon} onClick={deleteItem}>
                   <IoTrashOutline />

From 401f570acd18dee93eff99bb7d900de23d6a9560 Mon Sep 17 00:00:00 2001
From: reehals <sunny.reehal@gmail.com>
Date: Mon, 29 Sep 2025 22:05:01 -0700
Subject: [PATCH 3/3] Update since domain is optional

---
 app/(api)/_utils/matching/judgeToPanelAlgorithm.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/(api)/_utils/matching/judgeToPanelAlgorithm.ts b/app/(api)/_utils/matching/judgeToPanelAlgorithm.ts
index 756017e0..2c4b5cc5 100644
--- a/app/(api)/_utils/matching/judgeToPanelAlgorithm.ts
+++ b/app/(api)/_utils/matching/judgeToPanelAlgorithm.ts
@@ -11,8 +11,8 @@ export default async function judgeToPanelAlgorithm(
 
     judges = judges.sort(
       (a, b) =>
-        (a.specialties?.indexOf(panel.domain) ?? 0) -
-        (b.specialties?.indexOf(panel.domain) ?? 0)
+        (a.specialties?.indexOf(panel.domain ?? '') ?? 0) -
+        (b.specialties?.indexOf(panel.domain ?? '') ?? 0)
     );
 
     panel.user_ids = judges