hotfix: 게임 DB 방식 ENUM 방식으로 전환

Author: Kim DongMin

src/main/java/com/web/coreclass/domain/game/entity/Game.java

@@ -0,0 +1,25 @@
+package com.web.coreclass.domain.game.entity;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum GameType {
+    OVERWATCH_2("Overwatch 2", "https://second-generation-upload-bucket.s3.ap-northeast-2.amazonaws.com/overwatch2_logo.png"),
+    VALORANT("Valorant", "https://second-generation-upload-bucket.s3.ap-northeast-2.amazonaws.com/valorant_logo.png");
+
+    private final String name;      // DB 저장용 이름 or 화면 표시용
+    private final String logoUrl;   // 로고 이미지 URL
+
+    // 문자열(String)로 Enum을 찾는 메서드 추가
+    public static GameType fromName(String name) {
+        for (GameType type : values()) {
+            // 대소문자 무시하고 띄어쓰기 제거 후 비교 등 유연하게 처리 가능
+            if (type.name.equalsIgnoreCase(name) || type.name().equalsIgnoreCase(name)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("지원하지 않는 게임입니다: " + name);
+    }
+}

src/main/java/com/web/coreclass/domain/game/entity/GameType.java

@@ -2,7 +2,7 @@
 
 import com.web.coreclass.domain.careerHistory.entity.CareerHistory;
 import com.web.coreclass.domain.careerHistory.entity.RoleType;
-import com.web.coreclass.domain.game.entity.Game;
+import com.web.coreclass.domain.game.entity.GameType;
 import com.web.coreclass.domain.instructor.entity.Instructor;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -107,18 +107,15 @@ public CareerHistoryResponse(CareerHistory history) {
             }
         }
 
-        // 게임 상세 DTO (Nested)
-        @Getter
-        @ToString
+        // GameResponse
         public static class GameResponse {
-            private Long id;
             private String name;
             private String gameLogoUrl;
 
-            public GameResponse(Game game) {
-                this.id = game.getId();
-                this.name = game.getName();
-                this.gameLogoUrl = game.getGameLogoUrl();
+            // 생성자 파라미터 변경: Game -> GameType (또는 InstructorGame)
+            public GameResponse(GameType gameType) {
+                this.name = gameType.getName();       // Enum의 한글/영문 이름
+                this.gameLogoUrl = gameType.getLogoUrl(); // Enum에 정의된 로고 URL
             }
         }
 
@@ -137,8 +134,9 @@ public InstructorDetailResponse(Instructor instructor) {
                     .map(CareerHistoryResponse::new)
                     .collect(Collectors.toSet());
 
+            // InstructorDetailResponse 생성자 내부 수정
             this.games = instructor.getGames().stream()
-                    .map(instructorGame -> new GameResponse(instructorGame.getGame()))
+                    .map(instructorGame -> new GameResponse(instructorGame.getGameType())) // 💡 수정
                     .collect(Collectors.toSet());
         }
     }
@@ -165,9 +163,8 @@ public InstructorListResponse(Instructor instructor) {
             this.profileImgUrl = instructor.getProfileImgUrl();
             this.sgeaLogoImgUrl = instructor.getSgeaLogoImgUrl();
 
-            // ✅ N+1 문제를 피하려면, Service에서 Fetch Join이 필요함
             this.games = instructor.getGames().stream()
-                    .map(instructorGame -> new InstructorDetailResponse.GameResponse(instructorGame.getGame()))
+                    .map(instructorGame -> new InstructorDetailResponse.GameResponse(instructorGame.getGameType())) // 💡 수정
                     .collect(Collectors.toSet());
         }
     }

src/main/java/com/web/coreclass/domain/game/repository/GameRepository.java

@@ -1,6 +1,6 @@
 package com.web.coreclass.domain.instructor.entity;
 
-import com.web.coreclass.domain.game.entity.Game;
+import com.web.coreclass.domain.game.entity.GameType;
 import com.web.coreclass.global.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -23,7 +23,7 @@ public class InstructorGame extends BaseEntity {
     private Instructor instructor;
 
     // InstructorGame(N) : Game(1)
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "game_id", nullable = false)
-    private Game game;
+    @Enumerated(EnumType.STRING) // DB에 "VALORANT" 문자열로 저장됨
+    @Column(name = "game_type", nullable = false)
+    private GameType gameType;
 }

src/main/java/com/web/coreclass/domain/instructor/dto/InstructorDto.java

