fix : bugs of testCase, init data

Author: lkw9241

src/main/java/com/back/global/init/DevInitData.java

@@ -1,13 +1,10 @@
 package com.back.global.init;
 
+import com.back.domain.cocktail.entity.Cocktail;
+import com.back.domain.cocktail.repository.CocktailRepository;
 import com.back.domain.notification.entity.Notification;
 import com.back.domain.notification.enums.NotificationType;
 import com.back.domain.notification.repository.NotificationRepository;
-import com.back.domain.cocktail.entity.Cocktail;
-import com.back.domain.cocktail.enums.AlcoholBaseType;
-import com.back.domain.cocktail.enums.AlcoholStrength;
-import com.back.domain.cocktail.enums.CocktailType;
-import com.back.domain.cocktail.repository.CocktailRepository;
 import com.back.domain.post.category.entity.Category;
 import com.back.domain.post.category.repository.CategoryRepository;
 import com.back.domain.post.comment.entity.Comment;
@@ -19,14 +16,14 @@
 import com.back.domain.post.post.repository.PostRepository;
 import com.back.domain.user.entity.User;
 import com.back.domain.user.repository.UserRepository;
-import org.springframework.transaction.annotation.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
+import org.springframework.transaction.annotation.Transactional;
 
 @Configuration
 @Profile("dev")
@@ -59,56 +56,15 @@ ApplicationRunner devInitDataApplicationRunner() {
     }
 
     @Transactional
-    public void cocktailInit() {
-        if (cocktailRepository.count() > 0) return;
-
-        // 1) 하이볼
-        cocktailRepository.save(Cocktail.builder()
-                .cocktailName("Highball")
-                .cocktailNameKo("하이볼")
-                .alcoholStrength(AlcoholStrength.LIGHT)
-                .cocktailType(CocktailType.LONG)
-                .alcoholBaseType(AlcoholBaseType.WHISKY)
-                .ingredient("위스키, 탄산수, 얼음, 레몬피")
-                .recipe("잔에 얼음 → 위스키 → 탄산수 → 가볍게 스터")
-                .cocktailImgUrl("/img/cocktail/1.jpg")
-                .build());
-
-        // 2) 진토닉
-        cocktailRepository.save(Cocktail.builder()
-                .cocktailName("Gin and Tonic")
-                .cocktailNameKo("진토닉")
-                .alcoholStrength(AlcoholStrength.WEAK)
-                .cocktailType(CocktailType.LONG)
-                .alcoholBaseType(AlcoholBaseType.GIN)
-                .ingredient("진, 토닉워터, 얼음, 라임")
-                .recipe("잔에 얼음 → 진 → 토닉워터 → 라임")
-                .cocktailImgUrl("/img/cocktail/2.jpg")
-                .build());
-
-        // 3) 올드패션드
-        cocktailRepository.save(Cocktail.builder()
-                .cocktailName("Old Fashioned")
-                .cocktailNameKo("올드패션드")
-                .alcoholStrength(AlcoholStrength.STRONG)
-                .cocktailType(CocktailType.SHORT)
-                .alcoholBaseType(AlcoholBaseType.WHISKY)
-                .ingredient("버번 위스키, 설탕/시럽, 앙고스투라 비터스, 오렌지 필")
-                .recipe("시럽+비터스 → 위스키 → 얼음 → 스터 → 오렌지 필")
-                .cocktailImgUrl("/img/cocktail/3.jpg")
-                .build());
+    public void cocktailInit() throws Exception {
+        // H2 DB에 이미 데이터가 들어가 있는지 확인
+        if (cocktailRepository.count() > 0) {
+            System.out.println("Cocktail 데이터가 이미 존재합니다.");
+            return;
+        }
 
-        // 4) 모히또
-        cocktailRepository.save(Cocktail.builder()
-                .cocktailName("Mojito")
-                .cocktailNameKo("모히또")
-                .alcoholStrength(AlcoholStrength.LIGHT)
-                .cocktailType(CocktailType.LONG)
-                .alcoholBaseType(AlcoholBaseType.RUM)
-                .ingredient("라임, 민트, 설탕/시럽, 화이트 럼, 탄산수, 얼음")
-                .recipe("라임+민트+시럽 머들 → 럼 → 얼음 → 탄산수")
-                .cocktailImgUrl("/img/cocktail/4.jpg")
-                .build());
+        // data-h2.sql에서 자동 삽입되므로 여기서는 추가하지 않음.
+        System.out.println("Cocktail 초기화: CSV에서 데이터를 이미 로드합니다.");
     }
 
     @Transactional

src/main/resources/application-dev.yml

@@ -14,14 +14,21 @@ spring:
 
   # JPA 설정
   jpa:
-    defer-datasource-initialization: true # Hibernate(JPA)가 먼저 DDL(테이블 생성)을 실행
+    defer-datasource-initialization: true
     database-platform: org.hibernate.dialect.H2Dialect
     hibernate:
-      ddl-auto: create-drop  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제 / db_dev 에러 방지용으로 upsdate->create-drop 변경
+      ddl-auto: create-drop  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제 / db_dev 에러 방지용으로 update->create-drop 변경
     properties:
       hibernate:
         format_sql: true
         show_sql: true
+
+  sql:
+    init:
+      mode: always           # 항상 실행
+      encoding: UTF-8
+      data-locations: classpath:data-h2.sql
+
   cloud:
     aws:
       region:

src/main/resources/application-test.yml

@@ -1,8 +1,4 @@
 spring:
-  sql:
-    init:
-      mode: always
-      data-locations: classpath:data-h2.sql
   datasource:
     url: jdbc:h2:mem:db_test;MODE=MySQL
     username: sa

src/test/java/com/back/domain/cocktail/controller/CocktailControllerTest.java

@@ -5,14 +5,21 @@
 import com.back.domain.cocktail.enums.AlcoholStrength;
 import com.back.domain.cocktail.enums.CocktailType;
 import com.back.domain.cocktail.repository.CocktailRepository;
-import com.back.domain.cocktail.service.CocktailService;
+import com.back.domain.user.service.UserService;
+import com.back.global.rq.Rq;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.transaction.annotation.Transactional;
@@ -26,6 +33,10 @@
 
 @ActiveProfiles("test")
 @SpringBootTest
+@TestPropertySource(properties = {
+        "custom.cookie.secure=false",
+        "custom.cookie.same=Strict"
+})
 @AutoConfigureMockMvc(addFilters = false)
 @Transactional
 public class CocktailControllerTest {
@@ -35,10 +46,6 @@ public class CocktailControllerTest {
     @Autowired
     private CocktailRepository cocktailRepository;
 
-    @Autowired
-    private CocktailService cocktailService;
-
-
     @Test
     @DisplayName("칵테일 단건 조회 - 로그인 없이 성공")
     void t1() throws Exception {
@@ -130,4 +137,17 @@ void t4() throws Exception {
                 .andExpect(jsonPath("$.message").value("success"))
                 .andExpect(jsonPath("$.data").isArray());
     }
+
+    @TestConfiguration
+    static class TestConfig {
+        @Bean
+        public Rq rq() {
+            HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
+            HttpServletResponse resp = Mockito.mock(HttpServletResponse.class);
+            UserService userService = Mockito.mock(UserService.class);
+
+            return new Rq(req, resp, userService);
+        }
+    }
+
 }