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..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 @@ -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,18 +23,10 @@ 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 filteredMenus; public SearchFreePubRes(FreePub pub, List filteredMenus) { this.id = pub.getId(); @@ -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.address = pub.getAddress(); this.filteredMenus = filteredMenus; } } 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); } /**