fix: validateMemberName함수가 유효한 이름인지를 확인하도록 수정

woowacourse-teams · Dec 17, 2024 · 4c0cfdb · 4c0cfdb
1 parent 589d3c5
commit 4c0cfdb
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/client/src/utils/validate/validateMemberName.ts b/client/src/utils/validate/validateMemberName.ts
@@ -4,22 +4,28 @@ import RULE from '@constants/rule';
 
 import {ValidateResult} from './type';
 
-const validateMemberName = (name: string): ValidateResult => {
-  let errorMessage = null;
+const validateMemberName = (name: string) => {
+  const slicedName = name.trim().slice(0, RULE.maxMemberNameLength);
 
   const validateOnlyString = () => {
-    return REGEXP.memberName.test(name);
+    return REGEXP.memberName.test(slicedName);
   };
 
   const validateLength = () => {
-    return name.length <= RULE.maxMemberNameLength;
+    return slicedName.length > 0;
   };
 
-  if (validateOnlyString() && validateLength()) {
-    return {isValid: true, errorMessage: null};
-  }
+  const getErrorMessage = () => {
+    if (!validateOnlyString()) return ERROR_MESSAGE.memberNameFormat;
+    if (name.length > RULE.maxMemberNameLength) return ERROR_MESSAGE.memberNameLength;
+    return null;
+  };
 
-  return {isValid: false, errorMessage: errorMessage || ERROR_MESSAGE.memberName};
+  return {
+    memberName: slicedName,
+    isValid: validateLength() && validateOnlyString(),
+    errorMessage: getErrorMessage(),
+  };
 };
 
 export default validateMemberName;