Merge pull request #246 from Link-MIND/refactor/#245

[#245] refactor: 토스트 제목 수정 validation 수정 및 그룹설정
Link-MIND · Oct 17, 2024 · c89b4b5 · c89b4b5
2 parents 08c03b0 + 41edf26
commit c89b4b5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValid.java b/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValid.java
@@ -17,5 +17,5 @@
 	String message() default "Invalid title";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
-	String pattern() default "[가-힣|a-z|A-Z|0-9|]";
+	String pattern() default "^[\\S][가-힣ㄱ-ㅎㅏ-ㅣa-zA-Z0-9\\s]{0,20}$";
 }
diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValidator.java b/linkmind/src/main/java/com/app/toaster/controller/valid/TitleValidator.java
@@ -1,18 +1,17 @@
 package com.app.toaster.controller.valid;
 
-
-import com.app.toaster.exception.Error;
-import com.app.toaster.exception.model.CustomException;
-
+import com.app.toaster.controller.valid.marker.ToastValidationGroup;
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
 public class TitleValidator implements ConstraintValidator<TitleValid, String> {
 
-	public String pattern;
+	private String pattern;
+	private Class<?>[] groups;
 	@Override
 	public void initialize(TitleValid constraintAnnotation) {
 		this.pattern = constraintAnnotation.pattern();
+		this.groups = constraintAnnotation.groups();
 	}
 
 	@Override
@@ -39,18 +38,27 @@ public boolean isValid(String title, ConstraintValidatorContext context) {
 			return false;
 		}
 
-		if(title.length()>15){
+		if(!isGroupActive(ToastValidationGroup.class) && title.length()>15){ //토스트쪽이 아니면 검증을 합니다.
 			context.buildConstraintViolationWithTemplate("이름은 최대 15자까지 입력 가능해요")
 					.addConstraintViolation();
 			return false;
 		}
 
-		if(!title.matches("^[\\S][가-힣ㄱ-ㅎㅏ-ㅣa-zA-Z0-9\\s]{0,20}$")){
+		if(!title.matches(pattern)){
 			context.buildConstraintViolationWithTemplate("특수 문자로는 검색할 수 없어요.")
 				.addConstraintViolation();
 			return false;
 		}
 
 		return true;
 	}
+
+	private boolean isGroupActive(Class<?> targetGroup) {
+		for (Class<?> group : groups) {
+			if (group.equals(targetGroup)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
diff --git a/linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java b/linkmind/src/main/java/com/app/toaster/controller/valid/marker/ToastValidationGroup.java
@@ -0,0 +1,4 @@
+package com.app.toaster.controller.valid.marker;
+
+public interface ToastValidationGroup {
+}
diff --git a/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java b/linkmind/src/main/java/com/app/toaster/toast/controller/request/UpdateToastDto.java
@@ -3,9 +3,10 @@
 import com.app.toaster.controller.valid.Severity;
 import com.app.toaster.controller.valid.TitleValid;
 
+import com.app.toaster.controller.valid.marker.ToastValidationGroup;
 import jakarta.validation.constraints.NotNull;
 
-public record UpdateToastDto(Long toastId, @TitleValid(payload = Severity.Error.class) @NotNull String title) {
+public record UpdateToastDto(Long toastId, @TitleValid(payload = Severity.Error.class, groups = {ToastValidationGroup.class}) @NotNull String title) {
 	public static UpdateToastDto of(Long toastId, String title){
 		return new UpdateToastDto(toastId,title);
 	}