feat(auth): update academic number validation to accept 5, 6, or 13 digits

Author: khaledsAlshibani

src/utils/api/signup/validateSignupForm.test.ts

@@ -1,3 +1,10 @@
+/**
+ * To run these tests:
+ * - Run this file test: pnpm test validateSignupForm
+ * - Run with coverage: pnpm test validateSignupForm -- --coverage
+ * - Run in watch mode: pnpm test validateSignupForm -- --watch
+ */
+
 import { Department, Level } from "@/types";
 import validateSignupForm, { SignupFormData } from "./validateSignupForm";
 import RESPONSE_MESSAGES from "../../constants/RESPONSE_MESSAGES";
@@ -52,25 +59,61 @@ describe("validateSignupForm", () => {
       expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_REQUIRED);
     });
 
-    it("should validate academic number length", () => {
+    it("should validate academic number type", () => {
       const data = createValidFormData();
-      data.academicNumber = "12345";
+      data.academicNumber = 12345 as any;
       const errors = validateSignupForm(data);
-      expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH);
+      expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_NOT_STRING);
     });
 
-    it("should validate academic number format", () => {
+    it("should validate academic number format (only numbers)", () => {
       const data = createValidFormData();
-      data.academicNumber = "123abc4567890";
+      data.academicNumber = "123abc45";
       const errors = validateSignupForm(data);
       expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_ONLY_NUMBERS);
     });
 
-    it("should accept valid academic number", () => {
+    it("should validate academic number length (5 digits)", () => {
       const data = createValidFormData();
+      data.academicNumber = "12345";
       const errors = validateSignupForm(data);
       expect(errors.academicNumber).toBeUndefined();
     });
+
+    it("should validate academic number length (6 digits)", () => {
+      const data = createValidFormData();
+      data.academicNumber = "123456";
+      const errors = validateSignupForm(data);
+      expect(errors.academicNumber).toBeUndefined();
+    });
+
+    it("should validate academic number length (13 digits)", () => {
+      const data = createValidFormData();
+      data.academicNumber = "1234567890123";
+      const errors = validateSignupForm(data);
+      expect(errors.academicNumber).toBeUndefined();
+    });
+
+    it("should reject academic number with invalid length (4 digits)", () => {
+      const data = createValidFormData();
+      data.academicNumber = "1234";
+      const errors = validateSignupForm(data);
+      expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH);
+    });
+
+    it("should reject academic number with invalid length (7 digits)", () => {
+      const data = createValidFormData();
+      data.academicNumber = "1234567";
+      const errors = validateSignupForm(data);
+      expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH);
+    });
+
+    it("should reject academic number with invalid length (14 digits)", () => {
+      const data = createValidFormData();
+      data.academicNumber = "12345678901234";
+      const errors = validateSignupForm(data);
+      expect(errors.academicNumber).toBe(RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH);
+    });
   });
 
   describe("Email Validation", () => {

src/utils/api/signup/validateSignupForm.ts

@@ -31,12 +31,16 @@ export const validateSignupForm = (values: Partial<SignupFormData>) => {
   }
 
   // Academic number validation
-  if (!values.academicNumber?.trim()) {
+  if (!values.academicNumber) {
+    errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_REQUIRED;
+  } else if (typeof values.academicNumber !== 'string') {
+    errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_NOT_STRING;
+  } else if (!values.academicNumber.trim()) {
     errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_REQUIRED;
-  } else if (values.academicNumber.length !== 13) {
-    errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH;
   } else if (!/^\d+$/.test(values.academicNumber)) {
     errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_ONLY_NUMBERS;
+  } else if (!/^\d{5}$|^\d{6}$|^\d{13}$/.test(values.academicNumber)) {
+    errors.academicNumber = RESPONSE_MESSAGES.signup.VALIDATIONS.ACADEMIC_LENGTH;
   }
 
   // Username validation
@@ -91,6 +95,15 @@ export const validateSignupForm = (values: Partial<SignupFormData>) => {
     }
   }
 
+  // Email validation
+  if (!values.email?.trim()) {
+    errors.email = RESPONSE_MESSAGES.signup.VALIDATIONS.EMAIL_REQUIRED;
+  } else if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(values.email)) {
+    errors.email = RESPONSE_MESSAGES.signup.VALIDATIONS.EMAIL_INVALID;
+  } else if (values.email.length > 255) {
+    errors.email = RESPONSE_MESSAGES.signup.VALIDATIONS.EMAIL_TOO_LONG;
+  }
+
   return errors;
 };
 

src/utils/constants/RESPONSE_MESSAGES.ts

@@ -27,7 +27,8 @@ const RESPONSE_MESSAGES = {
             NAME_TOO_SHORT: "يجب أن يحتوي الاسم على 3 أحرف على الأقل",
             NAME_TOO_LONG: "يجب أن لا يتجاوز الاسم 100 حرف",
             ACADEMIC_REQUIRED: "الرقم الأكاديمي مطلوب",
-            ACADEMIC_LENGTH: "يجب أن يتكون الرقم الأكاديمي من 13 رقم",
+            ACADEMIC_NOT_STRING: "يجب أن يكون الرقم الأكاديمي نصاً",
+            ACADEMIC_LENGTH: "يجب أن يتكون الرقم الأكاديمي من 5 أو 6 أو 13 رقم",
             ACADEMIC_ONLY_NUMBERS: "يجب أن يحتوي الرقم الأكاديمي على أرقام فقط",
             EMAIL_REQUIRED: "البريد الإلكتروني مطلوب",
             EMAIL_INVALID: "يرجى إدخال بريد إلكتروني صالح",