Merge branch 'iOS/release' into iOS/task/SaveJourney-Using-Local

iOS/Features/RewindJourney/Sources/RewindJourney/Presentation/RewindJourneyViewController.swift

@@ -48,6 +48,7 @@ public final class RewindJourneyViewController: UIViewController {
 
     // MARK: - Properties
 
+    public weak var navigationDelegate: RewindJourneyNavigationDelegate?
     private let viewModel: RewindJourneyViewModel
     public var images: [UIImage] = []
     private let cache: MSCacheStorage
@@ -63,7 +64,7 @@ public final class RewindJourneyViewController: UIViewController {
     private var timerSubscriber: Set<AnyCancellable> = []
 
     // MARK: - Properties: Gesture
-    public weak var navigationDelegate: RewindJourneyNavigationDelegate?
+
     var initialTouchPoint = CGPoint(x: 0, y: 0)
 
     // MARK: - UI Components

iOS/Features/Spot/Sources/Spot/Presentation/SpotSaveViewModel.swift

@@ -48,12 +48,9 @@ internal extension SpotSaveViewModel {
         case .startUploadSpot(let data):
             Task {
                 guard let recordingJourneyID = self.journeyRepository.fetchRecordingJourneyID() else {
-                    #if DEBUG
-                    MSLogger.make(category: .network).error("현재 여정 정보를 가져오는데 실패했습니다.")
-                    #endif
+                    MSLogger.make(category: .spot).error("recoding 중인 journeyID를 찾지 못하였습니다.")
                     return
                 }
-
                 let spot = CreateSpotRequestDTO(journeyId: recordingJourneyID,
                                                 coordinate: CoordinateDTO(self.coordinate),
                                                 timestamp: .now,

iOS/Features/Spot/Sources/Spot/Presentation/SpotViewController+Gesture.swift

@@ -0,0 +1,63 @@
+//
+//  SpotViewController+Gesture.swift
+//  Spot
+//
+//  Created by 전민건 on 12/10/23.
+//
+
+import Foundation
+import UIKit
+
+// MARK: - Constants
+
+private enum Metric {
+
+    static let movedXPositionToBackScene: CGFloat = 50.0
+    static let animationDuration: Double = 0.3
+
+}
+
+// MARK: - Gesture
+
+internal extension SpotViewController {
+
+    func configureLeftToRightSwipeGesture() {
+        let panGesture = UIPanGestureRecognizer(target: self, action: #selector(panGestureDismiss(_:)))
+            self.view.addGestureRecognizer(panGesture)
+    }
+
+    @objc
+    private func panGestureDismiss(_ sender: UIPanGestureRecognizer) {
+        let touchPoint = sender.location(in: self.view.window)
+        let width = self.view.frame.width
+        let height = self.view.frame.height
+        switch sender.state {
+        case .began:
+            self.initialTouchPoint = touchPoint
+        case .changed:
+            if touchPoint.x - self.initialTouchPoint.x > .zero {
+                self.view.frame = CGRect(x: touchPoint.x - self.initialTouchPoint.x,
+                                         y: .zero,
+                                         width: width,
+                                         height: height)
+            }
+        case .ended, .cancelled:
+            if touchPoint.x - self.initialTouchPoint.x > Metric.movedXPositionToBackScene {
+                self.navigationDelegate?.popToHome()
+            } else {
+                self.view.frame = CGRect(x: .zero,
+                                         y: .zero,
+                                         width: width,
+                                         height: height)
+            }
+        default:
+            UIView.animate(withDuration: Metric.animationDuration) {
+                self.view.frame = CGRect(x: .zero,
+                                         y: .zero,
+                                         width: width,
+                                         height: height)
+            }
+        }
+    }
+
+}

iOS/Features/Spot/Sources/Spot/Presentation/SpotViewController.swift

@@ -68,6 +68,10 @@ public final class SpotViewController: UIViewController, UINavigationControllerD
 
     var initialTouchPoint = CGPoint(x: 0, y: 0)
 
+    // MARK: - Properties: Haptic
+
+    private let haptic = UIImpactFeedbackGenerator(style: .medium)
+
     // MARK: - UI Components
 
     private let backButton = UIButton()
@@ -81,6 +85,7 @@ public final class SpotViewController: UIViewController, UINavigationControllerD
     public override func viewDidLoad() {
         super.viewDidLoad()
         self.configure()
+        self.haptic.prepare()
     }
 
     public override func viewDidAppear(_ animated: Bool) {
@@ -248,7 +253,7 @@ private extension SpotViewController {
         self.configureBackButtonAction()
         self.configureGalleryButtonAction()
 
-        self.configureUpToDownSwipeGesture()
+        self.configureLeftToRightSwipeGesture()
     }
 
     func configureCameraSetting() {
@@ -283,39 +288,6 @@ private extension SpotViewController {
         self.backButton.addAction(backButtonAction, for: .touchUpInside)
     }
 
-    func configureUpToDownSwipeGesture() {
-        let panGesture = UIPanGestureRecognizer(target: self, action: #selector(self.panGestureDismiss(_:)))
-        self.view.addGestureRecognizer(panGesture)
-    }
-
-    @objc
-    func panGestureDismiss(_ sender: UIPanGestureRecognizer) {
-        let touchPoint = sender.location(in: self.view.window)
-
-        switch sender.state {
-        case .began:
-            self.initialTouchPoint = touchPoint
-        case .changed:
-            if touchPoint.y - self.initialTouchPoint.y > .zero {
-                self.view.frame = CGRect(x: .zero,
-                                         y: touchPoint.y - self.initialTouchPoint.y,
-                                         width: self.view.frame.width,
-                                         height: self.view.frame.height)
-            }
-        case .ended, .cancelled:
-            if touchPoint.y - self.initialTouchPoint.y > 200 {
-                self.navigationDelegate?.popToHome()
-            }
-        default:
-            UIView.animate(withDuration: 0.3) {
-                self.view.frame = CGRect(x: .zero,
-                                         y: .zero,
-                                         width: self.view.frame.width,
-                                         height: self.view.frame.height)
-            }
-        }
-    }
-
 }
 
 // MARK: - Button Actions
@@ -324,6 +296,7 @@ private extension SpotViewController {
 
     func shotButtonTapped() {
         self.viewModel.shot()
+        self.haptic.impactOccurred()
     }
 
     func swapButtonTapped() {

iOS/MSCoreKit/Sources/MSPersistentStorage/FileManager/FileManagerStorage.swift

@@ -23,15 +23,16 @@ public final class FileManagerStorage: NSObject, MSPersistentStorage {
         dateFormatter.formatOptions = [.withFractionalSeconds, .withTimeZone, .withInternetDateTime]
         encoder.dateEncodingStrategy = .custom({ date, encoder in
             var container = encoder.singleValueContainer()
-            try container.encode(date)
+            let dateString = dateFormatter.string(from: date)
+            try container.encode(dateString)
         })
         return encoder
     }()
 
     private let decoder: JSONDecoder = {
         let decoder = JSONDecoder()
         let dateFormatter = ISO8601DateFormatter()
-        dateFormatter.formatOptions = [.withFractionalSeconds, .withTimeZone, .withInternetDateTime]
+        dateFormatter.formatOptions.insert(.withFractionalSeconds)
         decoder.dateDecodingStrategy = .custom({ decoder in
             let container = try decoder.singleValueContainer()
             let dateString = try container.decode(String.self)
@@ -41,6 +42,7 @@ public final class FileManagerStorage: NSObject, MSPersistentStorage {
             throw DecodingError.dataCorruptedError(in: container,
                                                    debugDescription: "Date 디코딩 실패: \(dateString)")
         })
+        decoder.keyDecodingStrategy = .convertFromSnakeCase
         return decoder
     }()
 
@@ -74,9 +76,20 @@ public final class FileManagerStorage: NSObject, MSPersistentStorage {
         if let path = self.storageURL()?.path,
            let contents = try? self.fileManager.contentsOfDirectory(atPath: path) {
             let allDecodedData: [T] = contents.compactMap { content in
-                guard let dataPath = URL(string: (path as NSString).appendingPathComponent(content)),
-                      let data = try? Data(contentsOf: dataPath),
-                      let decodedData = try? self.decoder.decode(T.self, from: data) else { return nil }
+                let key = String(content.dropLast(".json".count))
+                guard let dataPath =
+                        fileURL(forKey: key) else {
+                    MSLogger.make(category: .fileManager).error("경로의 Data를 가져오지 못하였습니다.")
+                    return nil
+                }
+                MSLogger.make(category: .fileManager).error("경로의 Data를 성공적으로 가져왔습니다.")
+
+                print(dataPath.description)
+                guard let data = try? Data(contentsOf: dataPath),
+                      let decodedData = try? self.decoder.decode(T.self, from: data) else {
+                    MSLogger.make(category: .fileManager).error("decode에 실패하였습니다.")
+                    return nil
+                }
                 return decodedData
             }
             return allDecodedData

iOS/MSCoreKit/Tests/MSPersistentStorageTests/FileManagerStorageTests.swift

@@ -101,21 +101,54 @@ final class MSPersistentStorageTests: XCTestCase {
     }
 
     func test_FileManagerStorage에서_모든데이터저장불러오기_성공() {
-        let sut = MockCodableData(title: "boostcamp", content: "wm8")
-        let key = "S045"
-        self.fileStorage.set(value: sut, forKey: key)
-        self.fileStorage.set(value: sut, forKey: key)
-        self.fileStorage.set(value: sut, forKey: key)
+        let sut1 = MockCodableData(title: "boostcamp", content: "wm8")
+        let sut2 = MockCodableData(title: "boostcamp", content: "wm8")
+        let key1 = "S045"
+        let key2 = "S034"
+
+        self.fileStorage.set(value: sut1, forKey: key1)
+        self.fileStorage.set(value: sut2, forKey: key2)
+
+        guard let allStoredData = self.fileStorage.getAllOf(MockCodableData.self) else {
+            XCTFail("데이터 읽기에 실패했습니다.")
+            return
+        }
+
+        XCTAssertEqual(allStoredData.count, 2, "데이터 저장에 실패하였습니다.")
+        XCTAssertTrue(allStoredData.allSatisfy { $0 == sut1 || $0 == sut2 })
+    }
+
+    func test_FileManagerStorage에서_모든데이터저장불러올때_폴더하위항목까지_읽을수있는지_실패() {
+        let sut1 = MockCodableData(title: "boostcamp", content: "wm8")
+        let sut2 = MockCodableData(title: "boostcamp", content: "wm8")
+        let key1 = "S045"
+        let key2 = "/handsome/jeonmingun/S034"
+
+        self.fileStorage.set(value: sut1, forKey: key1)
+        self.fileStorage.set(value: sut2, forKey: key2)
 
         guard let allStoredData = self.fileStorage.getAllOf(MockCodableData.self) else {
             XCTFail("데이터 읽기에 실패했습니다.")
             return
         }
+
+        XCTAssertEqual(allStoredData.count, 2, "데이터 저장에 실패하였습니다.")
+        XCTAssertFalse(allStoredData.allSatisfy { $0 == sut1 || $0 == sut2 })
+    }
+
+    func test_Date형식_저장할_수_있는지_성공() {
+        let sut = Date.now
+        let key = "S034"
 
-        allStoredData.forEach { storedData in
-            XCTAssertEqual(sut, storedData,
-                           "목표 데이터와 불러온 값이 다릅니다.")
+        self.fileStorage.set(value: sut, forKey: key)
+
+        guard let storedData = self.fileStorage.get(Date.self, forKey: key) else {
+            XCTFail("데이터 읽기에 실패했습니다.")
+            return
         }
+
+        XCTAssertEqual(sut.description, storedData.description,
+                       "목표 데이터와 불러온 값이 다릅니다.")
     }
 
 }

iOS/MSData/.swiftpm/xcode/xcshareddata/xcschemes/MSData.xcscheme

@@ -39,6 +39,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "RepositoryTests"
+               BuildableName = "RepositoryTests"
+               BlueprintName = "RepositoryTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction