Skip to content

Feat/#43 #83

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
jdoeun merged 2 commits into from
Feb 27, 2025
Merged

Feat/#43 #83

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
e1984d7
fix: bungmap 검색 api들에 이미지 추가
jdoeun Feb 27, 2025
6b04763
fix: bungmap 검색 api들에 이미지 추가
jdoeun Feb 27, 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
1 change: 1 addition & 0 deletions src/main/java/swyp_8th/bungmakase_backend/dto/bung_map/MarkerResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ public class MarkerResponseDto {
private String startTime;
private String endTime;
private List<String> tastes;
private String imageUrl;
}
21 changes: 18 additions & 3 deletions src/main/java/swyp_8th/bungmakase_backend/service/BungMapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ public List<MarkerResponseDto> getAllMarkers() {
shop.getStar(),
shop.getStartTime() != null ? shop.getStartTime().toString() : "09:00",
shop.getEndTime() != null ? shop.getEndTime().toString() : "18:00",
Arrays.asList(shop.getTastes().split(","))
Arrays.asList(shop.getTastes().split(",")),
shop.getBungShopImages().stream()
.filter(image -> image.getBungShopReview() == null) // bung_shop_review_id가 null인 이미지만 필터링
.map(BungShopImage::getImageUrl) // 이미지 URL만 추출
.findFirst() // 첫 번째 이미지만 사용
.orElse(null) // 없으면 null
))
.collect(Collectors.toList());
}
Expand All @@ -70,7 +75,12 @@ public List<MarkerResponseDto> searchMarkersByShopName(String shopName) {
shop.getStar() != null ? shop.getStar() : 5,
shop.getStartTime() != null ? shop.getStartTime().toString() : "09:00",
shop.getEndTime() != null ? shop.getEndTime().toString() : "18:00",
Arrays.asList(shop.getTastes().split(","))
Arrays.asList(shop.getTastes().split(",")),
shop.getBungShopImages().stream()
.filter(image -> image.getBungShopReview() == null) // bung_shop_review_id가 null인 이미지만 필터링
.map(BungShopImage::getImageUrl) // 이미지 URL만 추출
.findFirst() // 첫 번째 이미지만 사용
.orElse(null) // 없으면 null
))
.collect(Collectors.toList());
}
Expand All @@ -87,7 +97,12 @@ public Optional<MarkerResponseDto> getMarkerByShopId(UUID shopId) {
shop.getStar() != null ? shop.getStar() : 5,
shop.getStartTime() != null ? shop.getStartTime().toString() : "09:00",
shop.getEndTime() != null ? shop.getEndTime().toString() : "18:00",
Arrays.asList(shop.getTastes().split(","))
Arrays.asList(shop.getTastes().split(",")),
shop.getBungShopImages().stream()
.filter(image -> image.getBungShopReview() == null) // bung_shop_review_id가 null인 이미지만 필터링
.map(BungShopImage::getImageUrl) // 이미지 URL만 추출
.findFirst() // 첫 번째 이미지만 사용
.orElse(null) // 없으면 null
));
}

Expand Down