Skip to content

[feat] 나만의 bar: 칵테일 한글이름, 알콜도수 라벨이 출력되도록 필드 추가 #250 #251

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 2 commits into from
Oct 9, 2025
Merged

[feat] 나만의 bar: 칵테일 한글이름, 알콜도수 라벨이 출력되도록 필드 추가 #250 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4dd96
feat: MyBarItemResponseDto에 칵테일 한글 이름 및 도수 필드 추가
devnneth Oct 9, 2025
fdcc97e
test: MyBarControllerTest에 변경된 MyBarItemResponseDto 필드 반영
devnneth Oct 9, 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
5 changes: 5 additions & 0 deletions src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.back.domain.mybar.dto;

import com.back.domain.cocktail.enums.AlcoholStrength;
import com.back.domain.mybar.entity.MyBar;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -12,6 +13,8 @@ public class MyBarItemResponseDto {
private Long id;
private Long cocktailId;
private String cocktailName;
private String cocktailNameKo; // 칵테일의 한글 표기 이름
private AlcoholStrength alcoholStrength; // 도수 레이블로 쓰이는 알코올 강도
private String imageUrl;
private LocalDateTime createdAt;
private LocalDateTime keptAt;
Expand All @@ -21,6 +24,8 @@ public static MyBarItemResponseDto from(MyBar m) {
.id(m.getId())
.cocktailId(m.getCocktail().getId())
.cocktailName(m.getCocktail().getCocktailName())
.cocktailNameKo(m.getCocktail().getCocktailNameKo())
.alcoholStrength(m.getCocktail().getAlcoholStrength())
.imageUrl(m.getCocktail().getCocktailImgUrl())
.createdAt(m.getCreatedAt())
.keptAt(m.getKeptAt())
Expand Down
9 changes: 9 additions & 0 deletions src/test/java/com/back/domain/mybar/controller/MyBarControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.back.domain.mybar.controller;

import com.back.domain.cocktail.enums.AlcoholStrength;
import com.back.domain.mybar.dto.MyBarItemResponseDto;
import com.back.domain.mybar.dto.MyBarListResponseDto;
import com.back.domain.mybar.service.MyBarService;
Expand Down Expand Up @@ -105,6 +106,8 @@ void getMyBarList_withoutCursor() throws Exception {
.id(3L)
.cocktailId(10L)
.cocktailName("Margarita")
.cocktailNameKo("留덇?由ы?")
.alcoholStrength(AlcoholStrength.LIGHT)
.imageUrl("https://example.com/margarita.jpg")
.createdAt(createdAt)
.keptAt(keptAt)
Expand Down Expand Up @@ -133,6 +136,8 @@ void getMyBarList_withoutCursor() throws Exception {
.andExpect(jsonPath("$.data.items[0].id").value(3L))
.andExpect(jsonPath("$.data.items[0].cocktailId").value(10L))
.andExpect(jsonPath("$.data.items[0].cocktailName").value("Margarita"))
.andExpect(jsonPath("$.data.items[0].cocktailNameKo").value("留덇?由ы?"))
.andExpect(jsonPath("$.data.items[0].alcoholStrength").value("LIGHT"))
.andExpect(jsonPath("$.data.items[0].imageUrl").value("https://example.com/margarita.jpg"))
.andExpect(jsonPath("$.data.items[0].createdAt").value(ISO_WITH_SECONDS.format(createdAt)))
.andExpect(jsonPath("$.data.items[0].keptAt").value(ISO_WITH_SECONDS.format(keptAt)))
Expand Down Expand Up @@ -160,6 +165,8 @@ void getMyBarList_withCursor() throws Exception {
.id(20L)
.cocktailId(33L)
.cocktailName("Negroni")
.cocktailNameKo("?ㅺ렇濡쒕땲")
.alcoholStrength(AlcoholStrength.STRONG)
.imageUrl("https://example.com/negroni.jpg")
.createdAt(itemCreatedAt)
.keptAt(itemKeptAt)
Expand Down Expand Up @@ -190,6 +197,8 @@ void getMyBarList_withCursor() throws Exception {
.andExpect(jsonPath("$.message").value("success"))
.andExpect(jsonPath("$.data.items[0].id").value(20L))
.andExpect(jsonPath("$.data.items[0].cocktailName").value("Negroni"))
.andExpect(jsonPath("$.data.items[0].cocktailNameKo").value("?ㅺ렇濡쒕땲"))
.andExpect(jsonPath("$.data.items[0].alcoholStrength").value("STRONG"))
.andExpect(jsonPath("$.data.hasNext").value(false))
.andExpect(jsonPath("$.data.nextKeptAt").doesNotExist());

Expand Down