Merge pull request #88 from SWYP-mingling/fix/SW-78-fix-station-name

casylm · web-flow · commit bca9d7a2048b · 2026-02-11T22:35:39.000+09:00
diff --git a/src/main/java/swyp/mingling/domain/meeting/dto/response/midpoint/GetMidPointResponse.java b/src/main/java/swyp/mingling/domain/meeting/dto/response/midpoint/GetMidPointResponse.java
@@ -23,6 +23,12 @@ public class GetMidPointResponse {
     @Schema(description = "경도", example = "126.9236")
     private double longitude;
 
+    @Schema(description = "장소가 가장 많은지 여부")
+    private boolean isHot;
+
+    @Schema(description = "주변 장소 개수")
+    private Integer placeCount;
+
     @Schema(description = "사용자 목록")
     List<UserRouteDto> userRoutes;
 }
diff --git a/src/main/java/swyp/mingling/domain/meeting/dto/response/midpoint/MidPointCandidate.java b/src/main/java/swyp/mingling/domain/meeting/dto/response/midpoint/MidPointCandidate.java
@@ -2,14 +2,21 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import java.util.List;
 import swyp.mingling.domain.subway.dto.SubwayRouteInfo;
 
+import java.util.List;
+
 @Getter
 @AllArgsConstructor
 public class MidPointCandidate {
 
     private List<SubwayRouteInfo> routes; // 해당 번화가로 가는 모든 사람의 경로
     private int deviation;                // 이동시간 편차
     private int avgTime;                  // 평균 이동시간 or 총합
+    private boolean isHot;                // 가장 장소가 많은 곳
+    private int placeCount;               // 주변 장소 개수
+
+    public void setHot(boolean hot) {
+        isHot = hot;
+    }
 }
