Hotfix : 파티 생성, 조회시 거리 계산 로직 반영 (#60)

milowon · web-flow · commit 6eaf71f79c71 · 2026-01-03T00:03:34.000+09:00
* hotfix : 파티 생성, 조회 시, 거리 계산 로직 반영
diff --git a/src/main/java/ita/tinybite/domain/party/controller/PartyController.java b/src/main/java/ita/tinybite/domain/party/controller/PartyController.java
@@ -11,6 +11,7 @@
 import ita.tinybite.domain.chat.entity.ChatRoom;
 import ita.tinybite.domain.party.dto.request.PartyCreateRequest;
 import ita.tinybite.domain.party.dto.request.PartyUpdateRequest;
+import ita.tinybite.domain.party.dto.request.UserLocation;
 import ita.tinybite.domain.party.dto.response.ChatRoomResponse;
 import ita.tinybite.domain.party.dto.response.PartyDetailResponse;
 import ita.tinybite.domain.party.dto.response.PartyListResponse;
@@ -319,11 +320,12 @@ public ResponseEntity<PartyListResponse> getPartyList(
     @GetMapping("/{partyId}")
     public ResponseEntity<PartyDetailResponse> getPartyDetail(
             @PathVariable Long partyId,
-            @RequestHeader("Authorization") String token
+            @RequestHeader("Authorization") String token,
+            @RequestBody UserLocation userLocation
     ) {
         Long userId = jwtTokenProvider.getUserId(token);
 
-        PartyDetailResponse response = partyService.getPartyDetail(partyId, userId);
+        PartyDetailResponse response = partyService.getPartyDetail(partyId, userId,userLocation);
         return ResponseEntity.ok(response);
     }
 
diff --git a/src/main/java/ita/tinybite/domain/party/dto/request/PartyCreateRequest.java b/src/main/java/ita/tinybite/domain/party/dto/request/PartyCreateRequest.java
@@ -34,12 +34,6 @@ public class PartyCreateRequest {
     @NotNull(message = "수령 장소 정보는 필수입니다")
     private PickupLocation pickupLocation;
 
-//    @NotNull(message = "위도는 필수입니다")
-//    private Double latitude;
-//
-//    @NotNull(message = "경도는 필수입니다")
-//    private Double longitude;
-
     @Size(max = 5, message = "이미지는 최대 5장까지 업로드 가능합니다")
     private List<String> images;
 
diff --git a/src/main/java/ita/tinybite/domain/party/dto/request/UserLocation.java b/src/main/java/ita/tinybite/domain/party/dto/request/UserLocation.java
@@ -0,0 +1,13 @@
+package ita.tinybite.domain.party.dto.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserLocation {
+    Double latitude;
+    Double longitude;
+}
diff --git a/src/main/java/ita/tinybite/domain/party/entity/Party.java b/src/main/java/ita/tinybite/domain/party/entity/Party.java
@@ -62,12 +62,6 @@ public class Party {
     @Column(nullable = false)
     private PartyStatus status;
 
-//    @Column(nullable = false)
-//    private Double latitude; // 위도 (거리 계산용)
-//
-//    @Column(nullable = false)
-//    private Double longitude; // 경도 (거리 계산용)
-
     @Column(nullable = false)
     private Boolean isClosed; // 마감 여부
 
@@ -144,8 +138,6 @@ public void updateAllFields(String title, Integer price, Integer maxParticipants
         this.price = price != null ? price : this.price;
         this.maxParticipants = maxParticipants != null ? maxParticipants : this.maxParticipants;
         this.pickupLocation = pickupLocation != null ? pickupLocation : this.pickupLocation;
-//        this.latitude = latitude != null ? latitude : this.latitude;
-//        this.longitude = longitude != null ? longitude : this.longitude;
 
         // 상품 링크 검증
         if (productLink != null) {
diff --git a/src/main/java/ita/tinybite/domain/party/entity/PickupLocation.java b/src/main/java/ita/tinybite/domain/party/entity/PickupLocation.java
@@ -17,8 +17,8 @@ public class PickupLocation {
     private String place;
 
 //    @NotNull(message = "위도는 필수입니다")
-//    private Double pickupLatitude;
+    private Double pickupLatitude;
 //
 //    @NotNull(message = "경도는 필수입니다")
-//    private Double pickupLongitude;
+    private Double pickupLongitude;
 }
diff --git a/src/main/java/ita/tinybite/domain/party/service/PartyService.java b/src/main/java/ita/tinybite/domain/party/service/PartyService.java
@@ -5,6 +5,7 @@
 import ita.tinybite.domain.chat.repository.ChatRoomRepository;
 import ita.tinybite.domain.party.dto.request.PartyCreateRequest;
 import ita.tinybite.domain.party.dto.request.PartyUpdateRequest;
+import ita.tinybite.domain.party.dto.request.UserLocation;
 import ita.tinybite.domain.party.dto.response.*;
 import ita.tinybite.domain.party.entity.Party;
 import ita.tinybite.domain.party.entity.PartyParticipant;
@@ -51,16 +52,15 @@ public Long createParty(Long userId, PartyCreateRequest request) {
         // 카테고리별 유효성 검증
         validateProductLink(request.getCategory(), request.getProductLink());
 
-        // 첫 번째 이미지를 썸네일로 사용, 없으면 기본 이미지
-        String thumbnailImage = getDefaultImageIfEmpty(request.getImages(), request.getCategory());
-
         Party party = Party.builder()
                 .title(request.getTitle())
                 .category(request.getCategory())
                 .price(request.getTotalPrice())
                 .maxParticipants(request.getMaxParticipants())
                 .pickupLocation(PickupLocation.builder()
                         .place(request.getPickupLocation().getPlace())
+                        .pickupLatitude(request.getPickupLocation().getPickupLatitude())
+                        .pickupLongitude(request.getPickupLocation().getPickupLongitude())
                         .build())
                 .image(getImageIfPresent(request.getImages()))
                 .thumbnailImage(getThumbnailIfPresent(request.getImages(), request.getCategory()))
@@ -182,7 +182,7 @@ public PartyListResponse getPartyList(Long userId, PartyCategory category) {
     /**
      * 파티 상세 조회
      */
-    public PartyDetailResponse getPartyDetail(Long partyId, Long userId) {
+    public PartyDetailResponse getPartyDetail(Long partyId, Long userId, UserLocation userLocation) {
         Party party = partyRepository.findById(partyId)
                 .orElseThrow(() -> new IllegalArgumentException("파티를 찾을 수 없습니다"));
 
@@ -200,18 +200,26 @@ public PartyDetailResponse getPartyDetail(Long partyId, Long userId) {
 
         // 거리 계산 (사용자 위치 필요)
         double distance = 0.0;
-//        if (user != null) {
-//            distance = DistanceCalculator.calculateDistance(
-//                    userLat,
-//                    userLon,
-//                    party.getLatitude(),
-//                    party.getLongitude()
-//            );
-//        }
+        if (validateLocation(user,userLocation,party)) {
+            distance = DistanceCalculator.calculateDistance(
+                    userLocation.getLatitude(),
+                    userLocation.getLongitude(),
+                    party.getPickupLocation().getPickupLatitude(),
+                    party.getPickupLocation().getPickupLongitude()
+            );
+        }
 
         return convertToDetailResponse(party, distance, isParticipating);
     }
 
+    private boolean validateLocation(User user, UserLocation userLocation, Party party) {
+        return (user != null
+                && userLocation.getLatitude() != null
+                && userLocation.getLongitude()!= null
+                && party.getPickupLocation().getPickupLatitude()!= null
+                && party.getPickupLocation().getPickupLongitude()!=null);
+    }
+
     /**
      * 파티 참여
      */
@@ -293,7 +301,7 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
         // 이미지 파싱
         List<String> images = new ArrayList<>();
         if (party.getImage() != null && !party.getImage().isEmpty()) {
-            images = List.of(party.getImage().toString());
+            images = List.of(party.getImage());
         }
 
         return PartyDetailResponse.builder()
@@ -307,7 +315,7 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
                         .profileImage(party.getHost().getProfileImage())
                         .build())
                 .pickupLocation(party.getPickupLocation())
-//                .distance(DistanceCalculator.formatDistance(distance))
+                .distance(formatDistanceIfExists(distance))
                 .currentParticipants(currentCount)
                 .maxParticipants(party.getMaxParticipants())
                 .remainingSlots(party.getMaxParticipants() - currentCount)
@@ -349,8 +357,8 @@ public void updateParty(Long partyId, Long userId, PartyUpdateRequest request) {
                     request.getTitle(),
                     request.getTotalPrice(),
                     request.getMaxParticipants(),
-//                    new PickupLocation(request.getPickupLocation(), request.getLatitude(), request.getLongitude()),
-                    new PickupLocation(request.getPickupLocation()),
+                    new PickupLocation(request.getPickupLocation(), request.getLatitude(), request.getLongitude()),
+//                    new PickupLocation(request.getPickupLocation()),
                     request.getLatitude(),
                     request.getLongitude(),
                     request.getProductLink(),
@@ -631,5 +639,9 @@ private String getLinkIfValid(String link, PartyCategory category) {
     private String getDescriptionIfPresent(String description) {
         return (description != null && !description.isBlank()) ? description : null;
     }
+
+    private String formatDistanceIfExists(Double distance) {
+        return distance!= null? DistanceCalculator.formatDistance(distance):null;
+    }
 }
 
