From 4b75f0f86d7e3eda01ef6a4ad93aa26dbe143049 Mon Sep 17 00:00:00 2001 From: Yeoeun Yang Date: Tue, 16 Sep 2025 21:47:54 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20DTO=20=EB=82=B4=20=EC=A3=BC=EC=86=8C?= =?UTF-8?q?/=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koyeon/dto/response/SearchFreePubRes.java | 24 +++++++------------ .../domain/koyeon/service/KoyeonService.java | 14 ++++++----- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java b/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java index 646bc7b7..2211eb82 100644 --- a/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java @@ -2,10 +2,9 @@ import devkor.com.teamcback.domain.koyeon.entity.FreePub; import io.swagger.v3.oas.annotations.media.Schema; -import java.util.ArrayList; -import java.util.List; import lombok.Getter; -import lombok.NoArgsConstructor; + +import java.util.List; @Schema(description = "주점 정보") @Getter @@ -24,20 +23,12 @@ public class SearchFreePubRes { private Double latitude; @Schema(description = "노드 ID", example = "1") private Long nodeId = null; + @Schema(description = "주점 주소", example = "서울특별시 성북구 5가") + private String address; @Schema(description = "태그에 해당하는 음식 리스트", example = "[\"떡볶이\"]") - private List filteredMenus = new ArrayList<>(); - - public SearchFreePubRes(FreePub pub) { - this.id = pub.getId(); - this.name = pub.getName(); - this.sponsor = pub.getSponsor(); - this.operatingTime = pub.getOperatingTime(); - this.latitude = pub.getLatitude(); - this.longitude = pub.getLongitude(); - if(pub.getNode() != null) this.nodeId = pub.getNode().getId(); - } + private List menus; - public SearchFreePubRes(FreePub pub, List filteredMenus) { + public SearchFreePubRes(FreePub pub, List menus) { this.id = pub.getId(); this.name = pub.getName(); this.sponsor = pub.getSponsor(); @@ -45,6 +36,7 @@ public SearchFreePubRes(FreePub pub, List filteredMenus) { this.latitude = pub.getLatitude(); this.longitude = pub.getLongitude(); if(pub.getNode() != null) this.nodeId = pub.getNode().getId(); - this.filteredMenus = filteredMenus; + this.address = pub.getAddress(); + this.menus = menus; } } diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/service/KoyeonService.java b/src/main/java/devkor/com/teamcback/domain/koyeon/service/KoyeonService.java index 46220a11..1c320e95 100644 --- a/src/main/java/devkor/com/teamcback/domain/koyeon/service/KoyeonService.java +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/service/KoyeonService.java @@ -1,10 +1,10 @@ package devkor.com.teamcback.domain.koyeon.service; -import devkor.com.teamcback.domain.schoolcalendar.entity.SchoolCalendar; -import devkor.com.teamcback.domain.schoolcalendar.repository.SchoolCalendarRepository; import devkor.com.teamcback.domain.koyeon.dto.response.*; import devkor.com.teamcback.domain.koyeon.entity.*; import devkor.com.teamcback.domain.koyeon.repository.*; +import devkor.com.teamcback.domain.schoolcalendar.entity.SchoolCalendar; +import devkor.com.teamcback.domain.schoolcalendar.repository.SchoolCalendarRepository; import devkor.com.teamcback.global.exception.exception.GlobalException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -72,10 +72,12 @@ public SearchFreePubListRes searchFreePubList(Long tagId) { return new SearchFreePubListRes(pubResList); } - return new SearchFreePubListRes(freePubRepository.findAll() - .stream() - .map(SearchFreePubRes::new) - .toList()); + List pubList = freePubRepository.findAll(); + List pubResList = new ArrayList<>(); + for (FreePub pub : pubList) { + pubResList.add(new SearchFreePubRes(pub, menuRepository.findByFreePub(pub).stream().map(Menu::getName).toList())); + } + return new SearchFreePubListRes(pubResList); } /** From f718ba8efba01e386709370cc7b491ac23fce4a3 Mon Sep 17 00:00:00 2001 From: Yeoeun Yang Date: Tue, 16 Sep 2025 22:01:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/koyeon/dto/response/SearchFreePubRes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java b/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java index 2211eb82..1a5476b8 100644 --- a/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java +++ b/src/main/java/devkor/com/teamcback/domain/koyeon/dto/response/SearchFreePubRes.java @@ -26,9 +26,9 @@ public class SearchFreePubRes { @Schema(description = "주점 주소", example = "서울특별시 성북구 5가") private String address; @Schema(description = "태그에 해당하는 음식 리스트", example = "[\"떡볶이\"]") - private List menus; + private List filteredMenus; - public SearchFreePubRes(FreePub pub, List menus) { + public SearchFreePubRes(FreePub pub, List filteredMenus) { this.id = pub.getId(); this.name = pub.getName(); this.sponsor = pub.getSponsor(); @@ -37,6 +37,6 @@ public SearchFreePubRes(FreePub pub, List menus) { this.longitude = pub.getLongitude(); if(pub.getNode() != null) this.nodeId = pub.getNode().getId(); this.address = pub.getAddress(); - this.menus = menus; + this.filteredMenus = filteredMenus; } }