diff --git a/src/main/java/swyp/mingling/domain/meeting/repository/MeetingRepository.java b/src/main/java/swyp/mingling/domain/meeting/repository/MeetingRepository.java
@@ -7,6 +7,7 @@
 import swyp.mingling.domain.meeting.entity.Meeting;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -21,4 +22,10 @@ public interface MeetingRepository extends JpaRepository<Meeting, UUID> {
         WHERE m.id = :meetingId and p.departure is not null
     """)
      List<DepartureListResponse> findDeparturesAndNicknameByMeetingId(@Param("meetingId") UUID meetingId);
+
+     @Query("SELECT mp.name FROM Meeting m " +
+             "JOIN m.purposeMappings mpm " +
+             "JOIN mpm.purpose mp " +
+             "WHERE m.id = :meetingId")
+     Optional<String> findPurposeNamesByMeetingId(@Param("meetingId") UUID meetingId);
 }
diff --git a/src/main/java/swyp/mingling/domain/meeting/service/MidPointAsyncUseCase.java b/src/main/java/swyp/mingling/domain/meeting/service/MidPointAsyncUseCase.java
@@ -5,12 +5,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import swyp.mingling.domain.meeting.dto.response.midpoint.*;
 import swyp.mingling.domain.meeting.dto.StationCoordinate;
+import swyp.mingling.domain.meeting.dto.response.midpoint.*;
 import swyp.mingling.domain.meeting.repository.HotPlaceRepository;
 import swyp.mingling.domain.meeting.repository.MeetingRepository;
 import swyp.mingling.domain.subway.dto.SubwayRouteInfo;
 import swyp.mingling.domain.subway.service.SubwayRouteService;
+import swyp.mingling.external.dto.response.KakaoPlaceSearchResponse;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -27,6 +28,7 @@ public class MidPointAsyncUseCase {
     private final FindStationCoordinateUseCase findStationCoordinateUseCase;
     private final HotPlaceRepository hotPlaceRepository;
     private final SubwayRouteService subwayRouteService;
+    private final SearchPlaceCountUseCase searchPlaceCountUseCase;
 
     public List<GetMidPointResponse> execute(UUID meetingId) {
         long startTime = System.currentTimeMillis();
@@ -71,6 +73,9 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                 .limit(5)
                 .toList();
 
+        //카테고리 가져오기
+        String category = meetingRepository.findPurposeNamesByMeetingId(meetingId).orElse("식당");
+
         // ========================================
         // 편차가 작은 번화가 3개 추출 (비동기 병렬 처리)
         // ========================================
@@ -118,21 +123,35 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                             }))
                             .toList();
 
+                    //수정: 카카오 장소 추천 API를 비동기로 요청
+                    CompletableFuture<KakaoPlaceSearchResponse> kakaoPlaceSearchResponse = CompletableFuture.supplyAsync(() ->
+                            searchPlaceCountUseCase.execute(fivehotlist.getName(), category, 1, 15)
+                    );
+
+                    // 비동기 작업을 하나의 리스트로 통합
+                    List<CompletableFuture<?>> allCombinedTasks = new ArrayList<>(routeFutures);
+                    allCombinedTasks.add(kakaoPlaceSearchResponse);
+
                     // [개선사항]
                     // allOf()를 사용하여 모든 경로 조회를 한번에 대기
                     // 기존: routeFutures.stream().map(CompletableFuture::join) == 순차 대기
                     // 개선: allOf()로 묶어서 가장 느린 작업 하나만 기다림
                     CompletableFuture<Void> allRoutes = CompletableFuture.allOf(
-                            routeFutures.toArray(new CompletableFuture[0])
+                            allCombinedTasks.toArray(new CompletableFuture[0])
                     );
 
+
                     // 모든 경로가 완료되면 MidPointCandidate 생성
                     // thenApply()로 비블로킹 방식으로 후속 처리
                     return allRoutes.thenApply(v -> {
                         List<SubwayRouteInfo> routes = routeFutures.stream()
                                 .map(CompletableFuture::join)
                                 .toList();
 
+                        KakaoPlaceSearchResponse place = kakaoPlaceSearchResponse.join();
+
+                        int placeCount = place.getMeta().getTotalCount();
+
                         int min = Integer.MAX_VALUE;
                         int max = Integer.MIN_VALUE;
 
@@ -151,7 +170,7 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
 
                         int avgTime = sum / routes.size();
 
-                        return new MidPointCandidate(routes, deviation, avgTime);
+                        return new MidPointCandidate(routes, deviation, avgTime, false, placeCount);
                     });
                 })
                 .toList();
@@ -170,22 +189,46 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                 .map(CompletableFuture::join)
                 .toList();
 
-        List<List<SubwayRouteInfo>> midlist =
+        // 이동시간 + 편차 고려한 리스트 중 2개 추출
+        List<MidPointCandidate> sortedByFairness =
                 candidates.stream()
                         .sorted(
                                 Comparator.comparing(MidPointCandidate::getDeviation)
                                         .thenComparing(MidPointCandidate::getAvgTime)
                         )
-                        .limit(3)
-                        .map(MidPointCandidate::getRoutes)
+                        .limit(2)
                         .toList();
 
+        // 장소 개수 기준 상위 1개 추출 (중복 여부 상관없이 1위 추출)
+        MidPointCandidate hotnessSelection = candidates.stream()
+                .sorted(Comparator.comparing(MidPointCandidate::getPlaceCount).reversed())
+                .findFirst()
+                .orElse(sortedByFairness.get(0)); // 만약 리스트가 비어있을 경우 대비
+
+        // 장소가 가장많은 중간지점은 Hot = true
+        hotnessSelection.setHot(true);
+
+        // 중복 제거를 위한 LinkedHashSet
+        Set<MidPointCandidate> set = new LinkedHashSet<>();
+        // 중간지점 추가
+        set.addAll(sortedByFairness);
+        set.add(hotnessSelection);
+
+        List<MidPointCandidate> finalThree = new ArrayList<>(set);
+
+//        // List<List<SubwayRouteInfo>> 형식으로 변환
+//        List<List<SubwayRouteInfo>> midlist = finalThree.stream()
+//                .map(MidPointCandidate::getRoutes)
+//                .toList();
+
         // 1. 결과 데이터를 담을 리스트 (좌표 조회 캐시 적용)
-        List<GetMidPointResponse> finalResult = midlist.stream()
+        List<GetMidPointResponse> finalResult = finalThree.stream()
                 .map(routeList -> {
                     // 이 그룹의 공통 목적지 추출
-                    String endStationName = routeList.get(0).getEndStation();
-                    String endStationLine = routeList.get(0).getEndStationLine();
+                    String endStationName = routeList.getRoutes().get(0).getEndStation();
+                    String endStationLine = routeList.getRoutes().get(0).getEndStationLine();
+                    Boolean isHot = routeList.isHot();
+                    Integer placeCount = routeList.getPlaceCount();
 
                     // 목적지 좌표 캐싱
                     StationCoordinate endStationCoord = stationCoordinateCache.computeIfAbsent( // 만약 데이터가 없으면 계산
@@ -194,9 +237,9 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                     );
 
                     // 2. 인덱스를 활용해 사용자별 닉네임과 경로 정보를 매핑 (IntStream 사용)
-                    List<UserRouteDto> userRouteDtos = IntStream.range(0, routeList.size())
+                    List<UserRouteDto> userRouteDtos = IntStream.range(0, routeList.getRoutes().size())
                             .mapToObj(i -> {
-                                SubwayRouteInfo route = routeList.get(i);
+                                SubwayRouteInfo route = routeList.getRoutes().get(i);
                                 // 기존 참여자 리스트(departurelists)에서 같은 순서의 닉네임을 가져옴
                                 String nickname = departurelists.get(i).getNickname();
 
@@ -225,13 +268,24 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                                 // 경로 상 역들의 좌표 캐싱
                                 List<StationPathResponse> stationResponses = route.getStations().stream()
                                         .map(station -> {
+                                            String name = station.getStationName();
+                                            String line = station.getLineNumber();
+
+                                            //검색어
+                                            String searchName = name;
+
+                                            //경의중앙선 양평 검색어 변경
+                                            if ("양평".equals(name) && "경의선".equals(line)) {
+                                                searchName = "양평(경의중앙선)";
+                                            }
+
                                             StationCoordinate coord = stationCoordinateCache.computeIfAbsent(
-                                                    station.getStationName(),
+                                                    searchName,
                                                     stationName -> findStationCoordinateUseCase.excute(stationName)
                                             );
                                             return StationPathResponse.from(
-                                                    station.getLineNumber(),
-                                                    station.getStationName(),
+                                                    line,
+                                                    name,
                                                     coord.getLatitude(),
                                                     coord.getLongitude()
                                             );
@@ -257,6 +311,8 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                             .endStation(endStationName)
                             .latitude(endStationCoord.getLatitude())
                             .longitude(endStationCoord.getLongitude())
+                            .isHot(isHot)
+                            .placeCount(placeCount)
                             .userRoutes(userRouteDtos)
                             .build();
                 })
diff --git a/src/main/java/swyp/mingling/domain/meeting/service/MidPointUseCase.java b/src/main/java/swyp/mingling/domain/meeting/service/MidPointUseCase.java
@@ -114,7 +114,7 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
             int avgTime = sum / routes.size();
 
             candidates.add(
-                    new MidPointCandidate(routes, deviation, avgTime)
+                    new MidPointCandidate(routes, deviation, avgTime, false, 0)
             );
         }
 
@@ -173,6 +173,7 @@ public List<GetMidPointResponse> execute(UUID meetingId) {
                             .endStation(endStationName)
                             .latitude(findStationCoordinateUseCase.excute(endStationName).getLatitude())
                             .longitude(findStationCoordinateUseCase.excute(endStationName).getLongitude())
+
                             .userRoutes(userRouteDtos)
                             .build();
                 })
diff --git a/src/main/java/swyp/mingling/domain/meeting/service/RecommendPlaceUseCase.java b/src/main/java/swyp/mingling/domain/meeting/service/RecommendPlaceUseCase.java
@@ -1,8 +1,5 @@
 package swyp.mingling.domain.meeting.service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +11,10 @@
 import swyp.mingling.global.enums.KakaoCategoryGroupCode;
 import swyp.mingling.global.exception.BusinessException;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * 장소 추천 UseCase
  */
@@ -33,11 +34,7 @@ public class RecommendPlaceUseCase {
      * @param size     조회할 개수 (기본값 15)
      * @return 추천 장소 목록
      */
-    @Cacheable(
-        cacheNames = "place-recommend",
-        cacheManager = "placeCacheManager",
-        key = "'recommend:' + #midPlace + ':' + #category + ':' + #page + ':' + #size"
-    )
+    @Cacheable
     public RecommendResponse execute(String midPlace, String category, int page, int size) {
 
         log.info("[CACHE MISS] Call Kakao place search API - midPlace: {}, category: {}, page: {}, size: {}"
diff --git a/src/main/java/swyp/mingling/domain/meeting/service/SearchPlaceCountUseCase.java b/src/main/java/swyp/mingling/domain/meeting/service/SearchPlaceCountUseCase.java
@@ -0,0 +1,94 @@
+package swyp.mingling.domain.meeting.service;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import swyp.mingling.external.KakaoPlaceClient;
+import swyp.mingling.external.dto.response.KakaoPlaceSearchResponse;
+import swyp.mingling.global.enums.KakaoCategoryGroupCode;
+import swyp.mingling.global.exception.BusinessException;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SearchPlaceCountUseCase {
+
+    private final KakaoPlaceClient kakaoPlaceClient;
+
+    public KakaoPlaceSearchResponse execute(String midPlace, String category, int page, int size) {
+
+    log.info("[CACHE MISS] Call Kakao place search API - midPlace: {}, category: {}, page: {}, size: {}"
+                    , midPlace, category, page, size);
+
+    // 1. 카테고리 한글명을 카카오 카테고리 그룹 코드로 변환
+        SearchPlaceCountUseCase.Categorysub categoryEnum = SearchPlaceCountUseCase.Categorysub.from(category)
+            .orElseThrow(BusinessException::purposeNotFound);
+
+    // 2. 검색어 생성
+    String query = buildSearchQuery(midPlace, categoryEnum);
+
+    // 3. 카카오 장소 검색 API 호출
+     KakaoPlaceSearchResponse response =
+            kakaoPlaceClient.search(
+                    query,
+                    categoryEnum.getKakaoCode(),
+                    page,
+                    size
+            );
+
+     return response;
+    }
+    /**
+     * 중간 지점 키워드와 카테고리를 조합해 카카오 장소 검색에 사용할 검색어를 생성
+     *
+     * @param midPlace 중간 지점 키워드 (예: "합정역")
+     * @param category 모임 목적 카테고리
+     * @return 카카오 장소 검색에 사용할 검색 쿼리 문자열
+     */
+    private String buildSearchQuery(String midPlace, SearchPlaceCountUseCase.Categorysub category) {
+        return midPlace + " " + category.getQueryKeyword();
+    }
+
+    /**
+     * 모임 목적 카테고리
+     * 외부에서 전달된 한글 카테고리를 기준으로 카카오 장소 검색 API 에서 사용할 category_group_code 로 변환하기 위한 내부 ENUM
+     */
+    @Getter
+    @RequiredArgsConstructor
+    private enum Categorysub {
+
+        RESTAURANT("식당", "맛집", KakaoCategoryGroupCode.RESTAURANT.getCode()),
+        CAFE("카페", "카페", KakaoCategoryGroupCode.CAFE.getCode()),
+        BAR("술집", "술집", KakaoCategoryGroupCode.RESTAURANT.getCode()),
+        STUDY_CAFE("스터디카페", "스터디카페", null),
+        SPACE_RENTAL("장소대여", "모임공간", null),
+        ENTERTAINMENT("놀거리", "실내데이트", null);
+
+        private final String categoryName;
+        private final String queryKeyword;
+        private final String kakaoCode;
+
+        /**
+         * 외부에서 전달된 카테고리 문자열을 Category 를 enum 으로 변환
+         *
+         * @param category 외부 요청으로 전달된 카테고리 문자열
+         * @return 일치하는 Optional<Category>
+         */
+        static Optional<SearchPlaceCountUseCase.Categorysub> from(String category) {
+            if (category == null || category.isBlank()) {
+                return Optional.empty();
+            }
+
+            String categoryWithoutSpaces = category.replaceAll("\\s+", "");
+
+            return Arrays.stream(values())
+                    .filter(c -> c.categoryName.equals(categoryWithoutSpaces))
+                    .findFirst();
+        }
+    }
+}
+
diff --git a/src/main/java/swyp/mingling/domain/subway/dto/SubwayRouteInfo.java b/src/main/java/swyp/mingling/domain/subway/dto/SubwayRouteInfo.java
@@ -21,6 +21,7 @@ public class SubwayRouteInfo {
     private final String endStation;
     private final String endStationLine;
     private final Integer totalTravelTime;
+    private final Integer placeCount;
     private final Double totalDistance;
     private final Integer transferCount;
     private final List<TransferInfo> transferPath;
diff --git a/src/main/resources/stations_info.json b/src/main/resources/stations_info.json
