[feat] dataset 벌크 insert, 프론트 요청사항 반영( alcoholStrength)

src/main/java/com/back/domain/cocktail/controller/CocktailController.java

@@ -15,7 +15,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("cocktails")
+@RequestMapping("/cocktails")
 @Tag(name = "ApiCocktailController", description = "API 칵테일 컨트롤러")
 @RequiredArgsConstructor
 public class CocktailController {

src/main/java/com/back/domain/cocktail/controller/CocktailShareController.java

@@ -24,7 +24,7 @@ public ResponseEntity<RsData<Map<String, String>>> getShareLink(@PathVariable Lo
                 .map(cocktail -> {
                     Map<String, String> response = Map.of(
                             // 공유 URL
-                            "url", "https://www.ssoul.or/cocktails/" + cocktail.getId(),
+                            "url", "https://www.ssoul.o-r.kr/cocktails/" + cocktail.getId(),
                             // 공유 제목
                             "title", cocktail.getCocktailName(),
                             // 공유 이미지 (선택)

src/main/java/com/back/domain/cocktail/dto/CocktailSummaryResponseDto.java

@@ -1,16 +1,19 @@
 package com.back.domain.cocktail.dto;
 
+import com.back.domain.cocktail.enums.AlcoholStrength;
 import lombok.Getter;
 
 @Getter
 public class CocktailSummaryResponseDto {
     private Long cocktailId;
     private String cocktailName;
     private String cocktailImgUrl;
+    private AlcoholStrength alcoholStrength;
 
-    public CocktailSummaryResponseDto(Long id, String name, String imageUrl) {
+    public CocktailSummaryResponseDto(Long id, String name, String imageUrl, AlcoholStrength alcoholStrength) {
         this.cocktailId = id;
         this.cocktailName = name;
         this.cocktailImgUrl = imageUrl;
+        this.alcoholStrength = alcoholStrength;
     }
 }

src/main/java/com/back/domain/cocktail/entity/Cocktail.java

@@ -26,6 +26,7 @@ public class Cocktail {
     private Long id;
 
     private String cocktailName;
+    private String cocktailNameKo;
 
     @Enumerated(EnumType.STRING)
     private AlcoholStrength alcoholStrength; // 칵테일 알콜도수

src/main/java/com/back/domain/cocktail/service/CocktailService.java

@@ -51,7 +51,7 @@ public List<CocktailSummaryResponseDto> getCocktails (Long lastId, Integer size)
                 cocktails = cocktailRepository.findByIdLessThanOrderByIdDesc(lastId, PageRequest.of(0, fetchSize));
             }
             return cocktails.stream()
-                    .map(c -> new CocktailSummaryResponseDto(c.getId(), c.getCocktailName(), c.getCocktailImgUrl()))
+                    .map(c -> new CocktailSummaryResponseDto(c.getId(), c.getCocktailName(), c.getCocktailImgUrl(), c.getAlcoholStrength()))
                     .collect(Collectors.toList());
         }
 

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

@@ -1,8 +1,5 @@
 package com.back.global.init;
 
-import com.back.domain.cocktail.dto.CocktailSearchRequestDto;
-import com.back.domain.cocktail.entity.Cocktail;
-import com.back.domain.cocktail.enums.AlcoholStrength;
 import com.back.domain.cocktail.repository.CocktailRepository;
 import com.back.domain.cocktail.service.CocktailService;
 import lombok.RequiredArgsConstructor;
@@ -12,9 +9,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Profile;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
 
 @Configuration
 @Profile("dev")
@@ -32,33 +26,8 @@ public class DevInitData {
     @Bean
     ApplicationRunner devInitDataApplicationRunner() {
         return args -> {
-            self.cocktailInit();        // 테스트용 데이터 삽입
+//            self.cocktailInit();        // 테스트용 데이터 삽입
         };
     }
-
-    @Transactional
-    public void cocktailInit() {
-        if (cocktailRepository.count() > 0) {
-            return;
-        }
-
-        for (int i = 1; i <= 20; i++) {  // 20개의 테스트 칵테일 생성
-            cocktailRepository.save(Cocktail.builder()
-                    .cocktailName("Cocktail " + i)
-                    .cocktailImgUrl("http://example.com/img" + i + ".jpg")
-                    .ingredient("Ingredient "+ i)
-                    .alcoholStrength(AlcoholStrength.NON_ALCOHOLIC)
-                    .build());
-        }
-
-        CocktailSearchRequestDto filterDto = new CocktailSearchRequestDto();
-        filterDto.setKeyword("cocktail 4"); // 검색 키워드 설정
-        filterDto.setAlcoholStrengths(Arrays.asList(AlcoholStrength.NON_ALCOHOLIC));
-
-        System.out.println("DevInitData: 테스트 칵테일 20개 삽입");
-        System.out.println(cocktailService.cocktailSearch("cocktail 3"));
-        System.out.println(cocktailService.cocktailSearch("Ingredient 4"));
-        System.out.println("filterDTO 결과값"+cocktailService.searchAndFilter(filterDto));
-    }
 }
 

src/main/resources/application-dev.yml

@@ -1,4 +1,8 @@
 spring:
+  sql:
+    init:
+      mode: always
+      data-locations: classpath:data-h2.sql
   # H2 Database 설정
   datasource:
     driver-class-name: org.h2.Driver
@@ -16,7 +20,7 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.H2Dialect
     hibernate:
-      ddl-auto: create-drop  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제
+      ddl-auto: update  # 개발용: 시작할 때 테이블 생성, 종료할 때 삭제
     properties:
       hibernate:
         format_sql: true

src/main/resources/application-test.yml

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