[Feat]/#133 카페 검색 시, waypoint 및 place api 호출 구현 및 역기반 이동 (#138)

* [UI] #133 PlaceCellView 제작

* [UI] #133 WaypointCellView제작

* [Chore] #133 swfitLint 수정

수정: (type_body_length) 추가

* [Chore] #133 WayPoint Equatable 추가

* [Feat] #133  연관검색어 구현 및 검색 시 역이동 구현

* [Feat] #133 지도 카메라 포지션 이동 후 -> viewStore 카메라 포지션 동기화

* [UI]  #133 CafeSearchView  UI 구현

* [Feat] #133 역기반 검색 구현 및 역으로 이동

* [Chore] #133 Equatable 제거

* [Chore] #133 네이밍 수정 - (deprecated: timingCheckFlag)

- 기존: timingCheckFlag
- 수정: isSubmitfasterThanDebounce

* [Chore] #133 CancelId -> DebouncingCancelId 수정

* [Chore] #133 코드 내 불필요한 주석 제거

* [Chore] #133 주석 컨벤션에 맞게 수정

* [Chore] #133 cafeList, cafeMarkerList 제거

기존: cafeList, cafeMarkerList
수정: cafes

* [Chore] #133 requestWaypointSearchPlace 네이밍 수정

- 기존: requestWaypointSearchPlace
- 수정: requestSearchPlacesByWaypoint

* [Chore] #133 action case별 라벨링 추가

* [Chore] #133 if 조건문 검색어 기준으로 변경

* [Chore] #133 debounce, action네이밍 수정

* [Chore] #133 deleteRecentSearchWord label 추가

* [Chore] #133 isUpdatingCameraPosition

기존: isMovingToCurrentPosition
수정: isUpdatingCameraPosition

* [Chore] #133 조건문 변수화 진행

* [Chore] #133 네이밍 수정 [needToRetry~ ]

- 기존: isSubmitFasterThanFetchResponse
- 수정: needToRetryFetchResponse

* [Chore] #133 checkFetchPlaceResponse 네이밍 수정

- 기존: checkFetchPlaceResponse
- 수정: retryFetchPlacesAndWaypointsResponse

* [Chore] #133 tappedRecentSearchWord 수정

- 기존: tappedRecentSearchWord
- 수정: recentSearchWordCellTapped

* [Chore] #133 조건문 변수화 진행 - isSearchTextEqualToWaypoint

* [Chore] #133 API 네이밍 수정,

