feat : 랜덤 인카운터 구현, 불필요한 DB IO 성능 개선(인메모리 캐시)

Author: chat26666

build.gradle

@@ -90,6 +90,9 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
 
+    // 스프링 캐시
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
     // QueryDSL
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'

src/main/java/org/ezcode/codetest/CodetestApplication.java

@@ -2,12 +2,14 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableScheduling
+@EnableCaching
 public class CodetestApplication {
 
 	public static void main(String[] args) {

src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/EncounterChoiceDeleteRequest.java

@@ -2,7 +2,8 @@
 
 import jakarta.validation.constraints.NotBlank;
 
-public record EncounterChoiceDeleteRequest(
+public record
+EncounterChoiceDeleteRequest(
 
 	@NotBlank(message = "삭제할 이름을 입력해주세요.")
 	String name

src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/EncounterChoiceRequest.java

@@ -0,0 +1,11 @@
+package org.ezcode.codetest.application.game.dto.request.encounter;
+
+import jakarta.validation.constraints.NotNull;
+
+public record EncounterChoiceRequest(
+
+	@NotNull(message = "인카운터를 선택지를 선택해주세요.(true, false)")
+	Boolean playerDecision
+
+) {
+}

src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/EncounterChoiceSaveRequest.java

@@ -5,6 +5,7 @@
 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(
@@ -15,33 +16,31 @@ public record EncounterChoiceSaveRequest(
 	@NotBlank(message = "인카운터 선택 이름은 필수값입니다.")
 	String choiceName,
 
-	@NotBlank(message = "인카운터 선택 결과값은 필수값입니다.")
-	String resultText,
-
 	@NotBlank(message = "인카운터 이펙트는 필수값입니다.")
 	@Pattern(
-		regexp = "^(RANDOM_BATTLE"
-			+ "|MERCHANT_GOOD_DEAL|MERCHANT_BAD_DEAL"
+		regexp = "^(BOSS_BATTLE_BAD"
+			+ "|GAMBLING_GOOD|GAMBLING_BAD|BOSS_BATTLE_GOOD"
 			+ "|STAT_INCREASE|STAT_DECREASE"
-			+ "|AMBUSH_BANDITS_WIN|AMBUSH_BANDITS_LOSE"
+			+ "|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 의 유효한 값이어야 합니다."
 	)
-	String randomEncounterEffect
+	String randomEncounterEffect,
 
-) {
+	@NotNull(message = "플레이어의 인카운터 선택지를 골라주세요.(true,false)")
+	Boolean playerDecision
 
+) {
 	public EncounterChoice toEncounterChoice(RandomEncounter encounter) {
 
 		return EncounterChoice.builder()
 			.encounter(encounter)
 			.encounterEffect(RandomEncounterEffect.valueOf(randomEncounterEffect.trim().toUpperCase()))
-			.resultText(resultText)
 			.name(choiceName)
+			.playerDecision(playerDecision)
 			.build();
 	}
-
 }

src/main/java/org/ezcode/codetest/application/game/dto/request/encounter/RandomEncounterSaveRequest.java

@@ -4,7 +4,6 @@
 import org.ezcode.codetest.domain.game.model.encounter.EncounterCategory;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 
 public record RandomEncounterSaveRequest(
@@ -21,10 +20,7 @@ public record RandomEncounterSaveRequest(
 	String name,
 
 	@NotBlank(message = "설명란은 필수입니다.")
-	String encounterText,
-
-	@NotNull(message = "가중치 입력은 필수입니다.")
-	Integer weight
+	String encounterText
 ) {
 
 	public RandomEncounter toRandomEncounter() {
@@ -33,7 +29,6 @@ public RandomEncounter toRandomEncounter() {
 			.encounterCategory(EncounterCategory.valueOf(encounterCategory.trim().toUpperCase()))
 			.activated(true)
 			.name(name)
-			.weight(weight)
 			.encounterText(encounterText)
 			.build();
 	}

src/main/java/org/ezcode/codetest/application/game/dto/response/encounter/BattleHistoryResponse.java

@@ -16,7 +16,6 @@ public record BattleHistoryResponse(
 	boolean isPlayerWin
 
 ) {
-
 	public static BattleHistoryResponse of(
 		String playerNickName,
 		String enemyNickName,

src/main/java/org/ezcode/codetest/application/game/dto/response/encounter/EncounterResponse.java

@@ -0,0 +1,25 @@
+package org.ezcode.codetest.application.game.dto.response.encounter;
+
+import java.util.List;
+
+import org.ezcode.codetest.domain.game.model.encounter.EncounterHistory;
+
+public record EncounterResponse(
+
+	List<String> log,
+
+	boolean isPositive
+
+) {
+
+	public static EncounterResponse of(List<String> log, boolean isPositive) {
+
+		return new EncounterResponse(log, isPositive);
+	}
+
+	public static EncounterResponse from(EncounterHistory history) {
+
+		return new EncounterResponse(history.getResultLog(), history.getIsPositive());
+	}
+
+}

src/main/java/org/ezcode/codetest/application/game/dto/response/encounter/MatchingBattleResponse.java

@@ -0,0 +1,16 @@
+package org.ezcode.codetest.application.game.dto.response.encounter;
+
+public record MatchingBattleResponse(
+
+	boolean isEnemyStrongThanMe,
+
+	String message,
+
+	Long enemyId
+
+) {
+	public static MatchingBattleResponse of(boolean isEnemyStrongThanMe, String message, Long enemyId) {
+
+		return new MatchingBattleResponse(isEnemyStrongThanMe, message, enemyId);
+	}
+}

src/main/java/org/ezcode/codetest/application/game/dto/response/encounter/MatchingEncounterResponse.java

@@ -0,0 +1,29 @@
+package org.ezcode.codetest.application.game.dto.response.encounter;
+
+import org.ezcode.codetest.domain.game.model.encounter.EncounterCategory;
+import org.ezcode.codetest.domain.game.model.encounter.RandomEncounter;
+
+import lombok.Builder;
+
+@Builder
+public record MatchingEncounterResponse(
+
+	Long id,
+
+	EncounterCategory encounterCategory,
+
+	String name,
+
+	String encounterText
+
+) {
+	public static MatchingEncounterResponse from(RandomEncounter encounter) {
+
+		return MatchingEncounterResponse.builder()
+			.encounterCategory(encounter.getEncounterCategory())
+			.id(encounter.getId())
+			.name(encounter.getName())
+			.encounterText(encounter.getEncounterText())
+			.build();
+	}
+}