chore : config 패키지 변경, 전역 예외처리기 중복코드 삭제

chat26666 · chat26666 · commit bcf34e9a9838 · 2025-06-19T01:25:11.000+09:00
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/EncounterChoiceSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/EncounterChoiceSaveRequest.java
@@ -1,12 +1,12 @@
 package org.ezcode.codetest.application.game.dto.request.encounter;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.encounter.EncounterChoice;
 import org.ezcode.codetest.domain.game.model.encounter.RandomEncounter;
 import org.ezcode.codetest.domain.game.model.encounter.RandomEncounterEffect;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 
 public record EncounterChoiceSaveRequest(
 
@@ -17,17 +17,7 @@ public record EncounterChoiceSaveRequest(
 	String choiceName,
 
 	@NotBlank(message = "인카운터 이펙트는 필수값입니다.")
-	@Pattern(
-		regexp = "^(BOSS_BATTLE_BAD"
-			+ "|GAMBLING_GOOD|GAMBLING_BAD|BOSS_BATTLE_GOOD"
-			+ "|STAT_INCREASE|STAT_DECREASE"
-			+ "|AMBUSH_BANDITS_ESCAPE|AMBUSH_BANDITS_FIGHT"
-			+ "|WILD_BEASTS_ESCAPE|WILD_BEASTS_ATTACK"
-			+ "|ANCIENT_RUINS_TREASURE|ANCIENT_RUINS_TRAP"
-			+ "|TREASURE_CACHE_FOUND|TREASURE_CACHE_EMPTY)$",
-		flags  = Pattern.Flag.CASE_INSENSITIVE,
-		message = "effect 는 RandomEncounterEffect 의 유효한 값이어야 합니다."
-	)
+	@EnumValidator(enumClass = RandomEncounterEffect.class)
 	String randomEncounterEffect,
 
 	@NotNull(message = "플레이어의 인카운터 선택지를 골라주세요.(true,false)")
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/RandomEncounterSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/RandomEncounterSaveRequest.java
@@ -1,19 +1,15 @@
 package org.ezcode.codetest.application.game.dto.request.encounter;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.encounter.RandomEncounter;
 import org.ezcode.codetest.domain.game.model.encounter.EncounterCategory;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 
 public record RandomEncounterSaveRequest(
 
 	@NotBlank(message = "인카운터 카테고리는 필수입니다.")
-	@Pattern(
-		regexp = "^(BATTLE|MERCHANT|EVENT|EXPLORATION)$",
-		flags  = Pattern.Flag.CASE_INSENSITIVE,
-		message = "인카운터 카테고리는 BATTLE, MERCHANT, EVENT, EXPLORATION 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = EncounterCategory.class)
 	String encounterCategory,
 
 	@NotBlank(message = "이름은 필수입니다.")
@@ -22,9 +18,7 @@ public record RandomEncounterSaveRequest(
 	@NotBlank(message = "설명란은 필수입니다.")
 	String encounterText
 ) {
-
 	public RandomEncounter toRandomEncounter() {
-
 		return RandomEncounter.builder()
 			.encounterCategory(EncounterCategory.valueOf(encounterCategory.trim().toUpperCase()))
 			.activated(true)
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/item/AccessorySaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/item/AccessorySaveRequest.java
@@ -1,5 +1,6 @@
 package org.ezcode.codetest.application.game.dto.request.item;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.item.Accessory;
 import org.ezcode.codetest.domain.game.model.item.Item;
 import org.ezcode.codetest.domain.game.model.item.AccessoryType;
@@ -10,35 +11,34 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 
 @JsonTypeName("accessory")
 @Getter
 public class AccessorySaveRequest extends ItemSaveRequest {
 
 	@NotBlank
-	@Pattern(
-		regexp = "GRAPHIC_CARD|USB|KEYBOARD|MOUSE|CPU|MEMORY|DISK",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "악세서리 타입은 GRAPHIC_CARD, USB, KEYBOARD, MOUSE, CPU, MEMORY, DISK 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = AccessoryType.class)
 	private final String accessoryType;
 
 	@NotNull
 	@Min(0)
 	private final Integer speed;
 
-	@NotNull @Min(0)
+	@NotNull
+	@Min(0)
 	private final Integer crit;
 
-	@NotNull @Min(0)
+	@NotNull
+	@Min(0)
 	private final Integer stun;
 
-	@NotNull @Min(0)
+	@NotNull
+	@Min(0)
 	private final Integer evasion;
 
-	@NotNull @Min(0)
+	@NotNull
+	@Min(0)
 	private final Integer accuracy;
 
 	public AccessorySaveRequest(
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/item/DefenceSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/item/DefenceSaveRequest.java
@@ -1,5 +1,6 @@
 package org.ezcode.codetest.application.game.dto.request.item;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.item.Defence;
 import org.ezcode.codetest.domain.game.model.item.Item;
 import org.ezcode.codetest.domain.game.model.item.DefenceType;
@@ -10,19 +11,14 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 
 @JsonTypeName("defence")
 @Getter
 public class DefenceSaveRequest extends ItemSaveRequest {
 
 	@NotBlank
-	@Pattern(
-		regexp = "ARMOR|SHIELD",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "방어구 타입은 ARMOR 또는 SHIELD 여야 합니다."
-	)
+	@EnumValidator(enumClass = DefenceType.class)
 	private final String defenceType;
 
 	@NotNull
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/item/ItemGamblingRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/item/ItemGamblingRequest.java
@@ -1,16 +1,14 @@
 package org.ezcode.codetest.application.game.dto.request.item;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
+import org.ezcode.codetest.domain.game.model.item.ItemCategory;
+
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 
 public record ItemGamblingRequest(
 
 	@NotBlank(message = "아이템 타입을 결정해주세요(weapon, defence, accessory)")
-	@Pattern(
-		regexp = "weapon|defence|accessory",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "아이템 타입은 weapon, defence, accessory 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = ItemCategory.class)
 	String itemCategory
 
 ) {
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/item/ItemSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/item/ItemSaveRequest.java
@@ -1,12 +1,13 @@
 package org.ezcode.codetest.application.game.dto.request.item;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
+import org.ezcode.codetest.domain.game.model.item.Grade;
 import org.ezcode.codetest.domain.game.model.item.Item;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 
 @JsonTypeInfo(
@@ -23,11 +24,7 @@
 public abstract class ItemSaveRequest {
 
 	@NotBlank
-	@Pattern(
-		regexp = "LEGENDARY|UNIQUE|RARE|UNCOMMON|COMMON|TRASH",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "아이템 등급은 LEGENDARY, UNIQUE, RARE, UNCOMMON, COMMON, TRASH 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = Grade.class)
 	private final String grade;
 
 	@NotBlank
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/item/WeaponSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/item/WeaponSaveRequest.java
@@ -1,5 +1,6 @@
 package org.ezcode.codetest.application.game.dto.request.item;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.item.Item;
 import org.ezcode.codetest.domain.game.model.item.Weapon;
 import org.ezcode.codetest.domain.game.model.item.Grade;
@@ -10,19 +11,14 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 
 @JsonTypeName("weapon")
 @Getter
 public class WeaponSaveRequest extends ItemSaveRequest {
 
 	@NotBlank(message = "무기 타입은 공백일 수 없습니다.")
-	@Pattern(
-		regexp = "SHOT_GUN|RIFLE|PISTOL|LONG_SWORD|SHORT_SWORD|SPEAR|BOW|MAGIC_BOOK",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "무기 타입은 SHOT_GUN, RIFLE, PISTOL, LONG_SWORD, SHORT_SWORD, SPEAR, BOW, MAGIC_BOOK 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = WeaponType.class)
 	private final String weaponType;
 
 	@NotNull
diff --git a/src/main/java/org/ezcode/codetest/application/game/dto/request/skill/SkillSaveRequest.java b/src/main/java/org/ezcode/codetest/application/game/dto/request/skill/SkillSaveRequest.java
@@ -1,28 +1,20 @@
 package org.ezcode.codetest.application.game.dto.request.skill;
 
+import org.ezcode.codetest.common.validation.EnumValidator;
 import org.ezcode.codetest.domain.game.model.skill.Skill;
 import org.ezcode.codetest.domain.game.model.item.Grade;
 import org.ezcode.codetest.domain.game.model.skill.SkillEffect;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
 
 public record SkillSaveRequest(
 
 	@NotBlank(message = "스킬 이펙트를 입력해주세요.")
-	@Pattern(
-		regexp = "LIFE_STEAL|COUNTER_ATTACK|REFLEX_DAMAGE|HEAL|BURST_ATTACK|INSTANT_KILL|BLOODY_MESS|DEFENCE|ILLUSION|BUTTERFLY|PERFECT_AIM",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "스킬 이펙트는 LIFE_STEAL, COUNTER_ATTACK, REFLEX_DAMAGE, HEAL, BURST_ATTACK, INSTANT_KILL, BLOODY_MESS, DEFENCE, ILLUSION, BUTTERFLY, PERFECT_AIM 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = SkillEffect.class)
 	String skillEffect,
 
 	@NotBlank(message = "등급을 입력해주세요.")
-	@Pattern(
-		regexp = "LEGENDARY|UNIQUE|RARE|UNCOMMON|COMMON|TRASH",
-		flags = Pattern.Flag.CASE_INSENSITIVE,
-		message = "아이템 등급은 LEGENDARY, UNIQUE, RARE, UNCOMMON, COMMON, TRASH 중 하나여야 합니다."
-	)
+	@EnumValidator(enumClass = Grade.class)
 	String grade,
 
 	@NotBlank(message = "스킬 이름을 입력해주세요.")
@@ -31,9 +23,7 @@ public record SkillSaveRequest(
 	@NotBlank(message = "스킬 설명을 입력해주세요.")
 	String skillDetails
 ) {
-
 	public Skill toSkill() {
-
 		return Skill.builder()
 			.skillEffect(SkillEffect.valueOf(skillEffect.trim().toUpperCase()))
 			.grade(Grade.valueOf(grade.trim().toUpperCase()))
diff --git a/src/main/java/org/ezcode/codetest/common/base/exception/GlobalExceptionHandler.java b/src/main/java/org/ezcode/codetest/common/base/exception/GlobalExceptionHandler.java
@@ -34,16 +34,6 @@ public ResponseEntity<CommonResponse<Void>> handleMethodArgumentNotValidExceptio
 			.body(CommonResponse.of(false, errorMessage, 400, null));
 	}
 
-	@ExceptionHandler(BaseException.class)
-	public ResponseEntity<CommonResponse<Void>> handleBaseException(
-		BaseException e
-	) {
-		return ResponseEntity
-			.status(e.getHttpStatus())
-			.body(CommonResponse.from(e.getResponseCode()));
-	}
-
-
 	@ExceptionHandler(AuthorizationDeniedException.class)
 	public ResponseEntity<CommonResponse<Void>> handleSseAuthorizationDenied(
 		AuthorizationDeniedException ex,
diff --git a/src/main/java/org/ezcode/codetest/common/validation/EnumValidator.java b/src/main/java/org/ezcode/codetest/common/validation/EnumValidator.java
@@ -0,0 +1,20 @@
+package org.ezcode.codetest.common.validation;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.*;
+
+@Constraint(validatedBy = EnumValidatorImpl.class)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnumValidator {
+
+	Class<? extends Enum<?>> enumClass();
+
+	String message() default "허용되지 않은 값입니다.";
+
+	Class<?>[] groups() default {};
+
+	Class<? extends Payload>[] payload() default {};
+}
diff --git a/src/main/java/org/ezcode/codetest/common/validation/EnumValidatorImpl.java b/src/main/java/org/ezcode/codetest/common/validation/EnumValidatorImpl.java
@@ -0,0 +1,42 @@
+package org.ezcode.codetest.common.validation;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public class EnumValidatorImpl implements ConstraintValidator<EnumValidator, String> {
+
+	private Class<? extends Enum<?>> enumClass;
+
+	@Override
+	public void initialize(EnumValidator annotation) {
+		this.enumClass = annotation.enumClass();
+	}
+
+	@Override
+	public boolean isValid(String value, ConstraintValidatorContext context) {
+		if (value == null) return true;
+
+		Object[] enumConstants = enumClass.getEnumConstants();
+		if (enumConstants == null) return false;
+
+		boolean matched = Arrays.stream(enumConstants)
+			.map(e -> ((Enum<?>) e).name())
+			.anyMatch(name -> name.equals(value.trim().toUpperCase()));
+
+		if (!matched) {
+			context.disableDefaultConstraintViolation();
+
+			String allowed = Arrays.stream(enumConstants)
+				.map(e -> ((Enum<?>) e).name())
+				.collect(Collectors.joining(", "));
+
+			context.buildConstraintViolationWithTemplate("허용된 값: " + allowed)
+				.addConstraintViolation();
+		}
+
+		return matched;
+	}
+}
diff --git a/src/main/java/org/ezcode/codetest/infrastructure/cache/config/CaffeineCacheConfig.java b/src/main/java/org/ezcode/codetest/infrastructure/cache/config/CaffeineCacheConfig.java
@@ -1,4 +1,4 @@
-package org.ezcode.codetest.infrastructure.persistence.config;
+package org.ezcode.codetest.infrastructure.cache.config;
 
 import java.time.Duration;
 import java.util.List;
@@ -14,7 +14,7 @@
 
 @Configuration
 @EnableCaching
-public class CacheConfig {
+public class CaffeineCacheConfig {
 
 	@Bean
 	public CacheManager cacheManager() {
diff --git a/src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/controller/ChatRoomController.java b/src/main/java/org/ezcode/codetest/presentation/chattingmanagement/chatting/controller/ChatRoomController.java
@@ -8,7 +8,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +16,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
 @RestController
@@ -37,7 +37,7 @@ public class ChatRoomController {
 	@PostMapping
 	public ResponseEntity<Void> createChatRoom(
 		@AuthenticationPrincipal AuthUser authUser,
-		@RequestBody @Validated ChatRoomSaveRequest request
+		@RequestBody @Valid ChatRoomSaveRequest request
 	) {
 		chatUseCase.createChatRoom(request, authUser.getEmail());
 
@@ -55,7 +55,7 @@ public ResponseEntity<Void> createChatRoom(
 	@DeleteMapping
 	public ResponseEntity<Void> removeChatRoom(
 		@AuthenticationPrincipal AuthUser authUser,
-		@RequestBody @Validated ChatRoomDeleteRequest request
+		@RequestBody @Valid ChatRoomDeleteRequest request
 	) {
 		chatUseCase.removeChatRoom(request, authUser.getEmail());
 
diff --git a/src/main/java/org/ezcode/codetest/presentation/game/management/GameManagementController.java b/src/main/java/org/ezcode/codetest/presentation/game/management/GameManagementController.java
diff --git a/src/main/java/org/ezcode/codetest/presentation/game/play/GamePlayController.java b/src/main/java/org/ezcode/codetest/presentation/game/play/GamePlayController.java
