[Feat] 미션 결과확인하기 로직 구현 #76

manito-project · Nov 1, 2024 · e5ad5c9 · e5ad5c9
1 parent 2c4fb19
commit e5ad5c9
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 12 deletions.
diff --git a/SantaManito-iOS/SantaManito-iOS/Data/DTO/User/MemberResponse.swift b/SantaManito-iOS/SantaManito-iOS/Data/DTO/User/MemberResponse.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 struct MemberResponse: Decodable {
-    let santa: UserResponse
+    let santa: SantaUserResponse
     let manitto: UserResponse?
 }
 

diff --git a/SantaManito-iOS/SantaManito-iOS/Data/DTO/User/UserResponse.swift b/SantaManito-iOS/SantaManito-iOS/Data/DTO/User/UserResponse.swift
@@ -12,8 +12,21 @@ struct UserResponse: Decodable {
     let username: String
 }
 
+struct SantaUserResponse: Decodable {
+    let id: String
+    let username: String
+    let missionId: String
+}
+
 extension UserResponse {
     func toEntity() -> User {
         .init(id: id, username: username) 
     }
 }
+
+extension SantaUserResponse {
+    func toEntity() -> SantaUser {
+        .init(id: id, username: username, missionId: missionId)
+    }
+}
+
diff --git a/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/Member.swift b/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/Member.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 struct Member: Hashable {
-    var santa: User
+    var santa: SantaUser
     var manitto: User? 
 }
 

diff --git a/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/Mission.swift b/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/Mission.swift
@@ -9,12 +9,29 @@ import Foundation
 
 public struct Mission: Identifiable, Hashable, Decodable {
     var content: String
-    public var id = UUID() // TODO: 추후 서버로 부터 DTO어떻게 올지에 따라 달라짐
+//    public var id = UUID() // TODO: 추후 서버로 부터 DTO어떻게 올지에 따라 달라짐
+    public var id = String()
 }
 
 extension Mission {
-    static var stub: Mission {
-        .init(content: "손 잡기", id: UUID())
+    static var stub1: Mission {
+//        .init(content: "손 잡기", id: UUID())
+        .init(content: "손 잡기", id: "1")
+    }
+
+    static var stub2: Mission {
+//        .init(content: "손 잡기", id: UUID())
+        .init(content: "손 잡기", id: "2")
+    }
+
+    static var stub3: Mission {
+//        .init(content: "손 잡기", id: UUID())
+        .init(content: "손 잡기", id: "3")
+    }
+
+    static var stub4: Mission {
+//        .init(content: "손 잡기", id: UUID())
+        .init(content: "손 잡기", id: "4")
     }
 
     static func dummy() -> [Mission] {

diff --git a/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/RoomDetail.swift b/SantaManito-iOS/SantaManito-iOS/Data/Entity/Room/RoomDetail.swift
@@ -62,7 +62,12 @@ extension RoomDetail {
               creatorID: User.stub1.id,
               creatorName: User.stub1.username,
               members: .stub1,
-              mission: [],
+              mission: [
+                .stub1,
+                .stub2,
+                .stub3,
+                .stub4
+              ],
               createdAt: Date(),
               expirationDate: Date()
         )

diff --git a/SantaManito-iOS/SantaManito-iOS/Data/Entity/User/User.swift b/SantaManito-iOS/SantaManito-iOS/Data/Entity/User/User.swift
@@ -12,6 +12,12 @@ struct User: Hashable {
     let username: String
 }
 
+struct SantaUser: Hashable {
+    let id: String
+    let username: String
+    let missionId: String
+}
+
 
 extension User {
     static var stub1: User {
@@ -30,3 +36,22 @@ extension User {
         return .init(id: "userID4", username: "이한나")
     }
 }
+
+extension SantaUser {
+    static var stub1: SantaUser {
+        return .init(id: "userID1", username: "류희재", missionId: "1")
+    }
+
+    static var stub2: SantaUser {
+        return .init(id: "userID2", username: "장석우" , missionId: "2")
+    }
+
+    static var stub3: SantaUser {
+        return .init(id: "userID3", username: "박상수", missionId: "3")
+    }
+
+    static var stub4: SantaUser {
+        return .init(id: "userID4", username: "이한나", missionId: "4")
+    }
+}
+
diff --git a/SantaManito-iOS/SantaManito-iOS/Data/Service/Room/RoomService.swift b/SantaManito-iOS/SantaManito-iOS/Data/Service/Room/RoomService.swift
@@ -129,6 +129,6 @@ struct StubRoomService: RoomServiceType {
     }
 
     func getMyInfo(with roomID: String) -> AnyPublisher<(User, Mission), SMNetworkError> {
-        Just((.stub1, .stub)).setFailureType(to: SMNetworkError.self).eraseToAnyPublisher()
+        Just((.stub1, .stub1)).setFailureType(to: SMNetworkError.self).eraseToAnyPublisher()
     }
 }
diff --git a/SantaManito-iOS/SantaManito-iOS/Feature/EnterRoom/View/ManitoWaitingRoomView.swift b/SantaManito-iOS/SantaManito-iOS/Feature/EnterRoom/View/ManitoWaitingRoomView.swift
@@ -151,7 +151,7 @@ fileprivate struct ParticipateListView: View {
 }
 
 fileprivate struct ParticipateCellView: View {
-    var user: User
+    var user: SantaUser
     var body: some View {
         HStack {
             Image(.graphicsRudolphCircle)

diff --git a/SantaManito-iOS/SantaManito-iOS/Feature/MatchRoom/ViewModel/FinishViewModel.swift b/SantaManito-iOS/SantaManito-iOS/Feature/MatchRoom/ViewModel/FinishViewModel.swift
@@ -60,7 +60,11 @@ class FinishViewModel: ObservableObject {
         }
 
         var mission: String {
-            return "미션" // TODO: 미션 고르는 로직 구현해야함.
+            let missionId = member.santa.missionId
+            guard let mission = roomInfo.mission.first(where: {$0.id == missionId}) else {
+                return "미션이 없습니다."
+            }
+            return mission.content
         }
     }
 
@@ -91,7 +95,7 @@ class FinishViewModel: ObservableObject {
     func send(action: Action) {
         switch action {
         case .onAppear:
-            return 
+            return
 
         case .toggleViewTypeButtonDidTap:
             state.viewType = state.viewType == .me ? .all : .me

diff --git a/SantaManito-iOS/SantaManito-iOS/Feature/MatchRoom/ViewModel/MatchingResultViewModel.swift b/SantaManito-iOS/SantaManito-iOS/Feature/MatchRoom/ViewModel/MatchingResultViewModel.swift
@@ -34,13 +34,13 @@ class MatchingResultViewModel: ObservableObject {
             return roomInfo.members[내가마니또인멤버Index]
         }
 
-        var me: User {
+        var me: SantaUser {
             member.santa
         }
 
         var isAnimating: Bool = false
 
-        fileprivate var matchedInfo: (User, Mission) = (.stub1, .stub)
+        fileprivate var matchedInfo: (User, Mission) = (.stub1, .stub1)
 
         var mannito: User { matchedInfo.0 }
         var mission: String { matchedInfo.1.content }