[GWL-229]운동 매칭 이후 운동 session에 관한 데이터 넘겨주는 기능 구현

iOS/Projects/App/WeTri/Sources/Application/SceneDelegate.swift

@@ -20,14 +20,11 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     guard let windowScene = scene as? UIWindowScene else { return }
     window = UIWindow(windowScene: windowScene)
     let navigationController = UINavigationController()
-    let viewController = SignUpContainerViewController(
-      signUpGenderBirthViewController: SignUpGenderBirthViewController(viewModel: SignUpGenderBirthViewModel(dateFormatUseCase: DateFormatUseCase())),
-      signUpProfileViewController: SignUpProfileViewController()
-    )
-    window?.rootViewController = viewController
-//    let coordinator = AppCoordinator(navigationController: navigationController)
-//    coordinating = coordinator
-//    coordinator.start()
+    window = UIWindow(windowScene: windowScene)
+    let coordinator = AppCoordinator(navigationController: navigationController)
+    coordinating = coordinator
+    coordinator.start()
+    window?.rootViewController = navigationController
     window?.makeKeyAndVisible()
   }
 }

iOS/Projects/App/WeTri/Sources/CommonScene/Coordinator/AppCoordinator.swift

@@ -25,7 +25,7 @@ final class AppCoordinator: AppCoordinating {
   }
 
   func start() {
-    showSplashFlow()
+    showTabBarFlow()
   }
 
   private func showSplashFlow() {

iOS/Projects/Features/Record/Resources/Persistency/MatchesCancel.json

@@ -1,5 +1,5 @@
 {
-  "code": 200,
+  "code": null,
   "errorMessage": null,
   "data": null
 }

iOS/Projects/Features/Record/Resources/Persistency/MatchesRandom.json

@@ -1,5 +1,24 @@
 {
-  "code": 201,
+  "code": null,
   "errorMessage": null,
-  "data": null
+  "data": {
+    "matched": true,
+    "liveWorkoutStartTime": "2023-12-05 16:33:00",
+    "roomId": "uuid",
+    "publicId": "someStringss",
+    "peers": [
+      {
+        "nickname": "나는 1번 타자",
+        "publicId": "someString",
+        "profileImage": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/74/Cat-eating-prey.jpg/220px-Cat-eating-prey.jpg",
+        "etc": "그 외 나머지 모든 컬럼"
+      },
+      {
+        "nickname": "나는 2번타자",
+        "publicId": "someStringw",
+        "profileImage": "https://www.telegraph.co.uk/content/dam/pets/2017/01/06/1-JS117202740-yana-two-face-cat-news_trans_NvBQzQNjv4BqJNqHJA5DVIMqgv_1zKR2kxRY9bnFVTp4QZlQjJfe6H0.jpg?imwidth=450",
+        "etc": "그 외 나머지 모든 컬럼"
+      }
+    ]
+  }
 }

iOS/Projects/Features/Record/Resources/Persistency/MatchesStart.json

@@ -1,5 +1,5 @@
 {
-  "code": 200,
+  "code": null,
   "errorMessage": null,
   "data": null
 }

iOS/Projects/Features/Record/Sources/Data/DTO/IsMatchedRandomPeersRequest.swift

@@ -0,0 +1,24 @@
+//
+//  IsMatchedRandomPeersRequest.swift
+//  RecordFeature
+//
+//  Created by MaraMincho on 12/5/23.
+//  Copyright © 2023 kr.codesquad.boostcamp8. All rights reserved.
+//
+
+import Foundation
+
+/// randomMatching API의 requst에 활용합니다.
+///
+/// 어떤 운동과, 얼마나 randomMatching을 기다렸는지 알려주는 객체 입니다.
+struct IsMatchedRandomPeersRequest: Encodable {
+  /// 어떤 운동을 랜덤 매칭 하는지 알려줍니다.
+  ///
+  /// 1번 : 달리기
+  /// 2번 : 사이클
+  /// 3번 : 수영
+  let workoutID: Int
+
+  /// 몇초를 대기방에서 기다렸는지 알려줍니다.
+  let waitingTime: Int
+}

iOS/Projects/Features/Record/Sources/Data/DTO/IsMatchedRandomPeersResponse.swift

@@ -0,0 +1,43 @@
+//
+//  IsMatchedRandomPeersResponse.swift
+//  RecordFeature
+//
+//  Created by MaraMincho on 12/5/23.
+//  Copyright © 2023 kr.codesquad.boostcamp8. All rights reserved.
+//
+
+import Foundation
+
+// MARK: - IsMatchedRandomPeersResponse
+
+struct IsMatchedRandomPeersResponse: Decodable {
+  let matched: Bool
+  let liveWorkoutStartTime: String?
+  let roomID: String?
+  let publicID: String?
+  let peers: [IsMatchedRandomPeersForPeerResponse]?
+
+  enum CodingKeys: String, CodingKey {
+    case matched
+    case liveWorkoutStartTime
+    case roomID = "roomId"
+    case publicID = "publicId"
+    case peers
+  }
+}
+
+// MARK: - IsMatchedRandomPeersForPeerResponse
+
+struct IsMatchedRandomPeersForPeerResponse: Decodable {
+  let nickname: String
+  let publicID: String
+  let profileImage: String
+  let etc: String?
+
+  enum CodingKeys: String, CodingKey {
+    case nickname
+    case publicID = "publicId"
+    case profileImage
+    case etc
+  }
+}

iOS/Projects/Features/Record/Sources/Data/DTO/MatchStartRequest.swift

@@ -0,0 +1,15 @@
+//
+//  MatchStartRequest.swift
+//  RecordFeature
+//
+//  Created by MaraMincho on 12/5/23.
+//  Copyright © 2023 kr.codesquad.boostcamp8. All rights reserved.
+//
+
+import Foundation
+
+/// 매칭이 시작 될 떄 사용하는 Request Body입니다.
+struct MatchStartRequest: Encodable {
+  /// workoutId는 운동 번호를 의미합니다.
+  let workoutID: Int
+}

iOS/Projects/Features/Record/Sources/Data/Repositories/WorkoutEnvironmentSetupNetworkRepository.swift

@@ -78,16 +78,6 @@ private extension WorkoutEnvironmentSetupNetworkRepository {
     case exerciseTypes
     case peer
 
-    // TODO: API에 맞게 수정 예정
-    var baseURL: String {
-      switch self {
-      case .exerciseTypes:
-        return "https://www.naver.com"
-      case .peer:
-        return "https://www.naver.com"
-      }
-    }
-
     var path: String {
       switch self {
       case .exerciseTypes:
@@ -100,7 +90,7 @@ private extension WorkoutEnvironmentSetupNetworkRepository {
     var method: TNMethod { return .get }
     var query: Encodable? { nil }
     var body: Encodable? { nil }
-    var headers: Trinet.TNHeaders { .init(headers: []) }
+    var headers: TNHeaders { .default }
   }
 
   enum PersistencyProperty {

iOS/Projects/Features/Record/Sources/Data/Repositories/WorkoutPeerRandomMatchingRepository.swift

@@ -7,6 +7,7 @@
 //
 
 import Combine
+import CommonNetworkingKeyManager
 import Foundation
 import Trinet
 
@@ -27,15 +28,12 @@ extension WorkoutPeerRandomMatchingRepository: WorkoutPeerRandomMatchingReposito
     return Future<Result<Void, Error>, Never> { promise in
       Task {
         do {
-          let data = try await provider.request(.matchStart(workoutTypeCode: workoutTypeCode))
-          let response = try decoder.decode(GWResponse<NullDTO>.self, from: data)
-          // 200번대 REsponse인지 확인, 보통 서버에서 코드를 보내주지만, 안보내줄 경우 자동적으로 동작 안하게 작성)
-          if response.code == 200 {
-            promise(.success(.success(())))
-          } else {
-            // TODO: ERROR Handling
-            promise(.success(.failure(RepositoryError.serverError)))
-          }
+          let data = try await provider.request(
+            .matchStart(matchStartRequest: .init(workoutID: workoutTypeCode)),
+            interceptor: TNKeychainInterceptor.shared
+          )
+          _ = try decoder.decode(GWResponse<NullDTO>.self, from: data)
+          promise(.success(.success(())))
         } catch {
           promise(.success(.failure(error)))
         }
@@ -53,21 +51,20 @@ extension WorkoutPeerRandomMatchingRepository: WorkoutPeerRandomMatchingReposito
     }
   }
 
-  func isMatchedRandomPeer(workoutTypeCode: Int) -> AnyPublisher<Result<PeerMatchResponseDTO?, Error>, Never> {
-    return Future<Result<PeerMatchResponseDTO?, Error>, Never> { promise in
+  func isMatchedRandomPeer(
+    isMatchedRandomPeersRequest: IsMatchedRandomPeersRequest
+  ) -> AnyPublisher<Result<IsMatchedRandomPeersResponse?, Error>, Never> {
+    return Future<Result<IsMatchedRandomPeersResponse?, Error>, Never> { promise in
       Task {
         do {
-          let data = try await provider.request(.isMatchedRandomPeer(workoutTypeCode: workoutTypeCode))
-          let response = try decoder.decode(GWResponse<PeerMatchResponseDTO>.self, from: data)
-          if response.code == 201 {
-            promise(.success(.success(nil)))
-          } else if response.code == 200 {
-            promise(.success(.success(response.data)))
-          } else {
-            promise(.success(.failure(RepositoryError.serverError)))
+          let data = try await provider.request(.isMatchedRandomPeer(isMatchedRandomPeersRequest: isMatchedRandomPeersRequest))
+          guard
+            let responseData = try decoder.decode(GWResponse<IsMatchedRandomPeersResponse>.self, from: data).data
+          else {
+            throw RepositoryError.serverError
           }
+          promise(.success(.success(responseData)))
         } catch {
-          // TODO: ERROR Handling
           promise(.success(.failure(error)))
         }
       }
@@ -86,20 +83,20 @@ enum RepositoryError: LocalizedError {
 
 extension WorkoutPeerRandomMatchingRepository {
   enum WorkoutPeerRandomMatchingRepositoryEndPoint: TNEndPoint {
-    /// Proeprty
-    case matchStart(workoutTypeCode: Int)
+    /// Property
+    case matchStart(matchStartRequest: MatchStartRequest)
     case matchCancel
-    case isMatchedRandomPeer(workoutTypeCode: Int)
+    case isMatchedRandomPeer(isMatchedRandomPeersRequest: IsMatchedRandomPeersRequest)
 
     /// TNEndPoint
     var path: String {
       switch self {
       case .matchStart:
-        return "matches/start"
+        return "api/v1/matches/start"
       case .matchCancel:
-        return "matches/cancle"
+        return "api/v1/matches/cancel"
       case .isMatchedRandomPeer:
-        return "matches/random"
+        return "api/v1/matches/random"
       }
     }
 
@@ -109,7 +106,7 @@ extension WorkoutPeerRandomMatchingRepository {
            .matchStart:
         return .post
       case .matchCancel:
-        return .get
+        return .delete
       }
     }
 
@@ -119,12 +116,9 @@ extension WorkoutPeerRandomMatchingRepository {
 
     var body: Encodable? {
       switch self {
-      case let .matchStart(workoutTypeCode):
-        return workoutTypeCode
-      case let .isMatchedRandomPeer(workoutTypeCode):
-        return workoutTypeCode
-      case .matchCancel:
-        return nil
+      case let .matchStart(matchStartRequest): return matchStartRequest
+      case let .isMatchedRandomPeer(isMatchedRandomPeersRequest): return isMatchedRandomPeersRequest
+      case .matchCancel: return nil
       }
     }
 

iOS/Projects/Features/Record/Sources/Domain/Entities/Peer.swift

@@ -0,0 +1,14 @@
+//
+//  Peer.swift
+//  RecordFeature
+//
+//  Created by MaraMincho on 12/5/23.
+//  Copyright © 2023 kr.codesquad.boostcamp8. All rights reserved.
+//
+
+import Foundation
+
+struct Peer {
+  let nickname: String
+  let imageURL: String
+}

iOS/Projects/Features/Record/Sources/Domain/Entities/SessionPeerType.swift

@@ -17,5 +17,5 @@ struct SessionPeerType: Identifiable {
   let id: String
 
   /// 사용자의 프로필 이미지 주소
-  let profileImageURL: URL
+  let profileImageURL: URL?
 }

iOS/Projects/Features/Record/Sources/Domain/Entities/WorkoutSessionElement.swift

@@ -0,0 +1,41 @@
+//
+//  WorkoutSessionElement.swift
+//  RecordFeature
+//
+//  Created by MaraMincho on 12/5/23.
+//  Copyright © 2023 kr.codesquad.boostcamp8. All rights reserved.
+//
+
+import Foundation
+
+/// RandomMatching에서 WorkoutSession으로 화면전환 할 때 넘겨주는 데이터 입니다.
+struct WorkoutSessionElement {
+  let startDate: Date
+  let peers: [Peer]
+  let roomID: String
+
+  private let formatter: DateFormatter = {
+    let formatter = DateFormatter()
+    formatter.dateFormat = "yyyy-MM-dd HH:mm:SS"
+    return formatter
+  }()
+
+  /// 스트링으로 데이터를 받았을 때 서버에서 내려준 값이
+  /// 현재 시간보다 과거거나, 서버에서 내려준 시간이 잘못되었을 경우
+  /// 현재시간 + 4 초 후에 운동을 시작하는 것으로 세팅했습니다.
+  init(startDateString: String, peers: [Peer], roomID: String) {
+    var date = formatter.date(from: startDateString) ?? .now + 4
+    if Date.now > date {
+      date = Date.now + 4
+    }
+    startDate = date
+    self.peers = peers
+    self.roomID = roomID
+  }
+
+  init(startDate: Date, peers: [Peer], roomID: String) {
+    self.startDate = startDate
+    self.peers = peers
+    self.roomID = roomID
+  }
+}

iOS/Projects/Features/Record/Sources/Domain/Entities/WorkoutSetting.swift

@@ -10,10 +10,14 @@ import Foundation
 
 // MARK: - WorkoutSetting
 
+/// 어떤 운동을 할지와, 어떻게 운동을 할지 알려주는 객체 입니다.
 struct WorkoutSetting {
   let workoutType: WorkoutType
+
   let workoutPeerType: PeerType
+
   let isWorkoutAlone: Bool
+
   init(workoutType: WorkoutType, workoutPeerType: PeerType, isWorkoutAlone: Bool = true) {
     self.workoutType = workoutType
     self.workoutPeerType = workoutPeerType

iOS/Projects/Features/Record/Sources/Domain/UseCases/OneSecondsTimerUseCase.swift

@@ -8,6 +8,7 @@
 
 import Combine
 import Foundation
+import Log
 
 // MARK: - OneSecondsTimerUseCaseRepresentable
 
@@ -20,14 +21,14 @@ protocol OneSecondsTimerUseCaseRepresentable: TimerUseCaseRepresentable {
 final class OneSecondsTimerUseCase: TimerUseCase {
   override init(initDate: Date, timerPeriod: Double = 1) {
     super.init(initDate: initDate, timerPeriod: timerPeriod)
+    startTimer()
   }
 }
 
 // MARK: OneSecondsTimerUseCaseRepresentable
 
 extension OneSecondsTimerUseCase: OneSecondsTimerUseCaseRepresentable {
   func oneSecondsTimerPublisher() -> AnyPublisher<Int, Never> {
-    startTimer()
     return intervalCurrentAndInitEverySecondsPublisher()
       .map { abs($0) }
       .eraseToAnyPublisher()