fix : bugs of testCase, init data

Author: lkw9241

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

@@ -55,6 +55,18 @@ ApplicationRunner devInitDataApplicationRunner() {
         };
     }
 
+    @Transactional
+    public void cocktailInit() throws Exception {
+        // H2 DB에 이미 데이터가 들어가 있는지 확인
+        if (cocktailRepository.count() > 0) {
+            System.out.println("Cocktail 데이터가 이미 존재합니다.");
+            return;
+        }
+
+        // data-h2.sql에서 자동 삽입되므로 여기서는 추가하지 않음.
+        System.out.println("Cocktail 초기화: CSV에서 데이터를 이미 로드합니다.");
+    }
+
     @Transactional
     public void userInit() {
         userRepository.findByNickname("사용자A").orElseGet(() ->

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: update  # 실행전 db_dev 파일 삭제 필요
+      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);
+        }
+    }
+
 }