From cf4dd96efd41c26969221d2a29dd50ea115208a0 Mon Sep 17 00:00:00 2001 From: develosopher Date: Thu, 9 Oct 2025 10:46:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20MyBarItemResponseDto=EC=97=90=20?= =?UTF-8?q?=EC=B9=B5=ED=85=8C=EC=9D=BC=20=ED=95=9C=EA=B8=80=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B0=8F=20=EB=8F=84=EC=88=98=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/back/domain/mybar/dto/MyBarItemResponseDto.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java b/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java index 8603cf6f..eea56894 100644 --- a/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java +++ b/src/main/java/com/back/domain/mybar/dto/MyBarItemResponseDto.java @@ -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; @@ -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; @@ -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()) From fdcc97e4b038996b29dbd3a901e6547578a4001d Mon Sep 17 00:00:00 2001 From: develosopher Date: Thu, 9 Oct 2025 10:47:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?test:=20MyBarControllerTest=EC=97=90=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EB=90=9C=20MyBarItemResponseDto=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 테스트의 `MyBarItemResponseDto` 목(Mock) 객체에 `cocktailNameKo` 및 `alcoholStrength` 필드를 추가 - 응답 데이터 직렬화 및 형식 검증을 위해 JSON 응답 검증(`jsonPath`) 로직에 새로운 필드 검증을 추가 --- .../domain/mybar/controller/MyBarControllerTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/com/back/domain/mybar/controller/MyBarControllerTest.java b/src/test/java/com/back/domain/mybar/controller/MyBarControllerTest.java index 463ba129..b006e39a 100644 --- a/src/test/java/com/back/domain/mybar/controller/MyBarControllerTest.java +++ b/src/test/java/com/back/domain/mybar/controller/MyBarControllerTest.java @@ -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; @@ -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) @@ -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))) @@ -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) @@ -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());