Merge branch 'iOS/release' into iOS/task/upgradeLocalStorage

boostcampwm2023 · Dec 10, 2023 · 0d6e209 · 0d6e209
2 parents 86b4988 + 378314d
commit 0d6e209
Show file tree

Hide file tree

Showing 20 changed files with 237 additions and 41 deletions.
diff --git a/iOS/Features/Home/Sources/Home/Presentation/HomeViewController.swift b/iOS/Features/Home/Sources/Home/Presentation/HomeViewController.swift
@@ -147,16 +147,30 @@ public final class HomeViewController: HomeBottomSheetViewController {
 
         self.viewModel.state.isStartButtonLoading
             .receive(on: DispatchQueue.main)
-            .sink { isStartButtonLoading in
-                self.startButton.configuration?.showsActivityIndicator = isStartButtonLoading
+            .sink { [weak self] isStartButtonLoading in
+                self?.startButton.configuration?.showsActivityIndicator = isStartButtonLoading
+            }
+            .store(in: &self.cancellables)
+
+        self.viewModel.state.isRefreshButtonHidden
+            .removeDuplicates(by: { $0 == $1 })
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] isHidden in
+                self?.refreshButton.isHidden = isHidden
+            }
+            .store(in: &self.cancellables)
+
+        self.viewModel.state.overlaysShouldBeCleared
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] _ in
+                self?.contentViewController.clearOverlays()
             }
             .store(in: &self.cancellables)
     }
 
     // MARK: - Functions
 
     private func updateButtonMode(isRecording: Bool) {
-        self.refreshButton.isHidden = isRecording
         UIView.transition(with: startButton, duration: 0.5,
                           options: .transitionCrossDissolve,
                           animations: {
@@ -197,18 +211,15 @@ extension HomeViewController: RecordJourneyButtonViewDelegate {
             guard let coordinates = self?.contentViewController.visibleCoordinates else { return }
 
             self?.viewModel.trigger(.refreshButtonDidTap(visibleCoordinates: coordinates))
-            self?.refreshButton.isHidden = true
         }
         self.refreshButton.addAction(refreshButtonAction, for: .touchUpInside)
     }
 
     public func backButtonDidTap(_ button: MSRectButton) {
         guard self.viewModel.state.isRecording.value == true else { return }
 
-        self.contentViewController.clearOverlays()
         self.viewModel.trigger(.backButtonDidTap)
         self.contentViewController.journeyDidCancelled()
-        // TODO: 여정 취소
     }
 
     public func spotButtonDidTap(_ button: MSRectButton) {
@@ -233,6 +244,16 @@ extension HomeViewController: RecordJourneyButtonViewDelegate {
 
 }
 
+// MARK: - MapViewController
+
+extension HomeViewController: MapViewControllerDelegate {
+
+    public func mapViewControllerDidChangeVisibleRegion(_ mapViewController: MapViewController) {
+        self.viewModel.trigger(.mapViewDidChange)
+    }
+
+}
+
 // MARK: - UI Configuration
 
 private extension HomeViewController {

diff --git a/iOS/Features/Home/Sources/Home/Presentation/HomeViewModel.swift b/iOS/Features/Home/Sources/Home/Presentation/HomeViewModel.swift
@@ -25,15 +25,18 @@ public final class HomeViewModel {
         case startButtonDidTap(Coordinate)
         case refreshButtonDidTap(visibleCoordinates: (minCoordinate: Coordinate, maxCoordinate: Coordinate))
         case backButtonDidTap
+        case mapViewDidChange
     }
 
     public struct State {
         // Passthrough
         public var startedJourney = PassthroughSubject<RecordingJourney, Never>()
         public var visibleJourneys = PassthroughSubject<[Journey], Never>()
+        public var overlaysShouldBeCleared = PassthroughSubject<Bool, Never>()
 
         // CurrentValue
         public var isRecording = CurrentValueSubject<Bool, Never>(false)
+        public var isRefreshButtonHidden = CurrentValueSubject<Bool, Never>(false)
         public var isStartButtonLoading = CurrentValueSubject<Bool, Never>(false)
     }
 
@@ -80,9 +83,13 @@ public final class HomeViewModel {
             #endif
             self.startJourney(at: coordinate)
         case .refreshButtonDidTap(visibleCoordinates: (let minCoordinate, let maxCoordinate)):
+            self.state.isRefreshButtonHidden.send(true)
             self.fetchJourneys(minCoordinate: minCoordinate, maxCoordinate: maxCoordinate)
         case .backButtonDidTap:
             self.state.isRecording.send(false)
+            self.state.overlaysShouldBeCleared.send(true)
+        case .mapViewDidChange:
+            self.state.isRefreshButtonHidden.send(false)
         }
     }
 
@@ -122,6 +129,7 @@ private extension HomeViewModel {
             switch result {
             case .success(let recordingJourney):
                 self.state.startedJourney.send(recordingJourney)
+                self.journeyRepository
                 self.state.isRecording.send(true)
             case .failure(let error):
                 MSLogger.make(category: .home).error("\(error)")

diff --git a/...atures/Home/Sources/NavigateMap/Presentation/Common/MapViewController+EventListener.swift b/...atures/Home/Sources/NavigateMap/Presentation/Common/MapViewController+EventListener.swift
@@ -27,13 +27,21 @@ extension MapViewController {
 extension MapViewController {
 
     public func journeyDidStarted(_ startedJourney: RecordingJourney) {
+        let userRepository = UserRepositoryImplementation()
         let journeyRepository = JourneyRepositoryImplementation()
-        let viewModel = RecordJourneyViewModel(startedJourney: startedJourney, journeyRepository: journeyRepository)
+        let viewModel = RecordJourneyViewModel(startedJourney: startedJourney,
+                                               userRepository: userRepository,
+                                               journeyRepository: journeyRepository)
         self.swapViewModel(to: viewModel)
     }
 
     public func journeyDidCancelled() {
+        guard let viewModel = self.viewModel as? RecordJourneyViewModel else { return }
+        viewModel.trigger(.recordingDidCancelled)
 
+        let journeyRepository = JourneyRepositoryImplementation()
+        let navigateMapViewModel = NavigateMapViewModel(repository: journeyRepository)
+        self.swapViewModel(to: navigateMapViewModel)
     }
 
 }
diff --git a/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift b/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift
@@ -62,6 +62,7 @@ public final class MapViewController: UIViewController {
 
     // MARK: - Properties
 
+    public weak var delegate: MapViewControllerDelegate?
     var viewModel: (any MapViewModel)?
 
     private let locationManager = CLLocationManager()
@@ -115,7 +116,6 @@ public final class MapViewController: UIViewController {
     public override func viewDidLoad() {
         super.viewDidLoad()
 
-        guard let viewModel = self.viewModel else { return }
         self.configureLayout()
         self.configureCoreLocation()
         self.bind(viewModel)
@@ -130,7 +130,7 @@ public final class MapViewController: UIViewController {
         self.bind(viewModel)
     }
 
-    private func bind(_ viewModel: any MapViewModel) {
+    private func bind(_ viewModel: (any MapViewModel)?) {
         self.viewModel = viewModel
 
         if let navigateMapViewModel = viewModel as? NavigateMapViewModel {
@@ -171,10 +171,9 @@ public final class MapViewController: UIViewController {
 
     // MARK: - Functions: Annotation
 
-    // 식별자를 갖고 Annotation view 생성
+    /// 식별자를 갖고 Annotation view 생성
     func addAnnotationView(using annotation: CustomAnnotation,
                            on mapView: MKMapView) -> MKAnnotationView {
-        // dequeueReusableAnnotationView: 식별자를 확인하여 사용가능한 뷰가 있으면 해당 뷰를 반환
         return mapView.dequeueReusableAnnotationView(withIdentifier: CustomAnnotationView.identifier,
                                                      for: annotation)
     }
@@ -294,7 +293,6 @@ extension MapViewController: CLLocationManagerDelegate {
         recordJourneyViewModel.trigger(.locationDidUpdated(coordinate2D))
     }
 
-    /// iOS 버젼에 따른 분기 처리 후 'iOS 위치 서비스 사용 중 여부' 확인
     private func handleAuthorizationChange(_ manager: CLLocationManager) {
         switch manager.authorizationStatus {
         case .notDetermined:
@@ -373,26 +371,27 @@ extension MapViewController: MKMapViewDelegate {
         return annotationView
     }
 
+    public func mapViewDidChangeVisibleRegion(_ mapView: MKMapView) {
+        self.delegate?.mapViewControllerDidChangeVisibleRegion(self)
+    }
+
 }
 
 // MARK: - ButtonView
 
 extension MapViewController: ButtonStackViewDelegate {
 
-    /// 현재 지도에서 보이는 범위 내의 모든 Spot들을 보여줌.
     public func mapButtonDidTap() {
         MSLogger.make(category: .navigateMap).debug("현재 지도에서 보이는 범위 내의 모든 Spot들을 보여줍니다.")
     }
 
-    /// 현재 내 위치를 중앙에 위치.
     public func userLocationButtonDidTap() {
         switch self.mapView.userTrackingMode {
         case .none, .followWithHeading:
             self.mapView.setUserTrackingMode(.follow, animated: true)
         case .follow:
             self.mapView.setUserTrackingMode(.followWithHeading, animated: true)
-        @unknown default:
-            break
+        @unknown default: break
         }
     }
 

diff --git a/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewControllerDelegate.swift b/iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewControllerDelegate.swift
@@ -0,0 +1,14 @@
+//
+//  MapViewControllerDelegate.swift
+//  NavigateMap
+//
+//  Created by 이창준 on 2023.12.10.
+//
+
+import Foundation
+
+public protocol MapViewControllerDelegate: AnyObject {
+
+    func mapViewControllerDidChangeVisibleRegion(_ mapViewController: MapViewController)
+
+}
diff --git a/...Features/Home/Sources/NavigateMap/Presentation/RecordJourney/RecordJourneyViewModel.swift b/...Features/Home/Sources/NavigateMap/Presentation/RecordJourney/RecordJourneyViewModel.swift
@@ -19,6 +19,7 @@ public final class RecordJourneyViewModel: MapViewModel {
         case viewNeedsLoaded
         case locationDidUpdated(CLLocationCoordinate2D)
         case locationsShouldRecorded([CLLocationCoordinate2D])
+        case recordingDidCancelled
     }
 
     public struct State {
@@ -30,14 +31,17 @@ public final class RecordJourneyViewModel: MapViewModel {
 
     // MARK: - Properties
 
-    private let journeyRepository: JourneyRepository
+    private let userRepository: UserRepository
+    private var journeyRepository: JourneyRepository
 
     public var state: State
 
     // MARK: - Initializer
 
     public init(startedJourney: RecordingJourney,
+                userRepository: UserRepository,
                 journeyRepository: JourneyRepository) {
+        self.userRepository = userRepository
         self.journeyRepository = journeyRepository
         self.state = State(recordingJourney: CurrentValueSubject<RecordingJourney, Never>(startedJourney))
     }
@@ -67,6 +71,20 @@ public final class RecordJourneyViewModel: MapViewModel {
                     MSLogger.make(category: .home).error("\(error)")
                 }
             }
+        case .recordingDidCancelled:
+            Task {
+                let userID = try self.userRepository.fetchUUID()
+                let recordingJourney = self.state.recordingJourney.value
+                let result = await self.journeyRepository.deleteJourney(recordingJourney, userID: userID)
+                switch result {
+                case .success(let cancelledJourney):
+                    #if DEBUG
+                    MSLogger.make(category: .home).debug("여정이 취소 되었습니다: \(cancelledJourney)")
+                    #endif
+                case .failure(let error):
+                    MSLogger.make(category: .home).error("\(error)")
+                }
+            }
         }
     }
 

diff --git a/iOS/Features/Spot/Sources/Spot/Presentation/SpotSaveViewController.swift b/iOS/Features/Spot/Sources/Spot/Presentation/SpotSaveViewController.swift
@@ -249,7 +249,7 @@ public final class SpotSaveViewController: UIViewController {
             MSLogger.make(category: .spot).debug("현재 이미지를 Data로 변환할 수 없습니다.")
             return
         }
-        self.viewModel.trigger(.startUploadSpot, using: jpegData)
+        self.viewModel.trigger(.startUploadSpot(jpegData))
         self.navigationDelegate?.popToHome()
     }
 

diff --git a/iOS/Features/Spot/Sources/Spot/Presentation/SpotSaveViewModel.swift b/iOS/Features/Spot/Sources/Spot/Presentation/SpotSaveViewModel.swift
@@ -15,7 +15,7 @@ import MSLogger
 public final class SpotSaveViewModel {
 
     public enum Action {
-        case startUploadSpot
+        case startUploadSpot(Data)
     }
 
     // MARK: - Properties
@@ -43,9 +43,9 @@ public final class SpotSaveViewModel {
 
 internal extension SpotSaveViewModel {
 
-    func trigger(_ action: Action, using data: Data) {
+    func trigger(_ action: Action) {
         switch action {
-        case .startUploadSpot:
+        case .startUploadSpot(let data):
             Task {
                 guard let recordingJourneyID = self.journeyRepository.fetchRecordingJourneyID() else {
                     MSLogger.make(category: .spot).error("recoding 중인 journeyID를 찾지 못하였습니다.")

diff --git a/iOS/MSData/Sources/MSData/DTO/Fragment/JourneyMetadataDTO.swift b/iOS/MSData/Sources/MSData/DTO/Fragment/JourneyMetadataDTO.swift
@@ -7,9 +7,31 @@
 
 import Foundation
 
-public struct JourneyMetadataDTO: Codable {
+public struct JourneyMetadataDTO {
 
     public let startTimestamp: Date
     public let endTimestamp: Date
 
 }
+
+// MARK: - Codable
+
+extension JourneyMetadataDTO: Codable {
+
+    enum CodingKeys: String, CodingKey {
+        case startTimestamp
+        case endTimestamp
+    }
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.startTimestamp = try container.decode(Date.self, forKey: .startTimestamp)
+        if let endTimestamp = try? container.decode(String.self, forKey: .endTimestamp),
+           endTimestamp.isEmpty {
+            self.endTimestamp = .now
+            return
+        }
+        self.endTimestamp = try container.decode(Date.self, forKey: .endTimestamp)
+    }
+
+}
diff --git a/iOS/MSData/Sources/MSData/DTO/Request/Journey/DeleteJourneyRequestDTO.swift b/iOS/MSData/Sources/MSData/DTO/Request/Journey/DeleteJourneyRequestDTO.swift
@@ -0,0 +1,24 @@
+//
+//  DeleteJourneyRequestDTO.swift
+//  MSData
+//
+//  Created by 이창준 on 2023.12.10.
+//
+
+import Foundation
+
+public struct DeleteJourneyRequestDTO: Encodable {
+
+    // MARK: - Properties
+
+    public let userID: UUID
+    public let journeyID: String
+
+    // MARK: - Encodable
+
+    enum CodingKeys: String, CodingKey {
+        case userID = "userId"
+        case journeyID = "journeyId"
+    }
+
+}
diff --git a/iOS/MSData/Sources/MSData/DTO/Request/Journey/EndJourneyRequestDTO.swift b/iOS/MSData/Sources/MSData/DTO/Request/Journey/EndJourneyRequestDTO.swift
@@ -47,14 +47,4 @@ extension EndJourneyRequestDTO: Encodable {
         case song
     }
 
-//    public func encode(to encoder: Encoder) throws {
-//        var container = encoder.container(keyedBy: CodingKeys.self)
-//        try container.encode(self.journeyID, forKey: .journeyID)
-//        try container.encode(self.coordinates, forKey: .coordinates)
-//        try container.encode(self.endTimestamp., forKey: .title)
-//        try container.encode(self.spots, forKey: .spots)
-//        try container.encode(self.coordinates, forKey: .coordinates)
-//        try container.encode(self.coordinates, forKey: .coordinates)
-//    }
-
 }