Merge pull request #23 from KUSITMS-Team-A/fix/22-find-store

[#22] 가게 찾기 API 수정
KUSITMS-Team-A · Nov 21, 2023 · e949f1b · e949f1b
2 parents 1d08066 + acbe48e
commit e949f1b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/main/java/com/backend/domain/store/dto/ReadStoreDetailsDto.java b/src/main/java/com/backend/domain/store/dto/ReadStoreDetailsDto.java
@@ -24,6 +24,10 @@ public class ReadStoreDetailsDto {
 
     private String address;
 
+    private Double latitude;
+
+    private Double longitude;
+
     private List<BusinessHourDto> businessHours;
 
     private String phoneNumber;
@@ -41,6 +45,8 @@ public static ReadStoreDetailsDto from(StoreDetailsDto store, List<BusinessHour>
                 .category(store.getCategory().getCategoryName())
                 .description(store.getDescription())
                 .address(store.getAddress())
+                .latitude(store.getLatitude())
+                .longitude(store.getLongitude())
                 .phoneNumber(store.getPhoneNumber())
                 .distance(store.getDistance())
                 .mapUrl(store.getMapUrl())

diff --git a/src/main/java/com/backend/domain/store/dto/StoreDetailsDto.java b/src/main/java/com/backend/domain/store/dto/StoreDetailsDto.java
@@ -17,6 +17,10 @@ public interface StoreDetailsDto {
 
     String getAddress();
 
+    Double getLatitude();
+
+    Double getLongitude();
+
     String getPhoneNumber();
 
     Double getDistance();

diff --git a/src/main/java/com/backend/domain/store/dto/StoresDto.java b/src/main/java/com/backend/domain/store/dto/StoresDto.java
@@ -12,6 +12,10 @@ public interface StoresDto {
 
     String getAddress();
 
+    Double getLatitude();
+
+    Double getLongitude();
+
     Category getCategory();
 
     Double getDistance();

diff --git a/src/main/java/com/backend/domain/store/repository/StoreRepository.java b/src/main/java/com/backend/domain/store/repository/StoreRepository.java
@@ -22,6 +22,8 @@ public interface StoreRepository extends JpaRepository<Store, Long> {
                     "       CASE WHEN p.pick_id IS NOT NULL THEN 'TRUE' ELSE 'FALSE' END AS isPicked," +
                     "       s.category AS category," +
                     "       s.address AS address," +
+                    "       s.latitude AS latitude," +
+                    "       s.longitude AS longitude," +
                     "       s.phone_number AS phoneNumber," +
                     "       ST_Distance_Sphere(point(s.longitude, s.latitude), point(:longitude, :latitude)) AS distance," +
                     "       s.map_url AS mapUrl" +
@@ -45,6 +47,8 @@ Optional<StoreDetailsDto> findStoreDetailById(@Param("userId") Long userId,
                     "       CASE WHEN p.pick_id IS NOT NULL THEN 'TRUE' ELSE 'FALSE' END AS isPicked," +
                     "       s.category AS category," +
                     "       s.address AS address," +
+                    "       s.latitude AS latitude," +
+                    "       s.longitude AS longitude," +
                     "       ST_Distance_Sphere(point(s.longitude, s.latitude), point(:longitude, :latitude)) AS distance" +
                     "  FROM store s" +
                     "  JOIN pick p ON s.store_id = p.store_id AND p.user_id = :userId" +
@@ -74,6 +78,8 @@ Page<StoresDto> findAllContainsNameAndPicked(@Param("userId") Long userId,
                     "        CASE WHEN p.pick_id IS NOT NULL THEN 'TRUE' ELSE 'FALSE' END AS isPicked," +
                     "        s.category AS category," +
                     "        s.address AS address," +
+                    "        s.latitude AS latitude," +
+                    "        s.longitude AS longitude," +
                     "        ST_Distance_Sphere(point(s.longitude, s.latitude), point(:longitude, :latitude)) AS distance" +
                     "  FROM store s" +
                     "  JOIN pick p ON s.store_id = p.store_id AND p.user_id = :userId" +
@@ -104,6 +110,8 @@ Page<StoresDto> findAllContainsNameAndPickedAndCategory(@Param("userId") Long us
                     "       CASE WHEN p.pick_id IS NOT NULL THEN 'TRUE' ELSE 'FALSE' END AS isPicked," +
                     "       s.category AS category," +
                     "       s.address AS address," +
+                    "       s.latitude AS latitude," +
+                    "       s.longitude AS longitude," +
                     "       ST_Distance_Sphere(point(s.longitude, s.latitude), point(:longitude, :latitude)) AS distance" +
                     "  FROM store s" +
                     "  LEFT JOIN pick p ON s.store_id = p.store_id AND p.user_id = :userId" +
@@ -132,6 +140,8 @@ Page<StoresDto> findAllContainsName(@Param("userId") Long userId,
                     "       CASE WHEN p.pick_id IS NOT NULL THEN 'TRUE' ELSE 'FALSE' END AS isPicked," +
                     "       s.category AS category," +
                     "       s.address AS address," +
+                    "       s.latitude AS latitude," +
+                    "       s.longitude AS longitude," +
                     "       ST_Distance_Sphere(point(s.longitude, s.latitude), point(:longitude, :latitude)) AS distance" +
                     "  FROM store s" +
                     "  LEFT JOIN pick p ON s.store_id = p.store_id AND p.user_id = :userId" +