boostcampwm2023 · WhiteHyun · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023 · Dec 10, 2023
diff --git a/iOS/Projects/App/WeTri/Sources/Application/SceneDelegate.swift b/iOS/Projects/App/WeTri/Sources/Application/SceneDelegate.swift
@@ -22,9 +22,8 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     window = UIWindow(windowScene: windowScene)
     let navigationController = UINavigationController()
     window?.rootViewController = navigationController
-    let coordinator = SignUpFeatureCoordinator(navigationController: navigationController, newUserInformation: NewUserInformation(mappedUserID: "", provider: .apple), isMockEnvironment: true)
-//    let coordinator = AppCoordinator(navigationController: navigationController)
-//    coordinating = coordinator
+    let coordinator = AppCoordinator(navigationController: navigationController)
+    coordinating = coordinator
     coordinator.start()
     window?.makeKeyAndVisible()
   }

diff --git a/iOS/Projects/App/WeTri/Sources/CommonScene/Coordinator/AppCoordinator.swift b/iOS/Projects/App/WeTri/Sources/CommonScene/Coordinator/AppCoordinator.swift
@@ -28,7 +28,7 @@ final class AppCoordinator: AppCoordinating {
   }
 
   func start() {
-    showTabBarFlow()
+    showSplashFlow()
   }
 
   private func showSplashFlow() {

diff --git a/iOS/Projects/Core/Network/Sources/Mock/MockWebSocketSession.swift b/iOS/Projects/Core/Network/Sources/Mock/MockWebSocketSession.swift
@@ -20,9 +20,7 @@ public final class MockWebSocketTask<DataModel: Codable>: WebSocketTaskProtocol
 
   public func send(_ message: URLSessionWebSocketTask.Message) async throws {
     switch message {
-    case let .data(data):
-      let socketFrame = try jsonDecoder.decode(WebSocketFrame<DataModel>.self, from: data)
-      let jsonData = try jsonEncoder.encode(socketFrame.data)
+    case let .data(jsonData):
       guard let jsonString = String(data: jsonData, encoding: .utf8) else {
         throw MockWebSocketError.stringConversionFailed
       }

diff --git a/iOS/Projects/Core/Network/Sources/Provider/TNSocketProvider.swift b/iOS/Projects/Core/Network/Sources/Provider/TNSocketProvider.swift
@@ -40,9 +40,9 @@ public struct TNSocketProvider<EndPoint: TNEndPoint>: TNSocketProvidable {
 
 // MARK: - WebSocketFrame
 
-struct WebSocketFrame<T: Codable>: Codable {
-  let event: String
-  let data: T
+public struct WebSocketFrame<T: Codable>: Codable {
+  public let event: String
+  public let data: T
 
   init(event: String = "workout_session", data: T) {
     self.event = event

diff --git a/iOS/Projects/Core/Network/Tests/SessionWebSocketProtocolTests.swift b/iOS/Projects/Core/Network/Tests/SessionWebSocketProtocolTests.swift
@@ -57,7 +57,7 @@ final class SessionWebSocketProtocolTests: XCTestCase {
       return
     }
 
-    let receivedModel = try JSONDecoder().decode(TestModel.self, from: jsonData)
-    XCTAssertEqual(receivedModel, testModel, "Received model does not match sent model")
+    let receivedModel = try JSONDecoder().decode(WebSocketFrame<TestModel>.self, from: jsonData)
+    XCTAssertEqual(receivedModel.data, testModel, "Received model does not match sent model")
   }
 }
diff --git a/iOS/Projects/Features/Record/Sources/Data/Repositories/WorkoutSocketRepository.swift b/iOS/Projects/Features/Record/Sources/Data/Repositories/WorkoutSocketRepository.swift
@@ -45,7 +45,7 @@ struct WorkoutSocketRepository {
       Log.make().debug("StringToWorkoutRealTimeModel에서 Decode에러 ")
       throw WorkoutSocketRepositoryError.invalidStringForConversion
     }
-    guard let workoutSessionModel = try? jsonDecoder.decode(WorkoutSession.self, from: jsonData) else {
+    guard let workoutSessionModel = try? jsonDecoder.decode(WebSocketFrame<WorkoutRealTimeModel>.self, from: jsonData) else {
       Log.make().debug("StringToWorkoutRealTimeModel에서 Decode에러 ")
       throw WorkoutSocketRepositoryError.invalidStringForConversion
     }
@@ -56,7 +56,7 @@ struct WorkoutSocketRepository {
       health: .init(
         distance: workoutSessionModel.data.health.distance,
         calories: workoutSessionModel.data.health.calories,
-        heartRate: nil
+        heartRate: workoutSessionModel.data.health.heartRate
       )
     )
   }

diff --git a/iOS/Projects/Features/Record/Sources/Domain/Entities/WorkoutRealTimeModel.swift b/iOS/Projects/Features/Record/Sources/Domain/Entities/WorkoutRealTimeModel.swift
@@ -8,37 +8,6 @@
 
 import Foundation
 
-// MARK: - WorkoutSession
-
-/// 소켓을 통해 받은 데이터 형식 입니다.
-struct WorkoutSession: Codable {
-  let event: String
-  let data: SessionData
-}
-
-// MARK: - SessionData
-
-struct SessionData: Codable {
-  let nickname: String
-  let health: HealthData
-  let id: String
-  let roomID: String
-
-  enum CodingKeys: String, CodingKey {
-    case nickname
-    case health
-    case id
-    case roomID = "roomId"
-  }
-}
-
-// MARK: - HealthData
-
-struct HealthData: Codable {
-  let calories: Double
-  let distance: Double
-}
-
 // MARK: - WorkoutRealTimeModel
 
 /// 운동 데이터를 송수신하는 모델입니다. 소켓 통신 시 사용합니다.

diff --git a/...ces/Presentation/WorkoutEnvironmentScene/ViewModel/WorkoutEnvironmentSetupViewModel.swift b/...ces/Presentation/WorkoutEnvironmentScene/ViewModel/WorkoutEnvironmentSetupViewModel.swift
@@ -163,7 +163,7 @@ extension WorkoutEnvironmentSetupViewModel: WorkoutEnvironmentSetupViewModelRepr
       coordinator?.finish(
         workoutSessionComponents: .init(
           participants: [sessionPeerTypeOfMe],
-          startDate: .now + 3,
+          startDate: .now + 6,
           roomID: "",
           id: "",
           workoutTypeCode: workoutSetting.workoutType,

diff --git a/.../Presentation/WorkoutPeerMatchingScene/ViewModel/WorkoutPeerRandomMatchingViewModel.swift b/.../Presentation/WorkoutPeerMatchingScene/ViewModel/WorkoutPeerRandomMatchingViewModel.swift
@@ -154,6 +154,7 @@ extension WorkoutPeerRandomMatchingViewModel: WorkoutPeerRandomMatchingViewModel
     else {
       return
     }
+
     let peers = peersResponse.map { SessionPeerType(nickname: $0.nickname, id: $0.publicID, profileImageURL: URL(string: $0.profileImage)) }
     let sessionPeerTypeOfMe = SessionPeerType(
       nickname: userInformationUseCase.userNickName(),

diff --git a/...ces/Presentation/WorkoutSessionGroupScene/SessionScene/WorkoutSessionViewController.swift b/...ces/Presentation/WorkoutSessionGroupScene/SessionScene/WorkoutSessionViewController.swift
@@ -65,8 +65,8 @@ public final class WorkoutSessionViewController: UIViewController {
     self.viewModel = viewModel
     for participant in dependency.participants {
       Log.make().debug("사람 id는 \(participant.id), nickName: \(participant.nickname)")
-      userInfoByID[participant.id] = participant
-      realTimeModelByID[participant.id] = .init(distance: 0, calories: 0, heartRate: 0)
+      userInfoByID[participant.nickname] = participant
+      realTimeModelByID[participant.nickname] = .init(distance: 0, calories: 0, heartRate: 0)
     }
 
     super.init(nibName: nil, bundle: nil)
@@ -131,10 +131,10 @@ public final class WorkoutSessionViewController: UIViewController {
           self?.healthData = myHealthForm
         case let .fetchParticipantsIncludedMySelf(model):
           Log.make().debug("\(model)")
-          self?.realTimeModelByID[model.id] = model.health
+          self?.realTimeModelByID[model.nickname] = model.health
           var snapshot = self?.participantsDataSource?.snapshot()
 
-          snapshot?.reconfigureItems([model.id])
+          snapshot?.reconfigureItems([model.nickname])
           if let snapshot {
             let temp = snapshot.itemIdentifiers
             Log.make().debug("현재 snpahot의 아이템은 다음과 같습니다. \(temp)")

diff --git a/...cts/Features/Record/Sources/Presentation/WorkoutSummaryScene/WorkoutSummaryCardView.swift b/...cts/Features/Record/Sources/Presentation/WorkoutSummaryScene/WorkoutSummaryCardView.swift
@@ -187,12 +187,12 @@ final class WorkoutSummaryCardView: UIView {
     // 지도 설정
     configureMapPolyline(with: model.locations)
 
-    distanceItemView.configure(withTitle: "거리", value: "\(model.distance)")
-    caloriesItemView.configure(withTitle: "칼로리", value: "\(model.calorie)")
+    distanceItemView.configure(withTitle: "거리", value: "\(model.distance)m")
+    caloriesItemView.configure(withTitle: "칼로리", value: "\(model.calorie)kcal")
 
-    averageHeartRateItemView.configure(withTitle: "Avg.HR", value: "\(model.averageHeartRate.flatMap(String.init) ?? "-")")
-    minimumHeartRateItemView.configure(withTitle: "Min.HR", value: "\(model.minimumHeartRate.flatMap(String.init) ?? "-")")
-    maximumHeartRateItemView.configure(withTitle: "Max.HR", value: "\(model.maximumHeartRate.flatMap(String.init) ?? "-")")
+    averageHeartRateItemView.configure(withTitle: "Avg.HR", value: "\(model.averageHeartRate.flatMap(String.init) ?? "-")bpm")
+    minimumHeartRateItemView.configure(withTitle: "Min.HR", value: "\(model.minimumHeartRate.flatMap(String.init) ?? "-")bpm")
+    maximumHeartRateItemView.configure(withTitle: "Max.HR", value: "\(model.maximumHeartRate.flatMap(String.init) ?? "-")bpm")
   }
 
   private func createLocations(from locations: [LocationModel]) -> [CLLocation] {
-Original file line number
+Diff line change
@@ Expand Up @@
         else {
           return
         }
         let peers = peersResponse.map { SessionPeerType(nickname: $0.nickname, id: $0.publicID, profileImageURL: URL(string: $0.profileImage)) }
         let sessionPeerTypeOfMe = SessionPeerType(
           nickname: userInformationUseCase.userNickName(),
@@ Expand Down @@