Merge pull request #82 from cake-way/dev

지도가게검색 위도,경도,케이크리스트 추가

Author: hyeinNa

src/main/java/com/example/cake_way/home/search/dto/CakeShopSearchDTO.java

@@ -15,5 +15,7 @@ public class CakeShopSearchDTO {
     private String contact; // 연락처
     private String thumbnailImage; // 썸네일 이미지
     private double distance; // 거리
-    private List<CakeDTO> cakes; // 케이크 리스트
+    private double latitude; // 위도
+    private double longitude; // 경도
+    private List<CakeDTO> cakes; // 해당 가게의 케이크 리스트
 }

src/main/java/com/example/cake_way/home/search/service/MapSearchService.java

@@ -1,5 +1,7 @@
 package com.example.cake_way.home.search.service;
 
+import com.example.cake_way.cake.dto.CakeDTO;
+import com.example.cake_way.cake.repository.CakeRepository;
 import com.example.cake_way.cakeshop.entity.CakeShop;
 import com.example.cake_way.cakeshop.repository.CakeShopRepository;
 import com.example.cake_way.common.util.DistanceCalculator;
@@ -9,13 +11,16 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
+
 @Service
 public class MapSearchService {
 
     private final CakeShopRepository cakeShopRepository;
+    private final CakeRepository cakeRepository;
 
-    public MapSearchService(CakeShopRepository cakeShopRepository) {
+    public MapSearchService(CakeShopRepository cakeShopRepository, CakeRepository cakeRepository) {
         this.cakeShopRepository = cakeShopRepository;
+        this.cakeRepository = cakeRepository;
     }
 
     public List<CakeShopSearchDTO> searchCakeShops(String keyword, double latitude, double longitude, boolean isSameDay) {
@@ -33,18 +38,33 @@ public List<CakeShopSearchDTO> searchCakeShops(String keyword, double latitude,
                     : cakeShopRepository.findByKeyword(keyword);
         }
 
-        // 거리 계산 및 정렬
+        // 거리 계산 및 케이크 정보 추가
         return shops.stream()
-                .map(shop -> CakeShopSearchDTO.builder()
-                        .shopId(shop.getShopId())
-                        .name(shop.getName())
-                        .address(shop.getAddress())
-                        .contact(shop.getContact())
-                        .thumbnailImage(shop.getThumbnailImage())
-                        .distance(DistanceCalculator.calculateDistance(
-                                shop.getLatitude(), shop.getLongitude(), latitude, longitude))
-                        .build())
+                .map(shop -> {
+                    List<CakeDTO> cakes = cakeRepository.findByCakeShop(shop).stream()
+                            .map(cake -> CakeDTO.builder()
+                                    .cakeId(cake.getCakeId())
+                                    .name(cake.getName())
+                                    .price(cake.getPrice())
+                                    .imageUrl(cake.getImageUrl())
+                                    .build())
+                            .collect(Collectors.toList());
+
+                    return CakeShopSearchDTO.builder()
+                            .shopId(shop.getShopId())
+                            .name(shop.getName())
+                            .address(shop.getAddress())
+                            .contact(shop.getContact())
+                            .thumbnailImage(shop.getThumbnailImage())
+                            .distance(DistanceCalculator.calculateDistance(
+                                    shop.getLatitude(), shop.getLongitude(), latitude, longitude))
+                            .latitude(shop.getLatitude()) // 위도 추가
+                            .longitude(shop.getLongitude()) // 경도 추가
+                            .cakes(cakes) // 케이크 리스트 추가
+                            .build();
+                })
                 .sorted(Comparator.comparingDouble(CakeShopSearchDTO::getDistance)) // 가까운 순으로 정렬
                 .collect(Collectors.toList());
     }
 }
+