- 기존:
searchPlaces(requestValue:
fetchPlaces(requestValue

-수정:
searchPlaces(by text: String)
searchPlaces(by requestValue

* [Chore] #133 action 네이밍 수정 및 조건문 함수화

Author: NewHooon

.swiftlint.yml

@@ -2,6 +2,7 @@
 # Default Rules에서 비활성화할 규칙
 disabled_rules:
 - unused_closure_parameter
+- type_body_length
 
 # Default Rules에 없지만 활성화하고 싶은 규칙
 opt_in_rules:

Projects/Coffice/.swiftlint.yml

@@ -2,6 +2,7 @@
 # Default Rules에서 비활성화할 규칙
 disabled_rules:
 - unused_closure_parameter
+- type_body_length
 
 # Default Rules에 없지만 활성화하고 싶은 규칙
 opt_in_rules:

Projects/Coffice/Sources/App/Dependencies/SearchPlaceAPIClient.swift

@@ -13,7 +13,7 @@ import Network
 struct SearchPlaceAPIClient: DependencyKey {
   static var liveValue: SearchPlaceAPIClient = .liveValue
 
-  func searchPlaces(requestValue: SearchPlaceRequestValue) async throws -> CafeSearchResponse {
+  func searchPlaces(by requestValue: SearchPlaceRequestValue) async throws -> CafeSearchResponse {
     let coreNetwork = CoreNetwork.shared
     var urlComponents = URLComponents(string: coreNetwork.baseURL)
     urlComponents?.path = "/api/v1/places/search"
@@ -38,14 +38,14 @@ struct SearchPlaceAPIClient: DependencyKey {
     return cafeSearchResponse
   }
 
-  func fetchPlaces(requestValue: PlaceRequestValue) async throws -> CafeSearchResponse {
+  func searchPlaces(by text: String) async throws -> CafeSearchResponse {
     let coreNetwork = CoreNetwork.shared
     var urlComponents = URLComponents(string: coreNetwork.baseURL)
     urlComponents?.path = "/api/v1/places"
     urlComponents?.queryItems = [
-      .init(name: "name", value: requestValue.name),
-      .init(name: "page", value: String(requestValue.page)),
-      .init(name: "sort", value: requestValue.sort.name)
+      .init(name: "name", value: text),
+      .init(name: "page", value: String(0)),
+      .init(name: "sort", value: SortDescriptor.ascending.name)
     ]
     guard let request = urlComponents?.toURLRequest(method: .get)
     else { throw CoreNetworkError.requestConvertFailed }

Projects/Coffice/Sources/App/Entities/WayPoint.swift

@@ -9,7 +9,7 @@
 import Foundation
 import Network
 
-struct WayPoint {
+struct WayPoint: Hashable {
   let id: Int
   let name: String
   let latitude: Double

Projects/Coffice/Sources/App/Main/Search/CafeMapCore.swift

@@ -43,14 +43,13 @@ struct CafeMapCore: ReducerProtocol {
 
     // MARK: NaverMapView
     var currentCameraPosition = CLLocationCoordinate2D(latitude: 37.4971, longitude: 127.0287)
-    var cafeMarkerList: [Cafe] = []
-    var cafeList: [Cafe] = []
+    var cafes: [Cafe] = []
     var shouldClearMarkers: Bool = false
     let bottomFloatingButtons = BottomFloatingButton.allCases
-    var isMovingToCurrentPosition = false
+    var isUpdatingCameraPosition = false
     var isUpdatingMarkers = false
     var shouldUpdateMarkers: Bool {
-      return cafeMarkerList.isNotEmpty && isUpdatingMarkers
+      return cafes.isNotEmpty && isUpdatingMarkers
     }
     var isUpdatingBookmarkState = false
     var shouldShowRefreshButtonView: Bool {
@@ -83,11 +82,12 @@ struct CafeMapCore: ReducerProtocol {
     case cleardMarkers
     case refreshButtonTapped
     case updateCameraUpdateReason(NaverMapCameraUpdateReason)
-    case cameraPositionMoved
+    case cameraPositionMoved(newCameraPosition: CLLocationCoordinate2D)
 
     // MARK: Search
     case infiniteScrollSearchPlaceResponse(TaskResult<CafeSearchResponse>)
     case requestSearchPlaceResponse(TaskResult<CafeSearchResponse>, String)
+    case requestWaypointSearchPlaceResponse(TaskResult<CafeSearchResponse>)
 
     // MARK: Temporary
     case pushToSearchDetailForTest(cafeId: Int)
@@ -142,6 +142,26 @@ struct CafeMapCore: ReducerProtocol {
         return .none
 
         // MARK: Sub-Core Actions
+      case .cafeSearchAction(.searchPlacesByWaypoint(let waypoint)):
+        state.cafeSearchListState.title = waypoint.name
+        state.currentCameraPosition = CLLocationCoordinate2D(
+          latitude: waypoint.latitude, longitude: waypoint.longitude
+        )
+        state.cafeSearchState.searchTextSnapshot = ""
+        state.cafeSearchState.searchCameraPositionSnapshot = state.currentCameraPosition
+        return .run { send in
+          let result = await TaskResult {
+            let cafeRequest = SearchPlaceRequestValue(
+              searchText: "", userLatitude: waypoint.latitude, userLongitude: waypoint.longitude,
+              maximumSearchDistance: 2000, isOpened: nil, hasCommunalTable: nil,
+              filters: nil, pageSize: 10, pageableKey: nil
+            )
+            let cafeListData = try await placeAPIClient.searchPlaces(by: cafeRequest)
+            return cafeListData
+          }
+          await send(.requestWaypointSearchPlaceResponse(result))
+        }
+
       case .cafeSearchAction(.dismiss):
         switch state.cafeSearchState.previousViewType {
         case .mainMapView:
@@ -162,7 +182,7 @@ struct CafeMapCore: ReducerProtocol {
       case .cafeSearchListAction(.dismiss):
         return .send(.resetResult(.dismissSearchResultView))
 
-      case .cafeSearchAction(.requestSearchPlace(let searchText)):
+      case .cafeSearchAction(.searchPlacesByRequestValue(let searchText)):
         let title = searchText
         let cameraPosition = state.currentCameraPosition
         let isOpened = state.cafeFilterInformation.isOpened
@@ -183,7 +203,7 @@ struct CafeMapCore: ReducerProtocol {
               pageSize: 10,
               pageableKey: nil
             )
-            let cafeSearchResponose = try await placeAPIClient.searchPlaces(requestValue: cafeRequest)
+            let cafeSearchResponose = try await placeAPIClient.searchPlaces(by: cafeRequest)
             return cafeSearchResponose
           }
           await send(.requestSearchPlaceResponse(result, title))
@@ -210,7 +230,7 @@ struct CafeMapCore: ReducerProtocol {
               pageSize: pageSize,
               pageableKey: PageableKey(lastCafeDistance: lastDistance)
             )
-            let cafeSearchResponse = try await placeAPIClient.searchPlaces(requestValue: cafeRequest)
+            let cafeSearchResponse = try await placeAPIClient.searchPlaces(by: cafeRequest)
             return cafeSearchResponse
           }
           await send(.infiniteScrollSearchPlaceResponse(result))
@@ -224,7 +244,7 @@ struct CafeMapCore: ReducerProtocol {
       case .bottomFloatingButtonTapped(let buttonType):
         switch buttonType {
         case .currentLocationButton:
-          state.isMovingToCurrentPosition = true
+          state.isUpdatingCameraPosition = true
           return .send(.updateCurrentLocation)
         case .bookmarkButton:
           return .none
@@ -254,7 +274,7 @@ struct CafeMapCore: ReducerProtocol {
               pageableKey: nil
             )
 
-            let cafeListData = try await placeAPIClient.searchPlaces(requestValue: cafeRequest)
+            let cafeListData = try await placeAPIClient.searchPlaces(by: cafeRequest)
             return cafeListData.cafes
           }
           await send(.cafeListResponse(result))
@@ -263,7 +283,7 @@ struct CafeMapCore: ReducerProtocol {
       case .cafeListResponse(let result):
         switch result {
         case .success(let cafeList):
-          state.cafeMarkerList = cafeList
+          state.cafes = cafeList
           return .none
         case .failure(let error):
           debugPrint(error)
@@ -281,7 +301,7 @@ struct CafeMapCore: ReducerProtocol {
         return .none
 
       case .movedToCurrentPosition:
-        state.isMovingToCurrentPosition = false
+        state.isUpdatingCameraPosition = false
         return .none
 
       case .markersUpdated:
@@ -301,18 +321,19 @@ struct CafeMapCore: ReducerProtocol {
         state.cameraUpdateReason = updateReason
         return .none
 
-      case .cameraPositionMoved:
+      case .cameraPositionMoved(let newCameraPosition):
+        state.currentCameraPosition = newCameraPosition
         state.isMovingCameraPosition = false
         return .none
 
+      // MARK: Search
       case .requestSearchPlaceResponse(let result, let title):
         switch result {
         case .success(let searchResponse):
           if searchResponse.cafes.isEmpty {
             return .send(.resetResult(.searchResultIsEmpty))
           }
-          state.cafeList = searchResponse.cafes
-          state.cafeMarkerList = searchResponse.cafes
+          state.cafes = searchResponse.cafes
           state.isUpdatingMarkers = true
           state.cafeSearchListState.cafeList = searchResponse.cafes
           state.cafeSearchListState.hasNext = searchResponse.hasNext
@@ -323,7 +344,7 @@ struct CafeMapCore: ReducerProtocol {
             latitude: cafe.latitude,
             longitude: cafe.longitude
           )
-          state.isMovingToCurrentPosition = true
+          state.isUpdatingCameraPosition = true
           state.cafeSearchListState.title = title
           state.displayViewType = .searchResultView
           state.cafeSearchState.previousViewType = .searchResultView
@@ -344,7 +365,7 @@ struct CafeMapCore: ReducerProtocol {
           }
           if removedDuplicationCafes.isNotEmpty {
             state.cafeSearchListState.cafeList += cafeSearchResponse.cafes
-            state.cafeMarkerList += cafeSearchResponse.cafes
+            state.cafes += cafeSearchResponse.cafes
             state.isUpdatingMarkers = true
           }
           return .none
@@ -353,10 +374,30 @@ struct CafeMapCore: ReducerProtocol {
           return .none
         }
 
+      case .requestWaypointSearchPlaceResponse(let result):
+        switch result {
+        case .success(let searchResponse):
+          state.cafeSearchListState.hasNext = searchResponse.hasNext
+          if searchResponse.cafes.isEmpty {
+            return .send(.resetResult(.searchResultIsEmpty))
+          }
+          state.cafes = searchResponse.cafes
+          state.selectedCafe = nil
+          state.isUpdatingMarkers = true
+          state.cafeSearchListState.cafeList = searchResponse.cafes
+          state.cafeSearchListState.hasNext = searchResponse.hasNext
+          state.isUpdatingCameraPosition = true
+          state.displayViewType = .searchResultView
+          state.cafeSearchState.previousViewType = .searchResultView
+          return .send(.cafeSearchAction(.dismiss))
+        case .failure(let error):
+          debugPrint(error)
+          return .none
+        }
+
         // MARK: Common
       case .resetResult(let resetState):
-        state.cafeList = []
-        state.cafeMarkerList = []
+        state.cafes = []
         state.cafeSearchListState.cafeList = []
         state.cafeSearchListState.hasNext = nil
         state.cameraUpdateReason = .changedByDeveloper