Merge pull request #11 from local-mood/Hyeonmin

Fix:회원가입 validate 로직 수정
CEOS-Developers · Dec 21, 2023 · aeca76f · aeca76f
2 parents 0916a37 + b32b3b8
commit aeca76f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/common/utils/validateForm.ts b/src/common/utils/validateForm.ts
@@ -4,6 +4,10 @@ export function validateForm(formData: FormState): [Record<string, string>] {
   const errorMessage: Record<string, string> = {};
   const { id, password, name, check_password } = formData;
 
+  if (!name?.trim()) {
+    errorMessage.name = "이름을 입력해주세요.";
+  }
+
   if (!id.trim()) {
     errorMessage.id = "아이디를 입력해주세요.";
   }
@@ -12,12 +16,8 @@ export function validateForm(formData: FormState): [Record<string, string>] {
     errorMessage.password = "비밀번호를 입력해주세요.";
   }
 
-  if (name && !name.trim()) {
-    errorMessage.name = "이름을 입력해주세요.";
-  }
-
-  if (check_password && !check_password.trim()) {
-    errorMessage.password = "비밀번호를 다시 입력해주세요.";
+  if (!check_password?.trim()) {
+    errorMessage.check_password = "비밀번호를 다시 입력해주세요.";
   }
 
   return [errorMessage];

diff --git a/src/features/form/useForm.tsx b/src/features/form/useForm.tsx
@@ -3,7 +3,7 @@ import { FORM_TYPE } from "./constant/form-type";
 import { FormState } from "./states/form-data-state";
 import { validateForm } from "@/common/utils/validateForm";
 
-const FIELD = ["id", "password", "name", "check_password"];
+const FIELD = ["name", "id", "password", "check_password"];
 
 export default function useForm({
   type,
@@ -54,13 +54,14 @@ export default function useForm({
   const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setShowError(true);
-
     if (!hasAnyError()) {
       onSubmit(type === FORM_TYPE.LOGIN ? loginFormData : registerFormData);
     } else {
       for (const field of FIELD) {
-        alert(errorMessage[field]);
-        break;
+        if (errorMessage[field]) {
+          alert(errorMessage[field]);
+          break;
+        }
       }
     }
   };