Skip to content

[refactor]칵테일 디테일 조회 기능에 프리뷰 기능추가 #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2025
Merged

[refactor]칵테일 디테일 조회 기능에 프리뷰 기능추가 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
511cc6b
fix : bugs of testCase, init data
lkw9241 Sep 29, 2025
bda289f
fix : bug
lkw9241 Sep 29, 2025
69a165d
refactor : add cocktail preview in DetailResponseDto
lkw9241 Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/main/java/com/back/domain/cocktail/dto/CocktailDetailResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -14,6 +15,26 @@ public record CocktailDetailResponseDto(
String cocktailImgUrl,
String cocktailStory,
List<CocktailService.IngredientDto> ingredient,
String recipe
String recipe,
String cocktailPreview
) {
public static CocktailDetailResponseDto from(Cocktail cocktail, List<CocktailService.IngredientDto> 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
);
}
}
13 changes: 1 addition & 12 deletions src/main/java/com/back/domain/cocktail/service/CocktailService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,7 @@ public CocktailDetailResponseDto getCocktailDetailById(Long cocktailId) {
// ingredient 분수 변환
List<IngredientDto> 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) {
Expand Down