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) {