@@ -14,13 +14,11 @@ public interface InstructorRepository extends JpaRepository<Instructor, Long> {
     @Query("SELECT i FROM Instructor i " +
             "LEFT JOIN FETCH i.careerHistories " +
             "LEFT JOIN FETCH i.games ig " +
-            "LEFT JOIN FETCH ig.game " +
             "WHERE i.id = :id")
     Optional<Instructor> findInstructorDetailsById(@Param("id") Long id);
 
     // 록 조회용 N+1 방지 쿼리 (games만 Join)
     @Query("SELECT i FROM Instructor i " +
-            "LEFT JOIN FETCH i.games ig " +
-            "LEFT JOIN FETCH ig.game")
+            "LEFT JOIN FETCH i.games ig")
     List<Instructor> findAllWithGames();
 }

src/main/java/com/web/coreclass/domain/instructor/entity/InstructorGame.java

@@ -1,7 +1,6 @@
 package com.web.coreclass.domain.instructor.service;
 
-import com.web.coreclass.domain.game.entity.Game;
-import com.web.coreclass.domain.game.repository.GameRepository;
+import com.web.coreclass.domain.game.entity.GameType;
 import com.web.coreclass.domain.instructor.dto.InstructorDto;
 import com.web.coreclass.domain.instructor.entity.Instructor;
 import com.web.coreclass.domain.instructor.entity.InstructorGame;
