From 511cc6b69fba359c8e9bb52bc5e0e2cb6738d947 Mon Sep 17 00:00:00 2001 From: LeeKW Date: Mon, 29 Sep 2025 11:29:08 +0900 Subject: [PATCH 1/3] fix : bugs of testCase, init data --- src/main/java/com/back/global/init/DevInitData.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/back/global/init/DevInitData.java b/src/main/java/com/back/global/init/DevInitData.java index a36d2a5..48233c5 100644 --- a/src/main/java/com/back/global/init/DevInitData.java +++ b/src/main/java/com/back/global/init/DevInitData.java @@ -58,6 +58,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(() -> From bda289f2d7c2f6ab610b6d214acbd584610d605e Mon Sep 17 00:00:00 2001 From: LeeKW Date: Mon, 29 Sep 2025 11:47:34 +0900 Subject: [PATCH 2/3] fix : bug --- src/main/java/com/back/global/init/DevInitData.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/com/back/global/init/DevInitData.java b/src/main/java/com/back/global/init/DevInitData.java index 48233c5..a36d2a5 100644 --- a/src/main/java/com/back/global/init/DevInitData.java +++ b/src/main/java/com/back/global/init/DevInitData.java @@ -58,18 +58,6 @@ 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(() -> From 69a165d59497ac2dbeb038afb32b85b6781ee5d3 Mon Sep 17 00:00:00 2001 From: LeeKW Date: Fri, 10 Oct 2025 10:14:29 +0900 Subject: [PATCH 3/3] refactor : add cocktail preview in DetailResponseDto --- .../dto/CocktailDetailResponseDto.java | 23 ++++++++++++++++++- .../cocktail/service/CocktailService.java | 13 +---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java b/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java index f6fb859..ddcac3f 100644 --- a/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java +++ b/src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java @@ -1,5 +1,6 @@ package com.back.domain.cocktail.dto; +import com.back.domain.cocktail.entity.Cocktail; import com.back.domain.cocktail.service.CocktailService; import java.util.List; @@ -14,6 +15,26 @@ public record CocktailDetailResponseDto( String cocktailImgUrl, String cocktailStory, List ingredient, - String recipe + String recipe, + String cocktailPreview ) { + public static CocktailDetailResponseDto from(Cocktail cocktail, List ingredients){ + String preview =cocktail.getCocktailStory().length() >80 ? + cocktail.getCocktailStory().substring(0,80)+"..." + : cocktail.getCocktailStory(); + + return new CocktailDetailResponseDto( + cocktail.getId(), + cocktail.getCocktailName(), + cocktail.getCocktailNameKo(), + cocktail.getAlcoholStrength().getDescription(), + cocktail.getCocktailType().getDescription(), + cocktail.getAlcoholBaseType().getDescription(), + cocktail.getCocktailImgUrl(), + cocktail.getCocktailStory(), + ingredients, + cocktail.getRecipe(), + preview + ); + } } diff --git a/src/main/java/com/back/domain/cocktail/service/CocktailService.java b/src/main/java/com/back/domain/cocktail/service/CocktailService.java index f302310..d64b6a2 100644 --- a/src/main/java/com/back/domain/cocktail/service/CocktailService.java +++ b/src/main/java/com/back/domain/cocktail/service/CocktailService.java @@ -124,18 +124,7 @@ public CocktailDetailResponseDto getCocktailDetailById(Long cocktailId) { // ingredient 분수 변환 List formattedIngredient = parseIngredients(convertFractions(cocktail.getIngredient())); - return new CocktailDetailResponseDto( - cocktail.getId(), - cocktail.getCocktailName(), - cocktail.getCocktailNameKo(), - cocktail.getAlcoholStrength().getDescription(), - cocktail.getCocktailType().getDescription(), - cocktail.getAlcoholBaseType().getDescription(), - cocktail.getCocktailImgUrl(), - cocktail.getCocktailStory(), - formattedIngredient, - cocktail.getRecipe() - ); + return CocktailDetailResponseDto.from(cocktail, formattedIngredient); } private String convertFractions(String ingredient) {