refactor: test deploy

Author: 이주승

.github/workflows/deploy.yml

@@ -3,7 +3,7 @@ name: CI/CD with Git Actions & Docker Hub test
 on:
   push:
     branches:
-      - feat/#19
+      - refactor/#21
 
 jobs:
   build:

src/main/java/com/drinkhere/drinklystore/application/service/Impl/store/GetStoresByLocationUseCase.java

@@ -24,7 +24,7 @@ public List<GetStoresByLocationResponse> getStoresByLocation(double latitude, do
 
         Map<Boolean, List<GetStoresByLocationResponse>> partitioned =
                 storesByLocation.stream()
-                        .map(store -> GetStoresByLocationResponse.toDto(store, presignedUrlService))
+                        .map(store -> GetStoresByLocationResponse.toDto(store, presignedUrlService, latitude, longitude))
                         .collect(Collectors.partitioningBy(GetStoresByLocationResponse::isAvailable));
 
         List<GetStoresByLocationResponse> result = new ArrayList<>();

src/main/java/com/drinkhere/drinklystore/domain/dto/response/GetStoresByLocationResponse.java

@@ -5,6 +5,7 @@
 import com.drinkhere.drinklystore.domain.entity.Store;
 import com.drinkhere.drinklystore.domain.entity.StoreImage;
 import com.drinkhere.drinklystore.domain.enums.StoreImageType;
+import com.drinkhere.drinklystore.util.DistanceUtil;
 import com.drinkhere.drinklystore.util.JsonUtil;
 
 import java.time.DayOfWeek;
@@ -26,9 +27,11 @@ public record GetStoresByLocationResponse(
         String openingInfo,
         String storeTel,
         String storeAddress,
-        List<String> availableDrinks
+        List<String> availableDrinks,
+        double distance
 ) {
-    public static GetStoresByLocationResponse toDto(Store store, PresignedUrlService presignedUrlService) {
+    public static GetStoresByLocationResponse toDto(Store store, PresignedUrlService presignedUrlService, double lat, double lon) {
+
         String presignedUrl = presignedUrlService.getPresignedUrlForGet(store.getStoreMainImageUrl());
 
         List<String> availableDrinks = store.getStoreImages().stream()
@@ -129,7 +132,8 @@ public static GetStoresByLocationResponse toDto(Store store, PresignedUrlService
                 openingInfo,
                 store.getStoreTel(),
                 store.getStoreAddress(),
-                availableDrinks
+                availableDrinks,
+                DistanceUtil.calculateDistance(lat, lon, Double.parseDouble(store.getLatitude()), Double.parseDouble(store.getLongitude()))
         );
     }
 

src/main/java/com/drinkhere/drinklystore/domain/repository/StoreRepository.java

@@ -53,7 +53,6 @@ List<Store> findStoresByLocation(@Param("latitude") double latitude,
                                      @Param("searchKeyword") String searchKeyword);
 
 
-
     @Query("SELECT s FROM Store s LEFT JOIN FETCH s.storeImages WHERE s.id = :storeId")
     Optional<Store> findByIdWithImages(@Param("storeId") Long storeId);
 

src/main/java/com/drinkhere/drinklystore/domain/service/store/StoreQueryService.java

@@ -4,8 +4,6 @@
 import com.drinkhere.drinklystore.domain.entity.Store;
 import com.drinkhere.drinklystore.domain.repository.StoreRepository;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;

src/main/java/com/drinkhere/drinklystore/util/DistanceUtil.java

@@ -0,0 +1,18 @@
+package com.drinkhere.drinklystore.util;
+
+public class DistanceUtil {
+    private static final int EARTH_RADIUS_KM = 6371;
+
+    public static double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
+        double latDistance = Math.toRadians(lat2 - lat1);
+        double lonDistance = Math.toRadians(lon2 - lon1);
+
+        double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2)
+                + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+                * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2);
+
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+        return EARTH_RADIUS_KM * c;
+    }
+}