@@ -19,7 +18,6 @@
 public class InstructorService {
 
     private final InstructorRepository instructorRepository;
-    private final GameRepository gameRepository;
 
     /**
      * (C) Create: 강사 생성
@@ -41,15 +39,12 @@ public InstructorDto.InstructorDetailResponse createInstructor(InstructorDto.Ins
 
         // 3. Game 엔티티 조회 및 InstructorGame 매핑 (Cascade)
         request.getGameNames().forEach(gameName -> {
-            // DB에서 게임 이름으로 Game 엔티티 조회
-            Game game = gameRepository.findByName(gameName)
-                    .orElseThrow(() -> new RuntimeException("Game not found: " + gameName));
+            // 💡 DB 조회가 아니라 Enum에서 바로 변환 (에러 걱정 없음)
+            GameType gameType = GameType.fromName(gameName);
 
-            // InstructorGame 매핑 엔티티 생성
             InstructorGame instructorGame = new InstructorGame();
-            instructorGame.setGame(game);
+            instructorGame.setGameType(gameType); // 💡 setGame -> setGameType
 
-            // 연관관계 편의 메서드 사용
             instructor.addGame(instructorGame);
         });
 
@@ -115,10 +110,12 @@ public void updateInstructor(Long id, InstructorDto.InstructorCreateRequest requ
         });
 
         request.getGameNames().forEach(gameName -> {
-            Game game = gameRepository.findByName(gameName)
-                    .orElseThrow(() -> new RuntimeException("Game not found:" + "Z" + gameName));
-                            InstructorGame instructorGame = new InstructorGame();
-            instructorGame.setGame(game);
+            // 💡 DB 조회가 아니라 Enum에서 바로 변환 (에러 걱정 없음)
+            GameType gameType = GameType.fromName(gameName);
+
+            InstructorGame instructorGame = new InstructorGame();
+            instructorGame.setGameType(gameType); // 💡 setGame -> setGameType
+
             instructor.addGame(instructorGame);
         });
     }

src/main/java/com/web/coreclass/domain/instructor/repository/InstructorRepository.java

@@ -3,6 +3,18 @@ spring.application.name=coreclass
 # DDL ??
 spring.jpa.hibernate.ddl-auto=update
 
+## 1. H2 DB ?? ?? (MySQL ??)
+#spring.datasource.url=jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1
+#spring.datasource.driver-class-name=org.h2.Driver
+#spring.datasource.username=sa
+#spring.datasource.password=
+#
+## === AWS S3 Test Setting (Dummy) ===
+#spring.cloud.aws.s3.bucket=test-bucket
+#spring.cloud.aws.region.static=ap-northeast-2
+#spring.cloud.aws.credentials.access-key=test-access-key
+#spring.cloud.aws.credentials.secret-key=test-secret-key
+
 # ==========================================
 # ? Database Setting (???? ??)
 # ==========================================
@@ -22,14 +34,17 @@ spring.cloud.aws.region.static=ap-northeast-2
 spring.cloud.aws.credentials.access-key=${AWS_ACCESS_KEY}
 spring.cloud.aws.credentials.secret-key=${AWS_SECRET_KEY}
 
+
+
 # File Upload Limit
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
 
 # ==========================================
 # ? JWT Setting (???? ??)
 # ==========================================
-jwt.secret=${JWT_SECRET}
+#jwt.secret=${JWT_SECRET}
+jwt.secret=TestSecretKeyForUnitTestingMustBeLongEnoughToPreventErrors1234567890
 jwt.expiration-ms=3600000
 
 # Swagger Config (?? ?? ??)

src/main/java/com/web/coreclass/domain/instructor/service/InstructorService.java

@@ -1,8 +1,6 @@
 package com.web.coreclass;
 
 import com.web.coreclass.domain.careerHistory.entity.RoleType;
-import com.web.coreclass.domain.game.entity.Game;
-import com.web.coreclass.domain.game.repository.GameRepository;
 import com.web.coreclass.domain.instructor.dto.InstructorDto;
 import com.web.coreclass.domain.instructor.entity.Instructor;
 import com.web.coreclass.domain.instructor.repository.InstructorRepository;
@@ -29,26 +27,9 @@ public class InstructorServiceTest {
     @Autowired
     private InstructorRepository instructorRepository;
 
-    @Autowired
-    private GameRepository gameRepository;
-
     @Autowired
     private EntityManager em; // 영속성 컨텍스트 관리 (캐시 비우기용)
 
-    // (Given) 각 테스트 실행 전에 게임 데이터를 미리 세팅
-    @BeforeEach
-    void setup() {
-        // 1. "Valorant" 생성
-        Game valorant = new Game();
-        valorant.setName("Valorant");
-        gameRepository.save(valorant);
-
-        // 2. "League of Legends" 생성
-        Game lol = new Game();
-        lol.setName("League of Legends");
-        gameRepository.save(lol);
-    }
-
     @Test
     @DisplayName("강사 생성(C): 경력 및 게임 정보를 포함하여 성공적으로 생성된다.")
     void createInstructorTest() {
@@ -73,7 +54,7 @@ void createInstructorTest() {
         request.setSgeaLogoImgUrl("sgea_logo.png");
         request.setContent("메이저 리그 출신...");
         request.setCareers(List.of(career1, career2));
-        request.setGameNames(List.of("Valorant", "League of Legends")); // setup에서 저장한 게임 이름
+        request.setGameNames(List.of("Valorant", "Overwatch 2")); // setup에서 저장한 게임 이름
 
         // sout 대신 log.info() 사용
         // 중괄호 {}를 사용하면 파라미터가 효율적으로 전달됩니다.
@@ -121,8 +102,8 @@ void createInstructorTest() {
         assertThat(findInstructor.getGames()).hasSize(2);
         // Set에서 InstructorGame을 꺼내고, 다시 Game을 꺼내서 Name을 추출
         assertThat(findInstructor.getGames())
-                .extracting(instructorGame -> instructorGame.getGame().getName())
-                .containsExactlyInAnyOrder("Valorant", "League of Legends");
+                .extracting(ig -> ig.getGameType().getName())
+                .containsExactlyInAnyOrder("Valorant", "Overwatch 2");
 
         log.info("===== ✅ 강사 생성(C) 테스트 통과 =====");
     }
@@ -159,7 +140,7 @@ void getInstructorListTest() {
         request2.setSgeaLogoImgUrl("sgea_logo2.png");
         request2.setContent("LCK 출신...");
         request2.setCareers(List.of(career2));
-        request2.setGameNames(List.of("League of Legends", "Valorant")); // 2개 게임
+        request2.setGameNames(List.of("Overwatch 2", "Valorant")); // 2개 게임
         instructorService.createInstructor(request2); // (반환값 안씀)
 
         // 💡 중요: 영속성 컨텍스트 초기화 (Fetch Join 쿼리 테스트를 위해)
@@ -196,7 +177,7 @@ void getInstructorListTest() {
         assertThat(aka.getGames()).hasSize(2);
         assertThat(aka.getGames())
                 .extracting("name") // GameResponse DTO의 'name' 필드
-                .containsExactlyInAnyOrder("League of Legends", "Valorant");
+                .containsExactlyInAnyOrder("Overwatch 2", "Valorant");
 
         log.info("===== ✅ 강사 목록(R-List) 테스트 통과 =====");
     }
@@ -307,7 +288,7 @@ void updateInstructorTest() {
         updateRequest.setNickname("Rexi-Updated"); // ⬅️ 닉네임 수정
         updateRequest.setContent("수정 완료 본문");
         updateRequest.setCareers(List.of(updatedCareer1, updatedCareer2)); // ⬅️ 경력 2개로 변경
-        updateRequest.setGameNames(List.of("League of Legends")); // ⬅️ 게임 변경
+        updateRequest.setGameNames(List.of("Overwatch 2")); // ⬅️ 게임 변경
 
         // --- When (실행) ---
         log.info("🚀 instructorService.updateInstructor({}) 호출", instructorId);
@@ -338,8 +319,8 @@ void updateInstructorTest() {
         // 3. ⭐️ 게임(Collection) 덮어쓰기 검증 ⭐️
         assertThat(updatedInstructor.getGames()).hasSize(1);
         assertThat(updatedInstructor.getGames())
-                .extracting(ig -> ig.getGame().getName())
-                .containsExactly("League of Legends");
+                .extracting(ig -> ig.getGameType().getName())
+                .containsExactly("Overwatch 2");
         // ➡️ "Valorant"가 삭제되었는지 검증
 
         log.info("===== ✅ 강사 수정(U) 테스트 통과 =====");