diff --git a/Projects/App/Sources/Navigation/Class/ClassCoordinator.swift b/Projects/App/Sources/Navigation/Class/ClassCoordinator.swift index 5a8cd372..ed7b6211 100644 --- a/Projects/App/Sources/Navigation/Class/ClassCoordinator.swift +++ b/Projects/App/Sources/Navigation/Class/ClassCoordinator.swift @@ -31,7 +31,10 @@ public struct ClassCoordinator { @Presents public var deadlineEdit: ClassDeadlineEditFeature.State? @Presents public var deadlineSelection: ClassDeadlineSelectionFeature.State? - public var isDeadlinePanelPresented: Bool { deadlineEdit != nil || deadlineSelection != nil } + public var isDeadlinePanelPresented: Bool { + deadlineEdit != nil || deadlineSelection != nil + } + var pendingJoinID: UUID? var completingJoinCodeInstanceID: UUID? var completingJoinNicknameInstanceID: UUID? @@ -140,7 +143,13 @@ public struct ClassCoordinator { let effect = routedBody.reduce(into: &state, action: action) if let selection = state.deadlineSelection { if case let .setting(setting)? = state.routes.last?.screen, - setting.instanceID == selection.settingInstanceID, setting.canEditDeadline { + setting.instanceID == selection.settingInstanceID, setting.canEditDeadline + { + return effect + } + if case let .classEdit(edit)? = state.routes.last?.screen, + edit.instanceID == selection.settingInstanceID, edit.hasDeadline + { return effect } state.deadlineSelection = nil @@ -214,7 +223,10 @@ private extension ClassCoordinator { state.routes[screenAt: routeID] = .detail(detail) return .run { [classUseCase] send in do { - let room = try await classUseCase.fetchClass(id: roomID) + // Android ClassDetailViewModel.fetchClassDetail: 상세와 배틀을 함께 받아 카드에 카테고리·입장을 채운다. + async let detailRoom = classUseCase.fetchClass(id: roomID) + async let session = classUseCase.fetchBattle(classID: roomID) + let room = try await detailRoom.applyingBattle(session.battle) await send(.inner(.detailLoaded( routeID: routeID, roomID: roomID, @@ -581,7 +593,10 @@ private extension ClassCoordinator { state.routes.push(.ticket(.init(instanceID: uuid()))) return .none - case let .routeAction(routeID, action: .ticket(.delegate(.registrationConfirmed(startDate: startDate, endDate: endDate)))): + case let .routeAction( + routeID, + action: .ticket(.delegate(.registrationConfirmed(startDate: startDate, endDate: endDate))) + ): guard routeID == state.routes.count - 1, case let .ticket(completed)? = state.routes.last?.screen, completed.phase == .registered, @@ -817,9 +832,30 @@ private extension ClassCoordinator { state.routes.push(.share(.init(room: room))) return .none - case .routeAction(_, action: .share(.delegate(.dismiss))): + case let .routeAction(routeID, action: .share(.delegate(.dismiss))): + // Android ClassShare onBackClick: 기존 클래스에서 열었으면 이전 화면으로 돌아간다. + if state.routes.indices.contains(routeID), + case let .share(share) = state.routes[routeID].screen, + share.isExistingClass + { + return .send(.view(.backAction)) + } return .send(.view(.backToRootAction)) + case .routeAction(_, action: .share(.delegate(.openMyClasses))): + // Android ClassShare onGoToClassClick: 내 클래스 목록으로 이동한다. + return returnToMyClasses(state: &state) + + case let .routeAction(_, action: .detail(.delegate(.openShare(room)))), + let .routeAction(_, action: .myClasses(.delegate(.openShare(room)))): + state.routes.push(.share(.init(room: room, isExistingClass: true))) + return .none + + case .routeAction(_, action: .ownerDashboard(.delegate(.openShare))): + guard case let .ownerDashboard(dashboard)? = state.routes.last?.screen else { return .none } + state.routes.push(.share(.init(room: dashboard.room, isExistingClass: true))) + return .none + case let .routeAction(routeID, action: .share(.delegate(.nameOwner(room)))): guard routeID == state.routes.count - 1, case let .share(share)? = state.routes.last?.screen, @@ -886,17 +922,25 @@ private extension ClassCoordinator { list.rooms.contains(where: { $0.id == room.id }) else { return .none } return .run { [classUseCase] send in - let result = await Result { try await classUseCase.fetchClass(id: room.id) } - .mapError(ClassError.from) + // Android ClassEditViewModel: 상세와 배틀을 함께 받아 선택한 배틀 카드를 채운다. + let result = await Result { + async let detailRoom = classUseCase.fetchClass(id: room.id) + async let session = classUseCase.fetchBattle(classID: room.id) + return try await detailRoom.applyingBattle(session.battle) + } + .mapError(ClassError.from) await send(.inner(.deadlineDetailResponse(routeID: routeID, roomID: room.id, result))) } - case let .routeAction(routeID, action: .detail(.delegate(.openDeadline(room)))): + case let .routeAction(routeID, action: .detail(.delegate(.openEdit(room)))): + // Android ClassDetail DeadlineEditClick·ManageEditClick → ClassEdit. guard routeID == state.routes.count - 1, case let .detail(detail)? = state.routes.last?.screen, - detail.room.id == room.id + detail.room.id == room.id, + room.role == .owner else { return .none } - return openDeadlineEditor(state: &state, room: room) + state.routes.push(.classEdit(.init(room: detail.room))) + return .none case let .routeAction(_, action: .detail(.delegate(.openMembers(room)))): let member = ClassMemberFeature.State(room: room, instanceID: uuid()) @@ -986,11 +1030,24 @@ private extension ClassCoordinator { case let .routeAction(_, action: .detail(.delegate(.openReport(room)))), let .routeAction(_, action: .closedBattle(.delegate(.openReport(room)))): - if room.role == .owner { - state.routes.push(.ownerDashboard(.init(room: room))) - } else { - state.routes.push(.report(.init(room: room))) - } + // Android onResultClick → ClassResult: 운영자·멤버가 같은 결과 화면을 쓴다. + state.routes.push(.result(.init(room: room))) + return .none + + case let .routeAction(routeID, action: .result(.delegate(.dismiss))): + guard routeID == state.routes.count - 1, + case .result? = state.routes.last?.screen + else { return .none } + return .send(.view(.backAction)) + + case let .routeAction(routeID, action: .result(.delegate(.openMyOpinions(classID)))): + // Android ClassResult NavigateToMyOpinion. + guard routeID == state.routes.count - 1, + case .result? = state.routes.last?.screen + else { return .none } + var opinions = ClassMyOpinionsFeature.State() + opinions.classID = classID + state.routes.push(.myOpinions(opinions)) return .none case let .routeAction(routeID, action: .report(.delegate(.openMyOpinions(instanceID)))): @@ -1081,6 +1138,10 @@ private extension ClassCoordinator { else { return .none } applyUpdatedRoom(state: &state, room: room) state.routes.pop() + // Android RESULT_CLASS_CHANGED: 상세로 돌아오면 상세·배틀을 다시 받는다. + if case .detail? = state.routes.last?.screen { + return fetchDetail(state: &state, routeID: state.routes.count - 1) + } return .none case .routeAction(_, action: .ownerDashboard(.delegate(.deleteClass))): @@ -1158,11 +1219,8 @@ private extension ClassCoordinator { case let .battleFlow(flow)? = state.routes.last?.screen, let room = flow.room, room.id == classID else { return .none } - if room.role == .owner { - state.routes.push(.ownerDashboard(.init(room: room))) - } else { - state.routes.push(.report(.init(room: room))) - } + // Android onResultClick → ClassResult: 운영자·멤버가 같은 결과 화면을 쓴다. + state.routes.push(.result(.init(room: room))) return .none case let .routeAction(routeID, action: .battleFlow(.delegate(.openPerspective(id)))): @@ -1190,14 +1248,13 @@ private extension ClassCoordinator { } } else { while state.routes.count > 1, let screen = state.routes.last?.screen { - let isCompletedFlowRoute: Bool - switch screen { + let isCompletedFlowRoute: Bool = switch screen { case let .aiVote(previous): - isCompletedFlowRoute = previous.room.id == vote.room.id + previous.room.id == vote.room.id case let .aiChat(previous): - isCompletedFlowRoute = previous.room.id == vote.room.id + previous.room.id == vote.room.id default: - isCompletedFlowRoute = false + false } guard isCompletedFlowRoute else { break } state.routes.goBack() @@ -1230,13 +1287,37 @@ private extension ClassCoordinator { return .none case .routeAction(_, action: .detail(.delegate(.deleted))): - return .send(.view(.backToRootAction)) + // Android onClassRemoved: 이전 화면(내 클래스)으로 돌아가 목록을 갱신한다. + return returnToMyClasses(state: &state) + + case let .routeAction(_, action: .detail(.delegate(.left(roomID)))): + state.completedAIBattles[-1_000_000 - roomID] = nil + state.chatRoomsByBattleID[-1_000_000 - roomID] = nil + return returnToMyClasses(state: &state) default: return .none } } + /// 스택의 내 클래스 목록으로 돌아가 다시 불러온다. 목록이 없으면 소개 화면 위에 연다. + func returnToMyClasses(state: inout State) -> Effect { + if let listIndex = state.routes.lastIndex(where: { + if case .myClasses = $0.screen { return true } + return false + }) { + while state.routes.count > listIndex + 1 { + state.routes.goBack() + } + return .send(.router(.routeAction(id: listIndex, action: .myClasses(.async(.fetchRooms))))) + } + invalidateCompletingJoin(state: &state) + state.routes.goBackToRoot() + state.chatRoomsByBattleID.removeAll() + state.routes.push(.myClasses(.init())) + return .none + } + func returnToClassDetail( state: inout State, action: ClassDetailFeature.View @@ -1318,9 +1399,7 @@ private extension ClassCoordinator { while state.routes.count > detailIndex + 2 { state.routes.goBack() } - state.routes[screenAt: detailIndex + 1] = room.role == .owner - ? .ownerDashboard(.init(room: room)) - : .report(.init(room: room)) + state.routes[screenAt: detailIndex + 1] = .result(.init(room: room)) return .none } } @@ -1517,6 +1596,7 @@ extension ClassCoordinator { case detail(ClassDetailFeature) case members(ClassMemberFeature) case report(ClassReportFeature) + case result(ClassResultFeature) case myOpinions(ClassMyOpinionsFeature) case closedBattle(ClassClosedBattleFeature) case ownerDashboard(ClassOwnerDashboardFeature) diff --git a/Projects/App/Sources/Navigation/Class/ClassCoordinatorView.swift b/Projects/App/Sources/Navigation/Class/ClassCoordinatorView.swift index 3509a656..5d566d8f 100644 --- a/Projects/App/Sources/Navigation/Class/ClassCoordinatorView.swift +++ b/Projects/App/Sources/Navigation/Class/ClassCoordinatorView.swift @@ -67,6 +67,9 @@ public struct ClassCoordinatorView: View { case let .report(reportStore): ClassReportView(store: reportStore) + + case let .result(resultStore): + ClassResultView(store: resultStore) .toolbar(.hidden, for: .tabBar) case let .myOpinions(opinionsStore): diff --git a/Projects/App/Tests/Sources/ClassBattleFlowCoordinatorTests.swift b/Projects/App/Tests/Sources/ClassBattleFlowCoordinatorTests.swift index ec567b08..dce86b19 100644 --- a/Projects/App/Tests/Sources/ClassBattleFlowCoordinatorTests.swift +++ b/Projects/App/Tests/Sources/ClassBattleFlowCoordinatorTests.swift @@ -79,11 +79,12 @@ struct ClassBattleFlowCoordinatorTests { Issue.record("리포트 뒤로가기를 위한 의견 화면 경로가 사라졌습니다") return } - guard case let .ownerDashboard(dashboard)? = store.state.routes.last?.screen else { - Issue.record("TTS 의견 화면에서 리포트로 이동하지 않았습니다") + // Android ClassResult: 운영자·멤버 공용 결과 화면으로 이동한다. + guard case let .result(result)? = store.state.routes.last?.screen else { + Issue.record("TTS 의견 화면에서 결과 화면으로 이동하지 않았습니다") return } - #expect(dashboard.room.id == room.id) + #expect(result.room.id == room.id) } @Test diff --git a/Projects/App/Tests/Sources/ClassCoordinatorTests.swift b/Projects/App/Tests/Sources/ClassCoordinatorTests.swift index 2b6c3f5b..cb672a76 100644 --- a/Projects/App/Tests/Sources/ClassCoordinatorTests.swift +++ b/Projects/App/Tests/Sources/ClassCoordinatorTests.swift @@ -598,29 +598,16 @@ struct ClassCoordinatorTests { id: 1, action: .detail(.delegate(.openReport(updatedRoom))) ))) - await store.send(.router(.routeAction( - id: 2, - action: .ownerDashboard(.view(.onAppear)) - ))) - await store.receive { - guard case .router(.routeAction(id: 2, action: .ownerDashboard(.async(.fetchDashboard)))) = $0 - else { return false } - return true - } - await store.receive { - guard case let .router(.routeAction(id: 2, action: .ownerDashboard(action))) = $0, - case .inner(.resultResponse) = action else { return false } - return true - } await store.finish() - guard case let .ownerDashboard(dashboard)? = store.state.routes.last?.screen else { - Issue.record("마감일 변경 후 운영자 보고서가 열리지 않음") + // Android ClassResult: 운영자도 공용 결과 화면을 열고, 갱신된 방으로 결과를 다시 받는다. + guard case let .result(resultState)? = store.state.routes.last?.screen else { + Issue.record("마감일 변경 후 결과 화면이 열리지 않음") return } - #expect(dashboard.room.deadline == updatedRoom.deadline) - #expect(dashboard.sourceViewState == .ready) - #expect(dashboard.classResult == result) + #expect(resultState.room.deadline == updatedRoom.deadline) + #expect(resultState.isLoading) + _ = result } @Test @@ -1021,7 +1008,7 @@ struct ClassCoordinatorTests { await store.send(.view(.chatReportTapped(battleID: battleID))) #expect(store.state.routes.count == 3) guard case let .detail(preservedDetail) = store.state.routes[1].screen, - case let .report(report)? = store.state.routes.last?.screen + case let .result(report)? = store.state.routes.last?.screen else { Issue.record("댓글 리포트가 기존 상세 위에 열리지 않음") return @@ -1032,7 +1019,7 @@ struct ClassCoordinatorTests { await store.send(.view(.chatReportTapped(battleID: battleID))) #expect(store.state.routes.count == 3) - await store.send(.router(.routeAction(id: 2, action: .report(.delegate(.dismiss))))) + await store.send(.router(.routeAction(id: 2, action: .result(.delegate(.dismiss))))) await store.receive { guard case .view(.backAction) = $0 else { return false } return true @@ -1064,7 +1051,7 @@ struct ClassCoordinatorTests { await store.send(.view(.chatReportTapped(battleID: battleID))) #expect(store.state.routes.count == 3) guard case .detail = store.state.routes[1].screen, - case let .report(report)? = store.state.routes.last?.screen + case let .result(report)? = store.state.routes.last?.screen else { Issue.record("AI 경로를 정리한 뒤 리포트가 상세 위에 열리지 않음") return @@ -1091,7 +1078,7 @@ struct ClassCoordinatorTests { await store.send(.view(.chatReportTapped(battleID: battleID))) #expect(store.state.routes.count == 3) - guard case .report? = store.state.routes.last?.screen else { + guard case .result? = store.state.routes.last?.screen else { Issue.record("완료된 AI 투표의 댓글 리포트가 열리지 않음") return } @@ -1101,7 +1088,7 @@ struct ClassCoordinatorTests { } @Test - func 운영자_댓글의_리포트는_운영자_대시보드로_열린다() async { + func 운영자_댓글의_리포트도_Android_공용_결과_화면으로_열린다() async { let room = ClassRoom.mocks[0] let battleID = -1_000_000 - room.id var state = ClassCoordinator.State() @@ -1115,8 +1102,8 @@ struct ClassCoordinatorTests { await store.send(.view(.chatReportTapped(battleID: battleID))) #expect(store.state.routes.count == 3) - guard case let .ownerDashboard(dashboard)? = store.state.routes.last?.screen else { - Issue.record("운영자 댓글이 운영자 대시보드로 연결되지 않음") + guard case let .result(dashboard)? = store.state.routes.last?.screen else { + Issue.record("운영자 댓글이 결과 화면으로 연결되지 않음") return } #expect(dashboard.room == room) @@ -1197,13 +1184,13 @@ struct ClassCoordinatorTests { id: 2, action: .closedBattle(.delegate(.openReport(room))) ))) - guard case .report? = store.state.routes.last?.screen else { - Issue.record("멤버 리포트로 이동하지 않음") + guard case .result? = store.state.routes.last?.screen else { + Issue.record("멤버 결과 화면으로 이동하지 않음") return } #expect(!store.state.showsTabBar) - await store.send(.router(.routeAction(id: 3, action: .report(.delegate(.dismiss))))) + await store.send(.router(.routeAction(id: 3, action: .result(.delegate(.dismiss))))) await store.receive { guard case .view(.backAction) = $0 else { return false } return true @@ -1217,7 +1204,7 @@ struct ClassCoordinatorTests { } @Test - func 운영자_대시보드에서는_탭바를_숨긴다() async { + func 결과_화면에서는_탭바를_숨기고_닫으면_복구한다() async { let room = ClassRoom.mocks[0] var state = ClassCoordinator.State() state.routes.push(.detail(testDetailState(room: room))) @@ -1231,36 +1218,15 @@ struct ClassCoordinatorTests { action: .detail(.delegate(.openReport(room))) ))) #expect(!store.state.showsTabBar) - guard case var .ownerDashboard(dashboard)? = store.state.routes.last?.screen else { - Issue.record("운영자 대시보드가 열리지 않음") + guard case let .result(result)? = store.state.routes.last?.screen else { + Issue.record("결과 화면이 열리지 않음") return } - - var tabBarState = store.state - dashboard.selectedTab = .report - tabBarState.routes[screenAt: 2] = .ownerDashboard(dashboard) - #expect(!tabBarState.showsTabBar) - - dashboard.management = .init(kind: .management) - tabBarState.routes[screenAt: 2] = .ownerDashboard(dashboard) - #expect(!tabBarState.showsTabBar) - - dashboard.management = nil - tabBarState.routes[screenAt: 2] = .ownerDashboard(dashboard) - #expect(!tabBarState.showsTabBar) - - tabBarState.deadlineEdit = .init( - room: room, - instanceID: UUID(), - referenceNow: Date(timeIntervalSince1970: 1_760_000_000) - ) - #expect(!tabBarState.showsTabBar) - tabBarState.deadlineEdit = nil - #expect(!tabBarState.showsTabBar) + #expect(result.room == room) await store.send(.router(.routeAction( id: 2, - action: .ownerDashboard(.delegate(.dismiss)) + action: .result(.delegate(.dismiss)) ))) await store.receive { guard case .view(.backAction) = $0 else { return false } @@ -1295,7 +1261,7 @@ struct ClassCoordinatorTests { } @Test - func 마감된_운영자_결과는_요약으로_직접_이동한다() async { + func 마감된_운영자_결과도_공용_결과_화면으로_이동한다() async { let room = ClassRoom.mocks[2] var state = ClassCoordinator.State() state.routes.push(.detail(testDetailState(room: room))) @@ -1310,8 +1276,8 @@ struct ClassCoordinatorTests { id: 1, action: .detail(.delegate(.openReport(room))) ))) - guard case .ownerDashboard? = store.state.routes.last?.screen else { - Issue.record("운영자 요약으로 이동하지 않음") + guard case .result? = store.state.routes.last?.screen else { + Issue.record("운영자 결과 화면으로 이동하지 않음") return } } @@ -2435,7 +2401,7 @@ struct ClassDeadlineSheetCoordinatorTests { } @Test - func 세_화면에서_현재_경로를_유지하며_마감일_시트를_연다() async { + func 목록과_상세의_수정은_현재_경로_위에_수정_화면을_연다() async { let room = ClassRoom.mocks[0] var list = MyClassFeature.State() list.rooms = [room] @@ -2459,15 +2425,20 @@ struct ClassDeadlineSheetCoordinatorTests { await store.send(.view(.backAction)) await store.send(.router(.routeAction(id: 1, action: .myClasses(.delegate(.openRoom(room)))))) - await store.send(.router(.routeAction(id: 2, action: .detail(.delegate(.openDeadline(room)))))) - #expect(store.state.routes.count == 3) - #expect(store.state.deadlineEdit?.room == room) - - await store.send(.deadlineEdit(.dismiss)) - await store.send(.router(.routeAction(id: 2, action: .detail(.delegate(.openReport(room)))))) - await store.send(.router(.routeAction(id: 3, action: .ownerDashboard(.delegate(.editClass))))) - #expect(store.state.routes.count == 5) + // Android ClassDetail 마감일 "수정"도 ClassEdit 화면으로 이동한다. + await store.send(.router(.routeAction(id: 2, action: .detail(.delegate(.openEdit(room)))))) + #expect(store.state.routes.count == 4) + #expect(store.state.deadlineEdit == nil) #expect(store.state.routes.last.map { if case .classEdit = $0.screen { true } else { false } } == true) + + // 수정 화면의 마감일 필드를 누르면 마감일 선택 시트가 유지되어야 한다. + await store.send(.router(.routeAction(id: 3, action: .classEdit(.view(.deadlineFieldTapped))))) + guard case let .classEdit(edit)? = store.state.routes.last?.screen else { + Issue.record("수정 화면이 아니다") + return + } + await store.receive(\.router) + #expect(store.state.deadlineSelection?.settingInstanceID == edit.instanceID) } @Test @@ -2489,7 +2460,6 @@ struct ClassDeadlineSheetCoordinatorTests { await store.send(.deadlineEdit(.dismiss)) await store.send(.view(.backAction)) await store.send(.view(.backToRootAction)) - await store.send(.router(.routeAction(id: 1, action: .detail(.delegate(.openDeadline(room)))))) #expect(store.state.deadlineEdit?.instanceID == editor.instanceID) #expect(store.state.routes.count == 2) } diff --git a/Projects/App/Tests/Sources/ClassFlowVisualAuditTests.swift b/Projects/App/Tests/Sources/ClassFlowVisualAuditTests.swift index 7da61cf2..b7b1a524 100644 --- a/Projects/App/Tests/Sources/ClassFlowVisualAuditTests.swift +++ b/Projects/App/Tests/Sources/ClassFlowVisualAuditTests.swift @@ -1742,9 +1742,9 @@ final class ClassFlowVisualAuditTests: XCTestCase { var detailState = ClassCoordinator.State() detailState.routes.push(.detail(.init(room: room))) let detailStore = makeStore(detailState) - detailStore.send(.router(.routeAction(id: 1, action: .detail(.delegate(.openDeadline(room)))))) - XCTAssertEqual(detailStore.routes.count, 2) - try await save("deadline-sheet-detail-compact", store: detailStore) + // Android: 상세의 마감일 "수정"은 ClassEdit 화면으로 이동한다. + detailStore.send(.router(.routeAction(id: 1, action: .detail(.delegate(.openEdit(room)))))) + XCTAssertEqual(detailStore.routes.count, 3) detailState.routes.push(.ownerDashboard(.init(room: room, instanceID: UUID()))) let dashboardStore = makeStore(detailState) diff --git a/Projects/Domain/ClassDomain/Interface/Sources/Entity/Result/ClassResult.swift b/Projects/Domain/ClassDomain/Interface/Sources/Entity/Result/ClassResult.swift index 8db3aa46..48618f47 100644 --- a/Projects/Domain/ClassDomain/Interface/Sources/Entity/Result/ClassResult.swift +++ b/Projects/Domain/ClassDomain/Interface/Sources/Entity/Result/ClassResult.swift @@ -24,3 +24,80 @@ public struct ClassResult: Equatable, Sendable { self.insightState = insightState } } + +/// Android `ClassReportState` — 인사이트·내 리포트 응답의 생성 상태. 알 수 없는 값은 PENDING. +public enum ClassResultReportState: String, Equatable, Sendable { + case beforeClose = "BEFORE_CLOSE" + case notEligible = "NOT_ELIGIBLE" + case pending = "PENDING" + case generating = "GENERATING" + case succeeded = "SUCCEEDED" + case limited = "LIMITED" + case failed = "FAILED" + + public static func from(_ value: String?) -> Self { + value.flatMap(Self.init(rawValue:)) ?? .pending + } +} + +/// Android `ClassResultInsightBoard` — 상태를 오류로 바꾸지 않고 그대로 담는다. +public struct ClassResultInsightBoard: Equatable, Sendable { + public let state: ClassResultReportState + public let insightText: String? + public let retryable: Bool + + public init(state: ClassResultReportState, insightText: String?, retryable: Bool) { + self.state = state + self.insightText = insightText + self.retryable = retryable + } +} + +/// Android `ClassResultMyReportBoard` — 내 리포트 탭에 필요한 값만 상태와 함께 담는다. +public struct ClassResultMyReportBoard: Equatable, Sendable { + public let state: ClassResultReportState + public let preOptionTitle: String? + public let postOptionTitle: String? + public let perspectiveCount: Int + public let commentCount: Int + /// 피드백 본문이 없으면 nil. + public let feedback: Feedback? + + public struct Feedback: Equatable, Sendable { + public let judgmentBasis: String + public let strength: String? + public let nextFocus: String? + public let nextQuestion: String + public let coverage: String? + + public init( + judgmentBasis: String, + strength: String?, + nextFocus: String?, + nextQuestion: String, + coverage: String? + ) { + self.judgmentBasis = judgmentBasis + self.strength = strength + self.nextFocus = nextFocus + self.nextQuestion = nextQuestion + self.coverage = coverage + } + } + + public init( + state: ClassResultReportState, + preOptionTitle: String?, + postOptionTitle: String?, + perspectiveCount: Int, + commentCount: Int, + feedback: Feedback? + ) { + self.state = state + self.preOptionTitle = preOptionTitle + self.postOptionTitle = postOptionTitle + self.perspectiveCount = perspectiveCount + self.commentCount = commentCount + self.feedback = feedback + } +} diff --git a/Projects/Domain/ClassDomain/Interface/Sources/Entity/Room/ClassRoom.swift b/Projects/Domain/ClassDomain/Interface/Sources/Entity/Room/ClassRoom.swift index e0efbbdf..aa696532 100644 --- a/Projects/Domain/ClassDomain/Interface/Sources/Entity/Room/ClassRoom.swift +++ b/Projects/Domain/ClassDomain/Interface/Sources/Entity/Room/ClassRoom.swift @@ -64,6 +64,55 @@ public struct ClassRoom: Equatable, Identifiable, Sendable { } } +public extension ClassRoom { + /// Android ClassDetail·ClassShare 처럼 `/classes/{id}/battle` 응답으로 배틀 카드의 + /// 카테고리 태그·입장·소요 시간을 채운다. 상세 응답의 배틀은 제목·요약만 준다. + func applyingBattle(_ detail: ClassBattleDetail) -> ClassRoom { + let optionA = detail.options.first + let optionB = detail.options.dropFirst().first + // `/battle` 은 입장 설명을 주지 않으므로 같은 배틀이면 기존 설명을 유지한다. + let isSameBattle = battle.id == detail.id + let summary = ClassBattleSummary( + id: detail.id, + title: detail.title, + summary: detail.summary, + thumbnailURL: detail.thumbnailURL ?? battle.thumbnailURL, + philosopherA: optionA?.representative ?? "", + optionATitle: optionA?.title ?? "", + optionADescription: isSameBattle ? battle.optionADescription : nil, + philosopherAImageURL: optionA?.imageURL, + philosopherB: optionB?.representative ?? "", + optionBTitle: optionB?.title ?? "", + optionBDescription: isSameBattle ? battle.optionBDescription : nil, + philosopherBImageURL: optionB?.imageURL, + category: battle.category, + categoryDisplayTitle: detail.categoryTags.first ?? "", + level: battle.level, + audioDuration: detail.audioDuration, + viewCount: battle.viewCount, + commentCount: battle.commentCount + ) + return ClassRoom( + id: id, + name: name, + joinCode: joinCode, + battle: summary, + deadline: deadline, + closeAt: closeAt, + memberCount: memberCount, + activeMemberCount: activeMemberCount, + role: role, + status: status, + allowsAnonymousOpinion: allowsAnonymousOpinion, + requiresComment: requiresComment, + ownerParticipates: ownerParticipates, + memberCapacity: memberCapacity, + battleType: battleType, + ticketExpiresAt: ticketExpiresAt + ) + } +} + public extension ClassRoom { static let mocks: [ClassRoom] = [ .init( diff --git a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Default/MockClassRepository+Features.swift b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Default/MockClassRepository+Features.swift index 31f59977..0ed8bfa3 100644 --- a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Default/MockClassRepository+Features.swift +++ b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Default/MockClassRepository+Features.swift @@ -1,8 +1,50 @@ import Foundation public extension MockClassRepository { + /// 상세·공유·결과 화면이 상세와 함께 받는 `/battle` 을 저장된 클래스로 흉내 낸다. public func fetchBattle(classID: Int) async throws -> ClassBattleSession { - throw ClassError.unknown("모의 클래스 기능이 설정되지 않았습니다: fetchBattle") + let room = try await fetchClass(id: classID) + let battle = room.battle + return ClassBattleSession( + classID: room.id, + myRole: room.role, + closeAt: room.closeAt ?? room.deadline, + closed: room.status == .closed, + commentRequired: room.requiresComment, + canParticipate: room.role != .owner || room.ownerParticipates, + participationCompleted: false, + battle: ClassBattleDetail( + id: battle.id, + title: battle.title, + summary: battle.summary, + thumbnailURL: battle.thumbnailURL, + description: "", + shareURL: nil, + userVoteStatus: nil, + currentStep: .none, + participantsCount: room.memberCount, + audioDuration: battle.audioDuration, + options: [ + ClassBattleOption( + id: 1, + label: "A", + title: battle.optionATitle, + stance: battle.optionATitle, + representative: battle.philosopherA, + imageURL: battle.philosopherAImageURL + ), + ClassBattleOption( + id: 2, + label: "B", + title: battle.optionBTitle, + stance: battle.optionBTitle, + representative: battle.philosopherB, + imageURL: battle.philosopherBImageURL + ), + ], + categoryTags: battle.categoryDisplayTitle.isEmpty ? [] : [battle.categoryDisplayTitle] + ) + ) } public func submitPreVote(classID: Int, optionID: Int) async throws -> ClassVoteReceipt { diff --git a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Result/ClassResultInterface.swift b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Result/ClassResultInterface.swift index 4719fb1a..4258ca14 100644 --- a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Result/ClassResultInterface.swift +++ b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Result/ClassResultInterface.swift @@ -13,12 +13,27 @@ public protocol ClassResultInterface: Sendable { func fetchPersonalResult(roomID: Int) async throws -> ClassAIPersonalFeedback func fetchInsight(roomID: Int) async throws -> ClassAIInsight func retryInsight(roomID: Int) async throws + /// Android `GET /result/insight` — 상태를 그대로 받는다. + func fetchInsightBoard(roomID: Int) async throws -> ClassResultInsightBoard + /// Android `GET /result/my-report` — 상태를 그대로 받는다. + func fetchMyReportBoard(roomID: Int) async throws -> ClassResultMyReportBoard func fetchMyActivity( roomID: Int, cursor: String? ) async throws -> ClassMyActivity } +public extension ClassResultInterface { + /// 상태 보존 조회를 구현하지 않은 테스트 대역용 기본 구현. + func fetchInsightBoard(roomID _: Int) async throws -> ClassResultInsightBoard { + throw ClassError.unknown("인사이트를 불러올 수 없습니다.") + } + + func fetchMyReportBoard(roomID _: Int) async throws -> ClassResultMyReportBoard { + throw ClassError.unknown("내 리포트를 불러올 수 없습니다.") + } +} + public enum ClassResultRepositoryDependency: TestDependencyKey { public static var testValue: any ClassResultInterface { MockClassRepository() diff --git a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Room/ClassRoomInterface.swift b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Room/ClassRoomInterface.swift index 50fad1ad..9cfbb8a6 100644 --- a/Projects/Domain/ClassDomain/Interface/Sources/Repository/Room/ClassRoomInterface.swift +++ b/Projects/Domain/ClassDomain/Interface/Sources/Repository/Room/ClassRoomInterface.swift @@ -17,6 +17,8 @@ public protocol ClassRoomInterface: Sendable { func joinClass(joinCode: String, nickname: String) async throws -> ClassRoom func updateDeadline(id: Int, deadline: Date) async throws -> ClassRoom func updateName(id: Int, name: String) async throws -> ClassRoom + /// Android `PATCH /classes/{id}` — 이름과(바뀐 경우) 마감일을 한 번에 보낸다. + func updateClass(id: Int, name: String, deadline: Date?) async throws -> ClassRoom func deleteClass(id: Int) async throws func leaveClass(id: Int) async throws } @@ -26,6 +28,15 @@ public extension ClassRoomInterface { throw ClassError.userMessage("클래스 이름 변경을 지원하지 않습니다.") } + /// 단일 PATCH 를 지원하지 않는 테스트 대역용 기본 구현. + func updateClass(id: Int, name: String, deadline: Date?) async throws -> ClassRoom { + var updated = try await updateName(id: id, name: name) + if let deadline { + updated = try await updateDeadline(id: id, deadline: deadline) + } + return updated + } + func fetchClassPreview(joinCode: String) async throws -> ClassJoinPreview { let room = try await fetchClass(joinCode: joinCode) return ClassJoinPreview(room: room) diff --git a/Projects/Domain/ClassDomain/Sources/Model/Mapper/ClassAIFeedbackDTO+.swift b/Projects/Domain/ClassDomain/Sources/Model/Mapper/ClassAIFeedbackDTO+.swift index 120b44c6..06aec2bf 100644 --- a/Projects/Domain/ClassDomain/Sources/Model/Mapper/ClassAIFeedbackDTO+.swift +++ b/Projects/Domain/ClassDomain/Sources/Model/Mapper/ClassAIFeedbackDTO+.swift @@ -103,3 +103,46 @@ extension ClassInsightDTO { } } } + +// MARK: - Android ClassResult 보드 (상태 보존) + +extension ClassAIGenerationState { + var resultReportState: ClassResultReportState { + switch self { + case .beforeClose: .beforeClose + case .notEligible: .notEligible + case .pending, .unknown: .pending + case .generating: .generating + case .succeeded: .succeeded + case .limited: .limited + case .failed: .failed + } + } +} + +extension ClassInsightDTO { + func toBoard() -> ClassResultInsightBoard { + ClassResultInsightBoard(state: state.resultReportState, insightText: insightText, retryable: retryable) + } +} + +extension ClassPersonalReportDTO { + func toBoard() -> ClassResultMyReportBoard { + ClassResultMyReportBoard( + state: state.resultReportState, + preOptionTitle: preOption?.title, + postOptionTitle: postOption?.title, + perspectiveCount: perspectiveCount ?? 0, + commentCount: commentCount ?? 0, + feedback: feedback.map { + ClassResultMyReportBoard.Feedback( + judgmentBasis: $0.judgmentBasis, + strength: $0.strength?.body, + nextFocus: $0.nextFocus?.body, + nextQuestion: $0.nextQuestion, + coverage: $0.coverage + ) + } + ) + } +} diff --git a/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Result.swift b/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Result.swift index aacd394b..b9e54374 100644 --- a/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Result.swift +++ b/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Result.swift @@ -43,6 +43,24 @@ extension ClassRepositoryImpl { } } + public func fetchInsightBoard(roomID: Int) async throws -> ClassResultInsightBoard { + do { + let payload = try await client.send(ClassResultService.insight(roomID), as: ClassInsightDTO.self) + return payload.toBoard() + } catch { + throw Self.feedbackError(error) + } + } + + public func fetchMyReportBoard(roomID: Int) async throws -> ClassResultMyReportBoard { + do { + let payload = try await client.send(ClassResultService.myReport(roomID), as: ClassPersonalReportDTO.self) + return payload.toBoard() + } catch { + throw Self.feedbackError(error) + } + } + public func retryInsight(roomID: Int) async throws { do { let payload = try await client.send(ClassResultService.retryInsight(roomID), as: ClassInsightRetryDTO.self) diff --git a/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Room.swift b/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Room.swift index 51d3848d..398e6635 100644 --- a/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Room.swift +++ b/Projects/Domain/ClassDomain/Sources/Repository/ClassRepositoryImpl+Room.swift @@ -79,6 +79,19 @@ extension ClassRepositoryImpl { } } + public func updateClass(id: Int, name: String, deadline: Date?) async throws -> ClassRoom { + do { + _ = try await client.send( + ClassroomService.updateClass(id: id, name: name, deadline: deadline), + as: PickeEmptyResponse.self + ) + let data = try await client.send(ClassroomService.detail(id), as: ClassDetailDataDTO.self) + return try data.toDomain() + } catch { + throw Self.classError(error) + } + } + public func updateName(id: Int, name: String) async throws -> ClassRoom { do { _ = try await client.send( diff --git a/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Result.swift b/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Result.swift index cdbf3fb9..47b1d5dd 100644 --- a/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Result.swift +++ b/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Result.swift @@ -21,6 +21,14 @@ extension ClassUseCaseImpl { try await repository.fetchInsight(roomID: roomID) } + public func fetchInsightBoard(roomID: Int) async throws -> ClassResultInsightBoard { + try await repository.fetchInsightBoard(roomID: roomID) + } + + public func fetchMyReportBoard(roomID: Int) async throws -> ClassResultMyReportBoard { + try await repository.fetchMyReportBoard(roomID: roomID) + } + public func retryInsight(roomID: Int) async throws { try await repository.retryInsight(roomID: roomID) } diff --git a/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Room.swift b/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Room.swift index 6af986d7..ca4e7f7e 100644 --- a/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Room.swift +++ b/Projects/Domain/ClassDomain/Sources/UseCase/ClassUseCaseImpl+Room.swift @@ -37,6 +37,10 @@ extension ClassUseCaseImpl { try await repository.updateDeadline(id: id, deadline: deadline) } + public func updateClass(id: Int, name: String, deadline: Date?) async throws -> ClassRoom { + try await repository.updateClass(id: id, name: name, deadline: deadline) + } + public func updateName(id: Int, name: String) async throws -> ClassRoom { try await repository.updateName(id: id, name: name) } diff --git a/Projects/Feature/Class/Sources/ClassAIChat/Reducer/ClassAIChatFeature.swift b/Projects/Feature/Class/Sources/ClassAIChat/Reducer/ClassAIChatFeature.swift index e078c8a3..c1238fc4 100644 --- a/Projects/Feature/Class/Sources/ClassAIChat/Reducer/ClassAIChatFeature.swift +++ b/Projects/Feature/Class/Sources/ClassAIChat/Reducer/ClassAIChatFeature.swift @@ -32,6 +32,8 @@ public struct ClassAIChatFeature { public var canRetrySession = false public var transportRetryAvailable = false public var errorMessage: String? + /// Android ClassDebate 토스트 문구(조회 실패·요청 실패). + public var toastMessage: String? public var hasStarted = false public var sessionRequestID: UUID? public var responseRequestID: UUID? @@ -147,6 +149,7 @@ public struct ClassAIChatFeature { case quickReplyTapped(String) case sendTapped case finalVoteTapped + case toastShown } @CasePathable @@ -325,6 +328,10 @@ extension ClassAIChatFeature { guard state.isCompleted else { return .none } state.customAlert = .finalVote() return .none + + case .toastShown: + state.toastMessage = nil + return .none } } } @@ -344,8 +351,9 @@ extension ClassAIChatFeature { switch result { case let .success(debate): state.apply(debate) - case let .failure(error): - state.errorMessage = error.localizedDescription + case .failure: + // Android ClassDebateViewModel.fetchDebate: 실패하면 "정보를 불러오지 못했어요" 토스트. + state.toastMessage = "정보를 불러오지 못했어요" state.canRetrySession = true state.transportRetryAvailable = true } @@ -363,13 +371,14 @@ extension ClassAIChatFeature { if debate.status == .completed { state.customAlert = .finalVote() } - case let .failure(error): + case .failure: + // Android ClassDebateViewModel.submitReply: 실패하면 "요청을 처리하지 못했어요" 토스트. if state.messages.last?.speaker == .user { state.messages.removeLast() } state.draft = state.pendingText ?? state.draft state.pendingText = nil - state.errorMessage = error.localizedDescription + state.toastMessage = "요청을 처리하지 못했어요" } return .none diff --git a/Projects/Feature/Class/Sources/ClassAIChat/View/ClassAIChatView.swift b/Projects/Feature/Class/Sources/ClassAIChat/View/ClassAIChatView.swift index 8ee7bdea..98f4ce33 100644 --- a/Projects/Feature/Class/Sources/ClassAIChat/View/ClassAIChatView.swift +++ b/Projects/Feature/Class/Sources/ClassAIChat/View/ClassAIChatView.swift @@ -36,6 +36,11 @@ public struct ClassAIChatView: View { restoreFocusIfNeeded(isGenerating: isGenerating) } .customAlert($store.scope(state: \.customAlert, action: \.customAlert)) + .onChange(of: store.toastMessage, initial: true) { _, message in + guard let message else { return } + ToastManager.shared.showError(message) + send(.toastShown) + } } } diff --git a/Projects/Feature/Class/Sources/ClassDetail/Reducer/ClassDetailFeature.swift b/Projects/Feature/Class/Sources/ClassDetail/Reducer/ClassDetailFeature.swift index 02a8b47f..e872fcc0 100644 --- a/Projects/Feature/Class/Sources/ClassDetail/Reducer/ClassDetailFeature.swift +++ b/Projects/Feature/Class/Sources/ClassDetail/Reducer/ClassDetailFeature.swift @@ -32,6 +32,8 @@ public struct ClassDetailFeature { @Presents public var customAlert: CustomAlertState? public var isLoading = false public var errorMessage: String? + public var toastMessage: String? + public var isLeaveConfirmation = false public init(room: ClassRoom) { @Dependency(\.uuid) var uuid @@ -71,8 +73,13 @@ public struct ClassDetailFeature { case codeTapped case codeDismissed case deadlineTapped + case editTapped + case shareTapped case deleteTapped case deleteConfirmed + case leaveTapped + case leaveConfirmed + case toastShown } public enum DelegateAction: Equatable { @@ -82,16 +89,20 @@ public struct ClassDetailFeature { case openBattle(ClassRoom) case openClosedBattle(ClassRoom) case openReport(ClassRoom) - case openDeadline(ClassRoom) + case openEdit(ClassRoom) + case openShare(ClassRoom) case deleted(Int) + case left(Int) } public enum AsyncAction: Equatable { case delete(Int) + case leave(Int) } public enum InnerAction: Equatable { case deleted(Int, ClassError?) + case left(Int, ClassError?) } @Dependency(\.classRoomUseCase) private var classRoomUseCase @@ -148,15 +159,17 @@ extension ClassDetailFeature { ) -> Effect { switch action { case .presented(.confirmTapped): - let isDeleteConfirmation = state.customAlert?.style == .deleteConfirm + let isConfirmation = state.customAlert?.style == .deleteConfirm + let isLeave = state.isLeaveConfirmation state.customAlert = nil state.errorMessage = nil - return isDeleteConfirmation - ? handleViewAction(state: &state, action: .deleteConfirmed) - : .none + state.isLeaveConfirmation = false + guard isConfirmation else { return .none } + return handleViewAction(state: &state, action: isLeave ? .leaveConfirmed : .deleteConfirmed) case .presented(.cancelTapped), .dismiss: state.customAlert = nil state.errorMessage = nil + state.isLeaveConfirmation = false return .none } } @@ -179,9 +192,14 @@ extension ClassDetailFeature { return .send(.delegate(.openMembers(state.room))) case .battleTapped: guard state.viewState == .loaded else { return .none } - guard state.canParticipateInBattle else { return .none } - if state.room.status == .closed { - return .send(.delegate(.openClosedBattle(state.room))) + // Android ClassDetailViewModel.startBattle: 마감 → 미참여 운영자 순으로 토스트를 띄운다. + guard state.room.status == .open else { + state.toastMessage = "참여 기간이 마감되었어요." + return .none + } + guard state.canParticipateInBattle else { + state.toastMessage = "운영자 참여를 켜지 않은 클래스라 배틀에 참여할 수 없어요." + return .none } return .send(.delegate(.openBattle(state.room))) case .reportTapped: @@ -189,7 +207,6 @@ extension ClassDetailFeature { return .send(.delegate(.openReport(state.room))) case .managementTapped: guard state.viewState == .loaded else { return .none } - guard state.room.role == .owner else { return .none } state.modal = .init(kind: .management) return .none case .managementDismissed: @@ -202,11 +219,36 @@ extension ClassDetailFeature { case .codeDismissed: state.modal = nil return .none - case .deadlineTapped: + case .deadlineTapped, .editTapped: + // Android DeadlineEditClick·ManageEditClick 모두 ClassEdit 화면으로 이동한다. guard state.viewState == .loaded else { return .none } guard state.room.role == .owner else { return .none } state.modal = nil - return .send(.delegate(.openDeadline(state.room))) + return .send(.delegate(.openEdit(state.room))) + case .shareTapped: + guard state.viewState == .loaded else { return .none } + state.modal = nil + return .send(.delegate(.openShare(state.room))) + case .leaveTapped: + guard state.viewState == .loaded else { return .none } + guard state.room.role == .member else { return .none } + state.modal = nil + state.isLeaveConfirmation = true + state.customAlert = CustomAlertState( + title: "클래스에서 나가면 해당 클래스의 활동과 결과를 더 이상 확인할 수 없어요.", + confirmTitle: "나가기", + cancelTitle: "뒤로가기", + isDestructive: true, + style: .deleteConfirm + ) + return .none + case .leaveConfirmed: + guard state.room.role == .member, !state.isLoading else { return .none } + state.customAlert = nil + return .send(.async(.leave(state.room.id))) + case .toastShown: + state.toastMessage = nil + return .none case .deleteTapped: guard state.viewState == .loaded else { return .none } guard state.room.role == .owner else { return .none } @@ -242,6 +284,15 @@ extension ClassDetailFeature { await send(.inner(.deleted(id, ClassError.from(error)))) } } + case let .leave(id): + return .run { [classRoomUseCase] send in + do { + try await classRoomUseCase.leaveClass(id: id) + await send(.inner(.left(id, nil))) + } catch { + await send(.inner(.left(id, ClassError.from(error)))) + } + } } } @@ -251,7 +302,7 @@ extension ClassDetailFeature { ) -> Effect { state.isLoading = false switch action { - case let .deleted(_, .some(error)): + case let .deleted(_, .some(error)), let .left(_, .some(error)): state.errorMessage = error.localizedDescription state.customAlert = .alert( title: "요청을 완료하지 못했어요", @@ -260,6 +311,8 @@ extension ClassDetailFeature { return .none case let .deleted(id, .none): return .send(.delegate(.deleted(id))) + case let .left(id, .none): + return .send(.delegate(.left(id))) } } } diff --git a/Projects/Feature/Class/Sources/ClassDetail/View/ClassDetailView.swift b/Projects/Feature/Class/Sources/ClassDetail/View/ClassDetailView.swift index cb4e0176..ef18676c 100644 --- a/Projects/Feature/Class/Sources/ClassDetail/View/ClassDetailView.swift +++ b/Projects/Feature/Class/Sources/ClassDetail/View/ClassDetailView.swift @@ -22,7 +22,7 @@ public struct ClassDetailView: View { public var body: some View { VStack(spacing: 0) { PickeNavigationBar(onBack: { send(.backTapped) }, centerTitle: "클래스 상세") { - if store.viewState == .loaded, store.room.role == .owner { + if store.viewState == .loaded { Button { send(.managementTapped) } label: { Image(systemName: "ellipsis") .font(.system(size: 20)) @@ -54,8 +54,10 @@ public struct ClassDetailView: View { modalBackdrop({ send(.managementDismissed) }) { ClassManagementSheet( room: store.room, - onEdit: { send(.deadlineTapped) }, - onDelete: { send(.deleteTapped) } + onEdit: { send(.editTapped) }, + onShare: { send(.shareTapped) }, + onDelete: { send(.deleteTapped) }, + onLeave: { send(.leaveTapped) } ) } case .deadline: @@ -65,6 +67,11 @@ public struct ClassDetailView: View { } } .customAlert($store.scope(state: \.customAlert, action: \.customAlert)) + .onChange(of: store.toastMessage, initial: true) { _, message in + guard let message else { return } + ToastManager.shared.showError(message) + send(.toastShown) + } } } @@ -72,11 +79,10 @@ private extension ClassDetailView { @ViewBuilder func detailContent() -> some View { ScrollView { + // Android ClassDetailContent: 헤더·정보·배틀·버튼을 20 간격으로 쌓는다. VStack(alignment: .leading, spacing: 20) { - VStack(alignment: .leading, spacing: 16) { - headerSection() - classInformation() - } + headerSection() + classInformation() battleSection() actionButtons() } @@ -107,13 +113,20 @@ private extension ClassDetailView { @ViewBuilder func headerSection() -> some View { - VStack(alignment: .leading, spacing: 12) { - Text(store.room.status == .open ? "진행 중" : "종료") - .pretendardFont(.medium13) - .foregroundStyle(.primary500) - .padding(.horizontal, 6) - .padding(.vertical, 2) - .background(.beige600, in: RoundedRectangle(cornerRadius: 2)) + VStack(alignment: .leading, spacing: 8) { + // Android PickeBadge: 진행 중 SECONDARY(filled), 종료 TERTIARY(회색). + switch store.room.status { + case .open: + Text("진행 중") + .pickeBadge(.filled, size: .tag) + case .closed: + Text("종료") + .pretendardFont(.semiBold12) + .foregroundStyle(.gray300) + .padding(.horizontal, 6) + .padding(.vertical, 2) + .roundedBackground(.gray50) + } Text(store.room.name) .pretendardFont(.semiBold24) @@ -127,7 +140,7 @@ private extension ClassDetailView { Button { send(.membersTapped) } label: { informationRow( "클래스 멤버", - detail: "총 \(store.room.activeMemberCount)명이 참여하고 있어요", + detail: "총 \(store.room.memberCount)명이 참여하고 있어요", actionTitle: "보기" ) } @@ -181,85 +194,37 @@ private extension ClassDetailView { @ViewBuilder func battleSection() -> some View { - VStack(alignment: .leading, spacing: 8) { + // Android ClassDetailBattleSection: `/battle` 응답으로 채운 ClassBattleCard 를 보여준다. + VStack(alignment: .leading, spacing: 12) { Text("이번 클래스 배틀") .pretendardFont(.semiBold15) .foregroundStyle(.gray300) Button { send(.battleTapped) } label: { - HStack(spacing: 8) { - AsyncImage(url: store.room.battle.thumbnailURL) { image in - image.resizable().scaledToFill() - } placeholder: { - Color.beige600 - } - .frame(width: 76, height: 94) - .clipShape(RoundedRectangle(cornerRadius: 2)) - - VStack(alignment: .leading, spacing: 12) { - VStack(alignment: .leading, spacing: 8) { - HStack(spacing: 6) { - if !store.room.battle.categoryDisplayTitle.isEmpty { - Text("#\(store.room.battle.categoryDisplayTitle)") - .pickeBadge(.filled, size: .tag) - } - Text(store.room.battle.title) - .pretendardFont(family: .SemiBold, size: 14) - .foregroundStyle(.gray500) - .lineLimit(1) - } - Text(store.room.battle.summary) - .pretendardFont(.regular13) - .foregroundStyle(.gray300) - .lineLimit(2) - } - if store.room.battle.audioDuration > 0 { - HStack(spacing: 2) { - Spacer(minLength: 0) - Image(systemName: "clock") - .font(.system(size: 12)) - Text("\(store.room.battle.durationMinutes)분") - .pretendardFont(family: .Medium, size: 12) - } - .foregroundStyle(.gray300) - } - } - .frame(height: 94) - Spacer(minLength: 0) - } - .padding(.vertical, 12) - .padding(.horizontal, 14) - .frame(maxWidth: .infinity, alignment: .leading) - .background(.beige50, in: RoundedRectangle(cornerRadius: 2)) - .overlay(RoundedRectangle(cornerRadius: 2).stroke(.beige600, lineWidth: 1)) + ClassSelectedBattleCard( + battle: store.room.battle, + isAIBattle: store.room.battleType == .custom + ) } .buttonStyle(.plain) - .disabled(!store.canParticipateInBattle) } } @ViewBuilder func actionButtons() -> some View { + // Android ClassDetailActionSection: 마감 여부와 관계없이 두 버튼을 모두 둔다. VStack(spacing: 12) { - if store.room.status == .closed { - Button("결과 보기") { - send(store.room.role == .owner ? .reportTapped : .battleTapped) - } - .ctaButtonStyle(.primary, size: .large, height: 52) - } else { - Button { send(.battleTapped) } label: { - Text("배틀 참여") - .pretendardFont(.headingMedium) - .foregroundStyle(.primary500) - .frame(maxWidth: .infinity) - .frame(height: 52) - .background(.primary50, in: RoundedRectangle(cornerRadius: 2)) - } - .buttonStyle(.plain) - .disabled(!store.canParticipateInBattle) - Button("결과 보기") { send(.reportTapped) } - .ctaButtonStyle(.primary, size: .large, height: 52) + Button { send(.battleTapped) } label: { + Text("배틀 참여") + .pretendardFont(.headingMedium) + .foregroundStyle(.primary500) + .frame(maxWidth: .infinity) + .frame(height: 52) + .background(Color.buttonSecondaryBackgroundDefault, in: RoundedRectangle(cornerRadius: 2)) } + .buttonStyle(.plain) + Button("결과 보기") { send(.reportTapped) } + .ctaButtonStyle(.primary, size: .large, height: 52) } } diff --git a/Projects/Feature/Class/Sources/ClassEdit/Reducer/ClassEditFeature.swift b/Projects/Feature/Class/Sources/ClassEdit/Reducer/ClassEditFeature.swift index 0b1a95d4..9cb6cb1d 100644 --- a/Projects/Feature/Class/Sources/ClassEdit/Reducer/ClassEditFeature.swift +++ b/Projects/Feature/Class/Sources/ClassEdit/Reducer/ClassEditFeature.swift @@ -142,19 +142,12 @@ private extension ClassEditFeature { state.isSaving = true state.errorMessage = nil let roomID = state.room.id - let name = state.isNameChanged ? state.trimmedName : nil + // Android ClassEditViewModel.updateClass: 이름은 항상, 마감일은 바뀐 경우만 한 번의 PATCH 로 보낸다. + let name = state.trimmedName let deadline = state.isDeadlineChanged ? state.deadline : nil return .run { [classUseCase] send in let result = await Result { - var updated: ClassRoom? - if let name { - updated = try await classUseCase.updateName(id: roomID, name: name) - } - if let deadline { - updated = try await classUseCase.updateDeadline(id: roomID, deadline: deadline) - } - guard let updated else { throw ClassError.userMessage("변경할 내용이 없어요.") } - return updated + try await classUseCase.updateClass(id: roomID, name: name, deadline: deadline) } .mapError(ClassError.from) await send(.inner(.saveResponse(result))) diff --git a/Projects/Feature/Class/Sources/ClassEdit/View/ClassEditView.swift b/Projects/Feature/Class/Sources/ClassEdit/View/ClassEditView.swift index 4c120119..0b9352d8 100644 --- a/Projects/Feature/Class/Sources/ClassEdit/View/ClassEditView.swift +++ b/Projects/Feature/Class/Sources/ClassEdit/View/ClassEditView.swift @@ -135,7 +135,7 @@ private extension ClassEditView { func battleSection() -> some View { VStack(alignment: .leading, spacing: 12) { sectionLabel("선택한 배틀") - ClassSelectedBattleCard(battle: store.room.battle) + ClassSelectedBattleCard(battle: store.room.battle, isAIBattle: store.room.battleType == .custom) } } diff --git a/Projects/Feature/Class/Sources/ClassMember/Reducer/ClassMemberFeature.swift b/Projects/Feature/Class/Sources/ClassMember/Reducer/ClassMemberFeature.swift index 0f1dd050..def6f044 100644 --- a/Projects/Feature/Class/Sources/ClassMember/Reducer/ClassMemberFeature.swift +++ b/Projects/Feature/Class/Sources/ClassMember/Reducer/ClassMemberFeature.swift @@ -58,11 +58,9 @@ public struct ClassMemberFeature { viewState = preloadedViewState ?? .loading } + /// Android ClassMemberScreen `class_member_count`: 불러온 명단 전체 인원(검색과 무관), 정원은 표시하지 않는다. public var memberCountTitle: String { - guard let capacity = room.memberCapacity, capacity > 0 else { - return "멤버 \(room.activeMemberCount)" - } - return "멤버 \(room.activeMemberCount) / \(capacity)" + "멤버 \(members.count)" } public var visibleMembers: [ClassMember] { diff --git a/Projects/Feature/Class/Sources/ClassOwnerDashboard/Reducer/ClassOwnerDashboardFeature.swift b/Projects/Feature/Class/Sources/ClassOwnerDashboard/Reducer/ClassOwnerDashboardFeature.swift index 5e00330f..cd1c1c70 100644 --- a/Projects/Feature/Class/Sources/ClassOwnerDashboard/Reducer/ClassOwnerDashboardFeature.swift +++ b/Projects/Feature/Class/Sources/ClassOwnerDashboard/Reducer/ClassOwnerDashboardFeature.swift @@ -328,6 +328,7 @@ public struct ClassOwnerDashboardFeature { case managementTapped case managementDismissed case managementEditTapped + case managementShareTapped case managementDeleteTapped case tabSelected(ClassOwnerTab) case myOpinionsTapped @@ -381,6 +382,7 @@ public struct ClassOwnerDashboardFeature { case dismiss case openMyOpinions(UUID) case editClass + case openShare case deleteClass case openMemberDetail(ClassOwnerMember) case openReplyDetail(ClassOwnerOpinion) @@ -452,6 +454,9 @@ extension ClassOwnerDashboardFeature { case .managementEditTapped: state.management = nil return .send(.delegate(.editClass)) + case .managementShareTapped: + state.management = nil + return .send(.delegate(.openShare)) case .managementDeleteTapped: state.management = nil return .send(.delegate(.deleteClass)) diff --git a/Projects/Feature/Class/Sources/ClassOwnerDashboard/View/ClassOwnerDashboardView.swift b/Projects/Feature/Class/Sources/ClassOwnerDashboard/View/ClassOwnerDashboardView.swift index 9b0830fc..b0af8787 100644 --- a/Projects/Feature/Class/Sources/ClassOwnerDashboard/View/ClassOwnerDashboardView.swift +++ b/Projects/Feature/Class/Sources/ClassOwnerDashboard/View/ClassOwnerDashboardView.swift @@ -53,6 +53,7 @@ public struct ClassOwnerDashboardView: View { ClassManagementSheet( room: store.room, onEdit: { send(.managementEditTapped) }, + onShare: { send(.managementShareTapped) }, onDelete: { send(.managementDeleteTapped) } ) .frame(maxWidth: .infinity) diff --git a/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultContent.swift b/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultContent.swift new file mode 100644 index 00000000..546594d0 --- /dev/null +++ b/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultContent.swift @@ -0,0 +1,24 @@ +// +// ClassResultContent.swift +// Class +// +// Created by Picke on 11/20/26. +// + +import ClassDomainInterface +import Foundation + +/// 결과 화면에 그리는 불러온 내용. 탭 노출 여부는 서버 인사이트·내 리포트 상태로 정한다. +public struct ClassResultContent: Equatable, Sendable { + public var className: String + public var isInProgress: Bool + public var tag: String + public var battleTitle: String + public var deadline: Date + public var hasSummaryTab: Bool + public var hasReportTab: Bool + public var stats: ClassResultStats + public var insight: ClassResultInsightBoard? + public var report: ClassResultMyReportBoard? + public var receivedLikeCount: Int? +} diff --git a/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultTab.swift b/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultTab.swift new file mode 100644 index 00000000..91521231 --- /dev/null +++ b/Projects/Feature/Class/Sources/ClassResult/Model/ClassResultTab.swift @@ -0,0 +1,12 @@ +// +// ClassResultTab.swift +// Class +// +// Created by Picke on 11/20/26. +// + +/// 결과 화면 탭(클래스 요약·내 리포트). +public enum ClassResultTab: String, CaseIterable, Equatable, Sendable { + case summary = "클래스 요약" + case report = "내 리포트" +} diff --git a/Projects/Feature/Class/Sources/ClassResult/Reducer/ClassResultFeature.swift b/Projects/Feature/Class/Sources/ClassResult/Reducer/ClassResultFeature.swift new file mode 100644 index 00000000..536ac65a --- /dev/null +++ b/Projects/Feature/Class/Sources/ClassResult/Reducer/ClassResultFeature.swift @@ -0,0 +1,227 @@ +// +// ClassResultFeature.swift +// Class +// +// Created by Picke on 11/20/26. +// + +import ClassDomainInterface +import ComposableArchitecture +import Foundation + +/// Android `ClassResultScreen`·`ClassResultViewModel` 과 같은 결과 화면. +/// 운영자·멤버가 같은 화면을 쓰고, 서버가 준 상태에 따라 요약·내 리포트 탭을 고른다. +@Reducer +public struct ClassResultFeature { + public init() {} + + @ObservableState + public struct State: Equatable { + public let room: ClassRoom + public var isLoading = true + public var loaded: ClassResultContent? + public var selectedTab: ClassResultTab = .summary + public var isRequesting = false + public var toastMessage: String? + + public init(room: ClassRoom) { + self.room = room + } + + public var isTabVisible: Bool { + guard let loaded else { return false } + return loaded.hasSummaryTab && loaded.hasReportTab + } + + public var visibleTab: ClassResultTab { + guard let loaded else { return selectedTab } + if !loaded.hasSummaryTab { + return .report + } + if !loaded.hasReportTab { + return .summary + } + return selectedTab + } + + public var isInsightRetryEnabled: Bool { + guard let insight = loaded?.insight else { return false } + return insight.state == .failed && insight.retryable && !isRequesting + } + } + + public enum Action: ViewAction { + case view(View) + case inner(InnerAction) + case delegate(DelegateAction) + } + + @CasePathable + public enum View { + case onAppear + case backTapped + case tabSelected(ClassResultTab) + case insightRetryTapped + case myOpinionTapped + case toastShown + } + + public enum InnerAction: Equatable { + case loaded(ClassResultContent, myActivityFailed: Bool) + case loadFailed + case insightRetried + case insightRetryFailed + } + + @CasePathable + public enum DelegateAction: Equatable { + case dismiss + case openMyOpinions(classID: Int) + } + + @Dependency(\.classUseCase) private var classUseCase + + public var body: some Reducer { + Reduce { state, action in + switch action { + case let .view(viewAction): + return handleViewAction(state: &state, action: viewAction) + case let .inner(innerAction): + return handleInnerAction(state: &state, action: innerAction) + case .delegate: + return .none + } + } + } +} + +// MARK: - Action Handlers + +extension ClassResultFeature { + static let loadFailedMessage = "정보를 불러오지 못했어요" + static let actionFailedMessage = "요청을 처리하지 못했어요" + + private func handleViewAction( + state: inout State, + action: View + ) -> Effect { + switch action { + case .onAppear: + guard state.isLoading, state.loaded == nil else { return .none } + return fetchClassResult(classID: state.room.id, isOperator: state.room.role == .owner) + + case .backTapped: + return .send(.delegate(.dismiss)) + + case let .tabSelected(tab): + state.selectedTab = tab + return .none + + case .insightRetryTapped: + guard state.isInsightRetryEnabled else { return .none } + state.isRequesting = true + let classID = state.room.id + return .run { [classUseCase] send in + do { + try await classUseCase.retryInsight(roomID: classID) + await send(.inner(.insightRetried)) + } catch { + await send(.inner(.insightRetryFailed)) + } + } + + case .myOpinionTapped: + return .send(.delegate(.openMyOpinions(classID: state.room.id))) + + case .toastShown: + state.toastMessage = nil + return .none + } + } + + private func handleInnerAction( + state: inout State, + action: InnerAction + ) -> Effect { + switch action { + case let .loaded(loaded, myActivityFailed): + state.isLoading = false + state.loaded = loaded + if myActivityFailed { + state.toastMessage = Self.loadFailedMessage + } + return .none + + case .loadFailed: + state.isLoading = false + state.toastMessage = Self.loadFailedMessage + return .none + + case .insightRetried: + // 재생성 요청이 접수되면 서버는 PENDING 을 돌려준다. + state.isRequesting = false + state.loaded?.insight = ClassResultInsightBoard(state: .pending, insightText: nil, retryable: false) + return .none + + case .insightRetryFailed: + state.isRequesting = false + state.toastMessage = Self.actionFailedMessage + return .none + } + } + + /// Android `ClassResultViewModel.fetchClassResult`. + private func fetchClassResult(classID: Int, isOperator: Bool) -> Effect { + .run { [classUseCase] send in + let base: (ClassResult, ClassRoom, ClassBattleSession) + do { + async let result = classUseCase.fetchResult(roomID: classID) + async let detail = classUseCase.fetchClass(id: classID) + async let session = classUseCase.fetchBattle(classID: classID) + base = try await (result, detail, session) + } catch { + await send(.inner(.loadFailed)) + return + } + let (result, detail, session) = base + let hasSummaryTab = isOperator && result.insightState != nil + let hasReportTab = result.myReportState != nil + + async let insightTask: ClassResultInsightBoard? = hasSummaryTab + ? classUseCase.fetchInsightBoard(roomID: classID) + : nil + async let reportTask: ClassResultMyReportBoard? = hasReportTab + ? classUseCase.fetchMyReportBoard(roomID: classID) + : nil + async let activityTask: ClassMyActivity? = hasReportTab + ? classUseCase.fetchMyActivity(roomID: classID, cursor: nil) + : nil + + let insight: ClassResultInsightBoard? + let report: ClassResultMyReportBoard? + do { + insight = try await insightTask + report = try await reportTask + } catch { + await send(.inner(.loadFailed)) + return + } + let activity = try? await activityTask + let categoryName = session.battle.categoryTags.first + let loaded = ClassResultContent( + className: detail.name, + isInProgress: !result.closed, + tag: categoryName.map { "#\($0)" } ?? "", + battleTitle: session.battle.title, + deadline: result.closeAt, + hasSummaryTab: hasSummaryTab, + hasReportTab: hasReportTab, + stats: result.stats, + insight: insight, + report: report, + receivedLikeCount: activity?.receivedLikeCount + ) + await send(.inner(.loaded(loaded, myActivityFailed: hasReportTab && activity == nil))) + } + } +} diff --git a/Projects/Feature/Class/Sources/ClassResult/View/ClassResultView.swift b/Projects/Feature/Class/Sources/ClassResult/View/ClassResultView.swift new file mode 100644 index 00000000..834ba144 --- /dev/null +++ b/Projects/Feature/Class/Sources/ClassResult/View/ClassResultView.swift @@ -0,0 +1,591 @@ +// +// ClassResultView.swift +// Class +// +// Created by Picke on 11/20/26. +// + +import ClassDomainInterface +import ComposableArchitecture +import PickeCoreUtility +import PickeDesignKit +import PickeSharedUI +import SwiftUI + +/// Android `ClassResultContent` 와 같은 구성: 헤더 → (두 탭이 모두 있을 때만) 탭 바 → 요약 또는 내 리포트. +@ViewAction(for: ClassResultFeature.self) +public struct ClassResultView: View { + @Bindable public var store: StoreOf + + public init(store: StoreOf) { + self.store = store + } + + public var body: some View { + VStack(spacing: 0) { + ClassReportNavigationBar( + title: store.loaded?.className ?? store.room.name, + backAccessibilityIdentifier: "class-result-back", + onBack: { send(.backTapped) } + ) + .padding(.horizontal, 16) + + if store.isLoading { + skeleton() + } else if let loaded = store.loaded { + ScrollView { + LazyVStack(alignment: .leading, spacing: 0, pinnedViews: [.sectionHeaders]) { + header(loaded) + Section { + switch store.visibleTab { + case .summary: + summarySection(loaded) + case .report: + if let report = loaded.report { + reportSection(report, loaded: loaded) + } + } + } header: { + if store.isTabVisible { + tabBar() + } + } + } + } + .scrollIndicators(.hidden) + } else { + PickeLoadFailedSection() + .frame(maxWidth: .infinity) + .padding(16) + Spacer(minLength: 0) + } + } + .screenBackground() + .toolbar(.hidden, for: .navigationBar) + .onAppear { send(.onAppear) } + .onChange(of: store.toastMessage, initial: true) { _, message in + guard let message else { return } + ToastManager.shared.showError(message) + send(.toastShown) + } + } +} + +// MARK: - Header · Tab + +private extension ClassResultView { + @ViewBuilder + func skeleton() -> some View { + ScrollView { + VStack(alignment: .leading, spacing: 16) { + SkeletonView(.round(cornerRadius: 2)).frame(width: 120, height: 20) + SkeletonView(.round(cornerRadius: 2)).frame(height: 31) + SkeletonView(.round(cornerRadius: 2)).frame(height: 88) + SkeletonView(.round(cornerRadius: 2)).frame(width: 150, height: 18) + SkeletonView(.round(cornerRadius: 2)).frame(height: 152) + SkeletonView(.round(cornerRadius: 2)).frame(width: 150, height: 18) + SkeletonView(.round(cornerRadius: 2)).frame(height: 134) + } + .padding(16) + } + .accessibilityLabel("클래스 결과를 불러오는 중") + } + + @ViewBuilder + func header(_ loaded: ClassResultContent) -> some View { + VStack(alignment: .leading, spacing: 12) { + HStack(spacing: 6) { + if loaded.isInProgress { + Text("진행 중") + .pickeBadge(.filled, size: .tag) + } else { + Text("종료") + .pretendardFont(.semiBold12) + .foregroundStyle(.gray300) + .padding(.horizontal, 6) + .padding(.vertical, 2) + .roundedBackground(.gray50) + } + if !loaded.tag.isEmpty { + Text(loaded.tag) + .pickeBadge(.filled, size: .tag) + } + } + VStack(alignment: .leading, spacing: 8) { + Text(loaded.battleTitle) + .pretendardFont(family: .SemiBold, size: 24) + .foregroundStyle(.gray800) + .frame(maxWidth: .infinity, alignment: .leading) + Text(deadlineText(loaded.deadline) + "까지") + .pretendardFont(family: .Regular, size: 13) + .foregroundStyle(.gray300) + } + } + .padding(.horizontal, 16) + .padding(.vertical, 12) + } + + @ViewBuilder + func tabBar() -> some View { + HStack(spacing: 0) { + ForEach(ClassResultTab.allCases, id: \.self) { tab in + let isSelected = store.visibleTab == tab + Button { send(.tabSelected(tab)) } label: { + Text(tab.rawValue) + .pretendardFont(family: .Medium, size: 13) + .foregroundStyle(isSelected ? .primary500 : .gray300) + .frame(maxWidth: .infinity) + .frame(height: 44) + .overlay(alignment: .bottom) { + Rectangle() + .fill(isSelected ? .primary500 : .gray100) + .frame(height: isSelected ? 2 : 1) + } + } + .buttonStyle(.plain) + .accessibilityIdentifier("class-result-tab.\(tab.rawValue)") + } + } + .background(Color.bgBeige) + } + + func deadlineText(_ date: Date) -> String { + date.formatted(.dottedDateTimeWithWeekday) + } +} + +// MARK: - 클래스 요약 탭 + +private extension ClassResultView { + @ViewBuilder + func summarySection(_ loaded: ClassResultContent) -> some View { + VStack(alignment: .leading, spacing: 24) { + if let insight = loaded.insight { + aiInsightCard(insight, deadline: loaded.deadline) + } + + titledBlock("클래스 참여 현황", size: 14) { + participationCard(loaded.stats) + } + + titledBlock("입장 분포", size: 14) { + ClassResultStanceCard(options: loaded.stats.options) + } + // Android: 주요 의견은 BEST·최다 논쟁 댓글이 모두 있을 때만 보인다(현재 서버 연동 전이라 항상 숨김). + } + .padding(.horizontal, 16) + .padding(.top, 16) + .padding(.bottom, 24) + } + + @ViewBuilder + func aiInsightCard(_ insight: ClassResultInsightBoard, deadline: Date) -> some View { + VStack(alignment: .leading, spacing: 6) { + aiLabel("AI 인사이트", size: 11, family: .Bold) + Text(insightText(insight, deadline: deadline)) + .pretendardFont(family: .Regular, size: 12) + .foregroundStyle(.primary500) + .frame(maxWidth: .infinity, alignment: .leading) + if store.isInsightRetryEnabled { + Button { send(.insightRetryTapped) } label: { + Text("다시 시도") + .pretendardFont(family: .SemiBold, size: 12) + .foregroundStyle(.primary500) + .padding(.horizontal, 10) + .padding(.vertical, 4) + .overlay(Capsule().stroke(.primary500, lineWidth: 1)) + } + .buttonStyle(.plain) + } + } + .padding(12) + .frame(maxWidth: .infinity, alignment: .leading) + .background(Color.surfacePrimarySubtle, in: RoundedRectangle(cornerRadius: 2)) + .overlay(RoundedRectangle(cornerRadius: 2).stroke(.primary100, lineWidth: 1)) + } + + func insightText(_ insight: ClassResultInsightBoard, deadline: Date) -> String { + switch insight.state { + case .beforeClose: + "\(deadlineText(deadline)) 이후 AI 피드백이 제공돼요" + case .pending, .generating: + "생각을 정리하고 있어요" + case .succeeded: + insight.insightText ?? "" + case .limited: + "아직 요약할 의견이 충분하지 않아요" + case .notEligible, .failed: + "AI 요약을 준비하지 못했어요" + } + } + + @ViewBuilder + func participationCard(_ stats: ClassResultStats) -> some View { + VStack(spacing: 16) { + participationRow( + "배틀 참여율", + caption: "참여한 멤버", + count: stats.completedCount, + memberCount: stats.activeMemberCount, + tint: .primary500 + ) + participationRow( + "댓글 작성율", + caption: "댓글을 남긴 멤버", + count: stats.commentWriterCount, + memberCount: stats.activeMemberCount, + tint: .secondary500 + ) + } + .padding(16) + .resultCard() + } + + @ViewBuilder + func participationRow( + _ title: String, + caption: String, + count: Int, + memberCount: Int, + tint: Color + ) -> some View { + let ratio = memberCount > 0 ? min(max(Double(count) / Double(memberCount), 0), 1) : 0 + VStack(spacing: 4) { + VStack(spacing: 6) { + HStack { + Text(title) + .pretendardFont(family: .SemiBold, size: 12) + Spacer() + Text(memberCount > 0 ? "\(ClassResultFormat.rate(ratio * 100))%" : "아직 참여 없음") + .pretendardFont(family: .SemiBold, size: 14) + } + .foregroundStyle(.gray800) + HStack { + Text(caption) + Spacer() + Text("\(count) / \(memberCount)명") + } + .pretendardFont(family: .Regular, size: 11) + .foregroundStyle(.gray300) + } + GeometryReader { geometry in + ZStack(alignment: .leading) { + Capsule().fill(Color.bgSubtle) + Capsule().fill(tint).frame(width: geometry.size.width * ratio) + } + } + .frame(height: 6) + } + } +} + +// MARK: - 내 리포트 탭 + +private extension ClassResultView { + @ViewBuilder + func reportSection( + _ report: ClassResultMyReportBoard, + loaded: ClassResultContent + ) -> some View { + VStack(alignment: .leading, spacing: 24) { + titledBlock("내 투표 결과", size: 13) { + myVoteCard(report, receivedLikeCount: loaded.receivedLikeCount) + } + titledBlock("AI 피드백", size: 13) { + feedbackCard(report, deadline: loaded.deadline) + } + } + .padding(.horizontal, 16) + .padding(.top, 16) + .padding(.bottom, 24) + } + + @ViewBuilder + func myVoteCard(_ report: ClassResultMyReportBoard, receivedLikeCount: Int?) -> some View { + let pre = report.preOptionTitle ?? "" + let post = report.postOptionTitle ?? "" + VStack(spacing: 0) { + HStack(spacing: 0) { + voteColumn("사전 선택", stance: pre) + if pre != post { + Text("입장 변경") + .pretendardFont(family: .SemiBold, size: 10) + .foregroundStyle(.beige50) + .padding(.horizontal, 6) + .padding(.vertical, 2) + .background(.primary500, in: Capsule()) + } + voteColumn("사후 선택", stance: post) + } + .padding(.vertical, 12) + .background(Color.surfaceBeigeSubtle, in: RoundedRectangle(cornerRadius: 2)) + .padding([.horizontal, .top], 16) + + HStack(spacing: 0) { + statColumn(report.perspectiveCount, label: "댓글") + Rectangle().fill(.beige600).frame(width: 1) + statColumn(report.commentCount, label: "대댓글") + Rectangle().fill(.beige600).frame(width: 1) + statColumn(receivedLikeCount, label: "받은 추천") + } + .fixedSize(horizontal: false, vertical: true) + .padding(16) + } + .resultCard() + } + + func voteColumn(_ label: String, stance: String) -> some View { + VStack(spacing: 4) { + Text(label) + .pretendardFont(family: .Medium, size: 11) + .foregroundStyle(.gray300) + Text(stance) + .pretendardFont(family: .SemiBold, size: 12) + .foregroundStyle(.gray800) + .multilineTextAlignment(.center) + } + .frame(maxWidth: .infinity) + } + + func statColumn(_ count: Int?, label: String) -> some View { + VStack(spacing: 0) { + Text(count.map(String.init) ?? "-") + .pretendardFont(family: .Bold, size: 16) + .foregroundStyle(.gray800) + Text(label) + .pretendardFont(family: .Medium, size: 10) + .foregroundStyle(.gray300) + } + .frame(maxWidth: .infinity) + } + + @ViewBuilder + func feedbackCard(_ report: ClassResultMyReportBoard, deadline: Date) -> some View { + VStack(alignment: .leading, spacing: 0) { + if let basis = report.feedback?.judgmentBasis, + !basis.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty + { + VStack(alignment: .leading, spacing: 6) { + aiLabel("내 판단의 기준", size: 12, family: .SemiBold) + Text(basis) + .pretendardFont(family: .Regular, size: 12) + .foregroundStyle(.primary500) + } + .padding(16) + .frame(maxWidth: .infinity, alignment: .leading) + .background(Color.surfacePrimarySubtle) + } + + VStack(alignment: .leading, spacing: 16) { + if let notice = feedbackNotice(report, deadline: deadline) { + Text(notice) + .pretendardFont(family: .Regular, size: 13) + .foregroundStyle(.gray300) + divider() + } + + ForEach(feedbackItems(report), id: \.title) { item in + VStack(alignment: .leading, spacing: 4) { + Text(item.title) + .pretendardFont(family: .SemiBold, size: 12) + .foregroundStyle(.primary500) + Text(item.content) + .pretendardFont(family: .Regular, size: 13) + .foregroundStyle(.textSubtle) + } + .frame(maxWidth: .infinity, alignment: .leading) + divider() + } + + Button { send(.myOpinionTapped) } label: { + HStack { + Text("내가 남긴 의견 \(report.perspectiveCount + report.commentCount)개 보기") + .pretendardFont(family: .Bold, size: 12) + Spacer() + Image(systemName: "chevron.right") + .font(.system(size: 10, weight: .semibold)) + } + .foregroundStyle(.primary500) + .padding(.vertical, 6) + .contentShape(Rectangle()) + } + .buttonStyle(.plain) + } + .padding(16) + } + .clipShape(RoundedRectangle(cornerRadius: 2)) + .resultCard() + } + + /// Android `ClassResultFeedbackBoard.toFeedbackItems` — 고정 제목 3개. + func feedbackItems(_ report: ClassResultMyReportBoard) -> [(title: String, content: String)] { + guard let feedback = report.feedback else { return [] } + var items: [(title: String, content: String)] = [] + if let strength = feedback.strength { + items.append(("이번에 잘한 점", strength)) + } + if let nextFocus = feedback.nextFocus { + items.append(("한 가지 더 살펴볼 점", nextFocus)) + } + items.append(("다음 생각 한 걸음", feedback.nextQuestion)) + return items + } + + func feedbackNotice(_ report: ClassResultMyReportBoard, deadline: Date) -> String? { + switch report.state { + case .beforeClose: + "\(deadlineText(deadline)) 이후 AI 피드백이 제공돼요" + case .notEligible: + "참여를 완료하면 AI 피드백을 받을 수 있어요" + case .pending, .generating: + "생각을 정리하고 있어요" + case .succeeded: + report.feedback?.coverage == "partial" ? "이번 피드백은 일부 발언을 기준으로 작성했어요" : nil + case .limited: + "판단의 이유를 살펴볼 글이 아직 충분하지 않아요" + case .failed: + "AI 요약을 준비하지 못했어요" + } + } +} + +// MARK: - 공통 + +private extension ClassResultView { + func titledBlock( + _ title: String, + size: CGFloat, + @ViewBuilder content: () -> some View + ) -> some View { + VStack(alignment: .leading, spacing: 12) { + Text(title) + .pretendardFont(family: .SemiBold, size: size) + .foregroundStyle(.gray800) + content() + } + .frame(maxWidth: .infinity, alignment: .leading) + } + + func aiLabel(_ title: String, size: CGFloat, family: PretendardFontFamily) -> some View { + HStack(spacing: 6) { + Image(systemName: "sparkle") + .font(.system(size: 10, weight: .bold)) + .foregroundStyle(.beige50) + .frame(width: 20, height: 20) + .background(.primary500, in: RoundedRectangle(cornerRadius: 6)) + Text(title) + .pretendardFont(family: family, size: size) + .foregroundStyle(.primary500) + } + } + + func divider() -> some View { + Rectangle().fill(.beige600).frame(height: 1) + } +} + +private extension View { + func resultCard() -> some View { + background(.beige50, in: RoundedRectangle(cornerRadius: 2)) + .overlay(RoundedRectangle(cornerRadius: 2).stroke(.beige600, lineWidth: 1)) + } +} + +/// Android `formatRate`: 소수 첫째 자리, `.0` 은 생략. +enum ClassResultFormat { + static func rate(_ value: Double) -> String { + let text = String(format: "%.1f", value) + return text.hasSuffix(".0") ? String(text.dropLast(2)) : text + } + + /// Android `stanceRates`: 0.1% 단위로 반올림하고 마지막 항목이 나머지를 가져가 합이 100% 가 되게 한다. + static func stanceRates(_ counts: [Int]) -> [Double]? { + let total = counts.reduce(0, +) + guard total > 0 else { return nil } + let leading = counts.dropLast().map { Int((Double($0) * 1000 / Double(total)).rounded()) } + let last = 1000 - leading.reduce(0, +) + return (leading + [last]).map { Double($0) / 10 } + } +} + +/// Android `ClassResultStanceCard`: 도넛 차트 + 옵션별 사후 투표 수·비율. +struct ClassResultStanceCard: View { + let options: [ClassResultOption] + + private let colors: [Color] = [.primary500, .secondary500] + + var body: some View { + let counts = options.map(\.postVoteCount) + let total = counts.reduce(0, +) + let rates = ClassResultFormat.stanceRates(counts) + HStack(spacing: 24) { + ZStack { + chart(counts: counts, total: total) + VStack(spacing: 0) { + Text("\(total)명") + .pretendardFont(family: .Bold, size: 16) + .foregroundStyle(.gray800) + Text("총 참여") + .pretendardFont(family: .Medium, size: 10) + .foregroundStyle(.gray300) + } + } + .frame(width: 100, height: 100) + + VStack(alignment: .leading, spacing: 12) { + ForEach(Array(options.enumerated()), id: \.element.id) { index, option in + HStack(spacing: 8) { + Circle() + .fill(colors[index % colors.count]) + .frame(width: 8, height: 8) + VStack(alignment: .leading, spacing: 0) { + Text(option.title) + .pretendardFont(family: .SemiBold, size: 12) + .foregroundStyle(.gray800) + .lineLimit(1) + Text("\(option.postVoteCount)명") + .pretendardFont(family: .Medium, size: 11) + .foregroundStyle(.gray300) + } + Spacer(minLength: 8) + Text(rates.map { "\(ClassResultFormat.rate($0[index]))%" } ?? "아직 참여 없음") + .pretendardFont(family: .Bold, size: 12) + .foregroundStyle(.gray800) + } + } + } + .frame(maxWidth: .infinity) + } + .padding(16) + .frame(maxWidth: .infinity, alignment: .leading) + .background(.beige50, in: RoundedRectangle(cornerRadius: 2)) + .overlay(RoundedRectangle(cornerRadius: 2).stroke(.beige600, lineWidth: 1)) + } + + @ViewBuilder + private func chart(counts: [Int], total: Int) -> some View { + let lineWidth: CGFloat = 12 + ZStack { + if total == 0 { + Circle().stroke(Color.bgSubtle, lineWidth: lineWidth) + } else { + ForEach(Array(segments(counts: counts, total: total).enumerated()), id: \.offset) { index, segment in + Circle() + .trim(from: segment.start, to: segment.end) + .stroke(colors[index % colors.count], style: StrokeStyle(lineWidth: lineWidth, lineCap: .butt)) + .rotationEffect(.degrees(-90)) + } + } + } + .padding(lineWidth / 2) + } + + private func segments(counts: [Int], total: Int) -> [(start: CGFloat, end: CGFloat)] { + var start: CGFloat = 0 + return counts.map { count in + let end = start + CGFloat(count) / CGFloat(total) + defer { start = end } + return (start, end) + } + } +} diff --git a/Projects/Feature/Class/Sources/ClassShare/Reducer/ClassShareFeature.swift b/Projects/Feature/Class/Sources/ClassShare/Reducer/ClassShareFeature.swift index b8b40527..7e9f628b 100644 --- a/Projects/Feature/Class/Sources/ClassShare/Reducer/ClassShareFeature.swift +++ b/Projects/Feature/Class/Sources/ClassShare/Reducer/ClassShareFeature.swift @@ -16,32 +16,52 @@ public struct ClassShareFeature { @ObservableState public struct State: Equatable { + public enum ViewState: Equatable { + case loading + case loaded + case error + } + public var room: ClassRoom + /// 클래스 상세·목록의 "참여 코드 공유"로 연 경우. 만들기 직후 공유와 이동 경로가 다르다. + public var isExistingClass: Bool + public var viewState: ViewState = .loading + public var toastMessage: String? - public init(room: ClassRoom) { + public init(room: ClassRoom, isExistingClass: Bool = false) { self.room = room + self.isExistingClass = isExistingClass } /// 마감일을 끈 클래스는 `.distantFuture` 로 만들어지므로 표시하지 않는다. public var deadlineText: String? { guard room.deadline != .distantFuture else { return nil } - return "참여 마감 · \(room.deadline.formatted(.fullKoreanDateTime))" + return "참여 마감・\(room.deadline.formatted(.fullKoreanDateTime))" } + /// Android `class_share_code_message`. public var shareMessage: String { - "[Picke] '\(room.name)' 클래스에 참여해 주세요!\n참여 코드: \(room.joinCode)" + "[픽케] '\(room.name)' 클래스에 초대합니다.\n참여 코드: \(room.joinCode)\n픽케 앱 클래스 탭에서 참여 코드를 입력해 주세요." } } public enum Action: ViewAction { case view(View) + case inner(InnerAction) case delegate(DelegateAction) } @CasePathable public enum View { + case onAppear case closeTapped case enterClassTapped + case toastShown + } + + public enum InnerAction: Equatable { + case loaded(ClassRoom) + case loadFailed } @CasePathable @@ -49,14 +69,20 @@ public struct ClassShareFeature { case dismiss case nameOwner(ClassRoom) case enterClass(ClassRoom) + case openMyClasses } + @Dependency(\.classUseCase) private var classUseCase + public var body: some Reducer { Reduce { state, action in switch action { case let .view(viewAction): return handleViewAction(state: &state, action: viewAction) + case let .inner(innerAction): + return handleInnerAction(state: &state, action: innerAction) + case .delegate: return .none } @@ -72,13 +98,52 @@ extension ClassShareFeature { action: View ) -> Effect { switch action { + case .onAppear: + guard state.viewState == .loading else { return .none } + // Android ClassShareViewModel.fetchClassShare: 상세와 배틀을 함께 받아 선택한 배틀 카드를 채운다. + let classID = state.room.id + return .run { [classUseCase] send in + do { + async let detailRoom = classUseCase.fetchClass(id: classID) + async let session = classUseCase.fetchBattle(classID: classID) + let room = try await detailRoom.applyingBattle(session.battle) + await send(.inner(.loaded(room))) + } catch { + await send(.inner(.loadFailed)) + } + } + case .closeTapped: return .send(.delegate(.dismiss)) case .enterClassTapped: + if state.isExistingClass { + return .send(.delegate(.openMyClasses)) + } return state.room.ownerParticipates ? .send(.delegate(.nameOwner(state.room))) : .send(.delegate(.enterClass(state.room))) + + case .toastShown: + state.toastMessage = nil + return .none + } + } + + private func handleInnerAction( + state: inout State, + action: InnerAction + ) -> Effect { + switch action { + case let .loaded(room): + state.room = room + state.viewState = .loaded + return .none + + case .loadFailed: + state.viewState = .error + state.toastMessage = "정보를 불러오지 못했어요" + return .none } } } diff --git a/Projects/Feature/Class/Sources/ClassShare/View/ClassShareView.swift b/Projects/Feature/Class/Sources/ClassShare/View/ClassShareView.swift index a9224f5a..1f0a7a03 100644 --- a/Projects/Feature/Class/Sources/ClassShare/View/ClassShareView.swift +++ b/Projects/Feature/Class/Sources/ClassShare/View/ClassShareView.swift @@ -30,8 +30,17 @@ public struct ClassShareView: View { ScrollView { VStack(alignment: .leading, spacing: 32) { intro() - codeCard() - battleSection() + // Android ClassShareContent: 로딩은 스켈레톤, 실패는 불러오기 실패 영역. + switch store.viewState { + case .loading: + skeleton() + case .error: + PickeLoadFailedSection() + .frame(maxWidth: .infinity) + case .loaded: + codeCard() + battleSection() + } } .padding(16) } @@ -44,6 +53,12 @@ public struct ClassShareView: View { } .screenBackground() .toolbar(.hidden, for: .navigationBar) + .onAppear { send(.onAppear) } + .onChange(of: store.toastMessage, initial: true) { _, message in + guard let message else { return } + ToastManager.shared.showError(message) + send(.toastShown) + } } } @@ -183,8 +198,23 @@ private extension ClassShareView { .pretendardFont(.semiBold15) .foregroundStyle(.gray800) - ClassSelectedBattleCard(battle: store.room.battle) + ClassSelectedBattleCard( + battle: store.room.battle, + isAIBattle: store.room.battleType == .custom + ) + } + } + + @ViewBuilder + func skeleton() -> some View { + VStack(alignment: .leading, spacing: 32) { + SkeletonView(.round(cornerRadius: 2)).frame(height: 236) + VStack(alignment: .leading, spacing: 12) { + SkeletonView(.round(cornerRadius: 2)).frame(width: 80, height: 20) + SkeletonView(.round(cornerRadius: 2)).frame(height: 150) + } } + .accessibilityLabel("클래스 정보를 불러오는 중") } var enterButton: some View { diff --git a/Projects/Feature/Class/Sources/Common/Components/ClassManagementSheet.swift b/Projects/Feature/Class/Sources/Common/Components/ClassManagementSheet.swift index d3efa706..1a659df3 100644 --- a/Projects/Feature/Class/Sources/Common/Components/ClassManagementSheet.swift +++ b/Projects/Feature/Class/Sources/Common/Components/ClassManagementSheet.swift @@ -12,17 +12,20 @@ import SwiftUI struct ClassManagementSheet: View { let room: ClassRoom let onEdit: () -> Void + let onShare: () -> Void let onDelete: () -> Void let onLeave: (() -> Void)? init( room: ClassRoom, onEdit: @escaping () -> Void, + onShare: @escaping () -> Void, onDelete: @escaping () -> Void, onLeave: (() -> Void)? = nil ) { self.room = room self.onEdit = onEdit + self.onShare = onShare self.onDelete = onDelete self.onLeave = onLeave } @@ -44,10 +47,8 @@ struct ClassManagementSheet: View { row("클래스 정보 수정", detail: "클래스명, 기본 정보를 수정해요.", icon: "pencil", action: onEdit) Rectangle().fill(.beige600).frame(height: 1) } - ShareLink(item: "[Picke] '\(room.name)' 클래스 참여 코드: \(room.joinCode)") { - rowContent("참여 코드 공유", detail: "클래스 참여 코드를 공유해요.", icon: "arrow.up.right") - } - .buttonStyle(.plain) + // Android ClassManageSheet: 참여 코드 공유는 ClassShare 화면으로 이동한다. + row("참여 코드 공유", detail: "클래스 참여 코드를 공유해요.", icon: "arrow.up.right", action: onShare) Rectangle().fill(.beige600).frame(height: 1) if room.role == .owner { row("클래스 삭제", detail: "삭제 후에는 복구할 수 없어요.", icon: "trash", action: onDelete) diff --git a/Projects/Feature/Class/Sources/Common/Components/ClassSelectedBattleCard.swift b/Projects/Feature/Class/Sources/Common/Components/ClassSelectedBattleCard.swift index 2c34a920..3e540ea2 100644 --- a/Projects/Feature/Class/Sources/Common/Components/ClassSelectedBattleCard.swift +++ b/Projects/Feature/Class/Sources/Common/Components/ClassSelectedBattleCard.swift @@ -13,6 +13,14 @@ import SwiftUI /// 설정과 공유 화면에서 선택한 배틀을 보여주는 카드. struct ClassSelectedBattleCard: View { let battle: ClassBattleSummary + /// Android ClassBattleType.isAiBattle(CUSTOM)이면 소요 시간을 숨긴다. + var isAIBattle = false + + /// Android ClassBattleUiModel: 분은 올림, AI 배틀이거나 0분이면 표시하지 않는다. + private var durationMinutes: Int? { + let minutes = (battle.audioDuration + 59) / 60 + return isAIBattle || minutes == 0 ? nil : minutes + } var body: some View { VStack(alignment: .leading, spacing: 16) { @@ -30,19 +38,23 @@ private extension ClassSelectedBattleCard { func battleInfo() -> some View { VStack(alignment: .leading, spacing: 12) { HStack { - Text("#\(battle.categoryDisplayTitle)") - .frame(minHeight: 17) - .pickeBadge(.filled, size: .tag) + if !battle.categoryDisplayTitle.isEmpty { + Text("#\(battle.categoryDisplayTitle)") + .frame(minHeight: 17) + .pickeBadge(.filled, size: .tag) + } Spacer(minLength: 0) - HStack(spacing: 2) { - Image(systemName: "clock") - .pretendardFont(.labelXSmall) - Text("\(battle.durationMinutes)분") - .pretendardFont(.labelSmall) + if let durationMinutes { + HStack(spacing: 2) { + Image(systemName: "clock") + .pretendardFont(.labelXSmall) + Text("\(durationMinutes)분") + .pretendardFont(.labelSmall) + } + .foregroundStyle(.gray300) } - .foregroundStyle(.gray300) } .frame(minHeight: 22) diff --git a/Projects/Feature/Class/Sources/MyClass/Reducer/MyClassFeature.swift b/Projects/Feature/Class/Sources/MyClass/Reducer/MyClassFeature.swift index 2f8a350f..feefa07e 100644 --- a/Projects/Feature/Class/Sources/MyClass/Reducer/MyClassFeature.swift +++ b/Projects/Feature/Class/Sources/MyClass/Reducer/MyClassFeature.swift @@ -78,6 +78,7 @@ public struct MyClassFeature { case managementTapped(Int) case managementDismissed case editClassTapped + case shareTapped case deleteTapped case deleteConfirmed case leaveTapped @@ -101,6 +102,7 @@ public struct MyClassFeature { case dismiss case openRoom(ClassRoom) case openInformation(ClassRoom) + case openShare(ClassRoom) case left(Int) } @@ -205,6 +207,12 @@ extension MyClassFeature { else { return .none } state.modal = nil return .send(.delegate(.openInformation(room))) + case .shareTapped: + // Android MyClass onShareCodeClick: ClassShare 화면으로 이동한다. + guard !state.isLeaving else { return .none } + guard let id = state.selectedRoomID, let room = state.rooms[id: id] else { return .none } + state.modal = nil + return .send(.delegate(.openShare(room))) case .deleteTapped: guard !state.isLeaving, !state.isDeleting else { return .none } guard let id = state.selectedRoomID, diff --git a/Projects/Feature/Class/Sources/MyClass/View/Components/MyClassRoomCard.swift b/Projects/Feature/Class/Sources/MyClass/View/Components/MyClassRoomCard.swift index 8fa5f71f..debe3f91 100644 --- a/Projects/Feature/Class/Sources/MyClass/View/Components/MyClassRoomCard.swift +++ b/Projects/Feature/Class/Sources/MyClass/View/Components/MyClassRoomCard.swift @@ -95,7 +95,7 @@ private extension MyClassRoomCard { HStack(spacing: 6) { metaItem( systemName: "person", - text: "멤버 \(room.activeMemberCount)명" + text: "멤버 \(room.memberCount)명" ) if let deadlineText { diff --git a/Projects/Feature/Class/Sources/MyClass/View/MyClassView.swift b/Projects/Feature/Class/Sources/MyClass/View/MyClassView.swift index 0c7d887e..3b5d4173 100644 --- a/Projects/Feature/Class/Sources/MyClass/View/MyClassView.swift +++ b/Projects/Feature/Class/Sources/MyClass/View/MyClassView.swift @@ -52,6 +52,7 @@ public struct MyClassView: View { ClassManagementSheet( room: room, onEdit: { send(.editClassTapped) }, + onShare: { send(.shareTapped) }, onDelete: { send(.deleteTapped) }, onLeave: { send(.leaveTapped) } ) diff --git a/Projects/Feature/Class/Tests/Sources/ClassDetailTests.swift b/Projects/Feature/Class/Tests/Sources/ClassDetailTests.swift index 72e4a4cc..7e504642 100644 --- a/Projects/Feature/Class/Tests/Sources/ClassDetailTests.swift +++ b/Projects/Feature/Class/Tests/Sources/ClassDetailTests.swift @@ -74,7 +74,10 @@ struct ClassDetailTests { } #expect(store.state.canParticipateInBattle == false) - await store.send(.view(.battleTapped)) + // Android ClassDetail ShowNotParticipatingToast. + await store.send(.view(.battleTapped)) { + $0.toastMessage = "운영자 참여를 켜지 않은 클래스라 배틀에 참여할 수 없어요." + } await store.send(.view(.managementTapped)) { $0.modal = .init(kind: .management) } @@ -83,7 +86,7 @@ struct ClassDetailTests { } @Test - func 선생님은_관리_모달을_닫고_마감일_편집을_상위에_요청한다() async { + func 운영자의_마감일_수정과_클래스_정보_수정은_모두_수정_화면을_연다() async { let room = ClassRoom.mocks[0] let store = TestStore(initialState: makeState(room: room)) { ClassDetailFeature() @@ -92,10 +95,41 @@ struct ClassDetailTests { await store.send(.view(.managementTapped)) { $0.modal = .init(kind: .management) } - await store.send(.view(.deadlineTapped)) { + await store.send(.view(.editTapped)) { + $0.modal = nil + } + await store.receive(\.delegate, .openEdit(room)) + + // Android DeadlineEditClick 도 ClassEdit 로 이동한다. + await store.send(.view(.deadlineTapped)) + await store.receive(\.delegate, .openEdit(room)) + } + + @Test + func 멤버도_관리_시트에서_공유와_나가기를_사용한다() async { + let room = ClassRoom.mockJoinable + let store = TestStore(initialState: makeState(room: room)) { + ClassDetailFeature() + } + + await store.send(.view(.managementTapped)) { + $0.modal = .init(kind: .management) + } + await store.send(.view(.shareTapped)) { $0.modal = nil } - await store.receive(\.delegate, .openDeadline(room)) + await store.receive(\.delegate, .openShare(room)) + + await store.send(.view(.leaveTapped)) { + $0.isLeaveConfirmation = true + $0.customAlert = CustomAlertState( + title: "클래스에서 나가면 해당 클래스의 활동과 결과를 더 이상 확인할 수 없어요.", + confirmTitle: "나가기", + cancelTitle: "뒤로가기", + isDestructive: true, + style: .deleteConfirm + ) + } } @Test @@ -121,25 +155,31 @@ struct ClassDetailTests { } @Test - func 마감된_클래스는_라이브_배틀_대신_결과_진입_화면을_연다() async { + func 마감된_클래스의_배틀_참여는_마감_토스트를_띄운다() async { let room = ClassRoom.mockClosedSociety let store = TestStore(initialState: makeState(room: room)) { ClassDetailFeature() } - await store.send(.view(.battleTapped)) - await store.receive(\.delegate, .openClosedBattle(room)) + // Android ClassDetail ShowDeadlinePassedToast. + await store.send(.view(.battleTapped)) { + $0.toastMessage = "참여 기간이 마감되었어요." + } + await store.send(.view(.toastShown)) { + $0.toastMessage = nil + } } @Test - func 마감된_운영자_배틀_카드도_결과_진입_화면을_연다() async { + func 마감된_운영자도_배틀은_마감_토스트_결과는_결과_화면을_연다() async { let room = ClassRoom.mocks[2] let store = TestStore(initialState: makeState(room: room)) { ClassDetailFeature() } - await store.send(.view(.battleTapped)) - await store.receive(\.delegate, .openClosedBattle(room)) + await store.send(.view(.battleTapped)) { + $0.toastMessage = "참여 기간이 마감되었어요." + } await store.send(.view(.reportTapped)) await store.receive(\.delegate, .openReport(room)) diff --git a/Projects/Feature/Class/Tests/Sources/ClassEditTests.swift b/Projects/Feature/Class/Tests/Sources/ClassEditTests.swift index 2ba1b0f8..1d13f908 100644 --- a/Projects/Feature/Class/Tests/Sources/ClassEditTests.swift +++ b/Projects/Feature/Class/Tests/Sources/ClassEditTests.swift @@ -29,7 +29,7 @@ struct ClassEditTests { } @Test - func 이름만_바꾸면_이름_변경만_요청하고_저장_결과를_전달한다() async { + func 이름만_바꾸면_마감일_없이_PATCH_한_번으로_저장하고_결과를_전달한다() async { let room = makeRoom() let renamed = makeRoom(name: "새 클래스 이름") let calls = LockIsolated<[String]>([]) @@ -37,8 +37,9 @@ struct ClassEditTests { state.name = "새 클래스 이름" let store = TestStore(initialState: state) { ClassEditFeature() } withDependencies: { $0.classRoomUseCase = ClassEditRoomStub( - onUpdateName: { name in calls.withValue { $0.append("name:\(name)") }; return renamed }, - onUpdateDeadline: { _ in calls.withValue { $0.append("deadline") }; return room } + onUpdateName: { _ in renamed }, + onUpdateDeadline: { _ in room }, + calls: calls ) } @@ -50,7 +51,8 @@ struct ClassEditTests { $0.room = renamed } await store.receive(\.delegate, .saved(renamed)) - #expect(calls.value == ["name:새 클래스 이름"]) + // Android ClassEditViewModel.updateClass: 이름은 항상, 마감일은 바뀐 경우만 한 번에 보낸다. + #expect(calls.value == ["class:새 클래스 이름|nil"]) } @Test @@ -166,6 +168,26 @@ struct ClassEditTests { private struct ClassEditRoomStub: ClassRoomInterface { let onUpdateName: @Sendable (String) async throws -> ClassRoom let onUpdateDeadline: @Sendable (Date) async throws -> ClassRoom + var calls: LockIsolated<[String]>? + + init( + onUpdateName: @escaping @Sendable (String) async throws -> ClassRoom, + onUpdateDeadline: @escaping @Sendable (Date) async throws -> ClassRoom, + calls: LockIsolated<[String]>? = nil + ) { + self.onUpdateName = onUpdateName + self.onUpdateDeadline = onUpdateDeadline + self.calls = calls + } + + func updateClass(id _: Int, name: String, deadline: Date?) async throws -> ClassRoom { + calls?.withValue { $0.append("class:\(name)|\(deadline.map { _ in "deadline" } ?? "nil")") } + var updated = try await onUpdateName(name) + if let deadline { + updated = try await onUpdateDeadline(deadline) + } + return updated + } func updateName(id _: Int, name: String) async throws -> ClassRoom { try await onUpdateName(name) diff --git a/Projects/Feature/Class/Tests/Sources/ClassMemberTests.swift b/Projects/Feature/Class/Tests/Sources/ClassMemberTests.swift index 541919ef..652abfad 100644 --- a/Projects/Feature/Class/Tests/Sources/ClassMemberTests.swift +++ b/Projects/Feature/Class/Tests/Sources/ClassMemberTests.swift @@ -15,26 +15,16 @@ import Testing @MainActor struct ClassMemberTests { @Test - func 정원은_알려진_양수일_때만_표시하고_초과_인원도_그대로_보여준다() { - let cases: [(Int?, String)] = [ - (nil, "멤버 22"), - (0, "멤버 22"), - (-1, "멤버 22"), - (30, "멤버 22 / 30"), - ] - for (capacity, expected) in cases { + func 멤버_수는_안드로이드처럼_불러온_명단_인원만_표시하고_정원은_붙이지_않는다() { + let members = (1 ... 4).map { ClassMember(id: $0, name: "참여자\($0)", isOwner: $0 == 1) } + for capacity in [nil, 0, 30] as [Int?] { let state = ClassMemberFeature.State( room: room(memberCount: 22, capacity: capacity), + members: members, instanceID: UUID() ) - #expect(state.memberCountTitle == expected) + #expect(state.memberCountTitle == "멤버 4") } - - let overCapacity = ClassMemberFeature.State( - room: room(memberCount: 31, capacity: 30), - instanceID: UUID() - ) - #expect(overCapacity.memberCountTitle == "멤버 31 / 30") } @Test @@ -55,7 +45,7 @@ struct ClassMemberTests { $0.searchText = "김선생" } #expect(store.state.visibleMembers.count == 1) - #expect(store.state.memberCountTitle == "멤버 22 / 30") + #expect(store.state.memberCountTitle == "멤버 22") let updatedRoom = room(memberCount: 21, capacity: 30) let updatedMembers = Array(members.dropLast()) @@ -63,7 +53,7 @@ struct ClassMemberTests { $0.room = updatedRoom $0.members = updatedMembers } - #expect(store.state.memberCountTitle == "멤버 21 / 30") + #expect(store.state.memberCountTitle == "멤버 21") #expect(store.state.visibleMembers.count == 1) } diff --git a/Projects/Feature/Class/Tests/Sources/ClassResultTests.swift b/Projects/Feature/Class/Tests/Sources/ClassResultTests.swift new file mode 100644 index 00000000..d6fa388e --- /dev/null +++ b/Projects/Feature/Class/Tests/Sources/ClassResultTests.swift @@ -0,0 +1,125 @@ +// +// ClassResultTests.swift +// ClassTests +// +// Created by Picke on 11/20/26. +// + +@testable import Class +import ClassDomainInterface +import ComposableArchitecture +import Foundation +import Testing + +/// Android `ClassResultViewModel`·`ClassResultUiState` 규칙 검증. +@MainActor +struct ClassResultTests { + private let room = ClassRoom.mocks[0] + + private func loaded( + hasSummaryTab: Bool, + hasReportTab: Bool, + insight: ClassResultInsightBoard? = nil + ) -> ClassResultContent { + ClassResultContent( + className: "클래스", + isInProgress: false, + tag: "#철학", + battleTitle: "배틀", + deadline: Date(timeIntervalSince1970: 1_760_000_000), + hasSummaryTab: hasSummaryTab, + hasReportTab: hasReportTab, + stats: .init( + activeMemberCount: 4, + completedCount: 2, + participationRate: 50, + commentWriterCount: 2, + commentRate: 50, + postVoteCount: 3, + options: [] + ), + insight: insight, + report: hasReportTab ? ClassResultMyReportBoard( + state: .succeeded, + preOptionTitle: "찬성", + postOptionTitle: "반대", + perspectiveCount: 1, + commentCount: 2, + feedback: nil + ) : nil, + receivedLikeCount: hasReportTab ? 3 : nil + ) + } + + @Test + func 탭_바는_요약과_내_리포트가_모두_있을_때만_보인다() { + var state = ClassResultFeature.State(room: room) + + state.loaded = loaded(hasSummaryTab: true, hasReportTab: true) + #expect(state.isTabVisible) + #expect(state.visibleTab == .summary) + state.selectedTab = .report + #expect(state.visibleTab == .report) + + // 운영자 참여 끔: 내 리포트 상태가 없으면 요약만, 탭 바 없음. + state.loaded = loaded(hasSummaryTab: true, hasReportTab: false) + #expect(!state.isTabVisible) + #expect(state.visibleTab == .summary) + + // 멤버: 요약 탭 없이 내 리포트만. + state.loaded = loaded(hasSummaryTab: false, hasReportTab: true) + #expect(!state.isTabVisible) + #expect(state.visibleTab == .report) + } + + @Test + func 인사이트_재시도는_실패이면서_재시도_가능할_때만_열린다() { + var state = ClassResultFeature.State(room: room) + state.loaded = loaded( + hasSummaryTab: true, + hasReportTab: false, + insight: .init(state: .failed, insightText: nil, retryable: true) + ) + #expect(state.isInsightRetryEnabled) + state.isRequesting = true + #expect(!state.isInsightRetryEnabled) + + state.isRequesting = false + state.loaded?.insight = .init(state: .limited, insightText: nil, retryable: true) + #expect(!state.isInsightRetryEnabled) + } + + @Test + func 결과를_불러오지_못하면_안드로이드_토스트를_띄운다() async { + let store = TestStore(initialState: ClassResultFeature.State(room: room)) { + ClassResultFeature() + } withDependencies: { + $0.classUseCase = MockClassRepository(rooms: [room], availableRooms: []) + } + + await store.send(.view(.onAppear)) + await store.receive(\.inner, .loadFailed) { + $0.isLoading = false + $0.toastMessage = "정보를 불러오지 못했어요" + } + } + + @Test + func 내_의견_보기는_클래스_ID로_내_의견_화면을_요청한다() async { + var state = ClassResultFeature.State(room: room) + state.isLoading = false + state.loaded = loaded(hasSummaryTab: false, hasReportTab: true) + let store = TestStore(initialState: state) { ClassResultFeature() } + + await store.send(.view(.myOpinionTapped)) + await store.receive(\.delegate, .openMyOpinions(classID: room.id)) + } + + @Test + func 입장_비율은_0점1퍼센트_단위로_합이_100이_되게_나눈다() { + #expect(ClassResultFormat.stanceRates([1, 2]) == [33.3, 66.7]) + #expect(ClassResultFormat.stanceRates([0, 0]) == nil) + #expect(ClassResultFormat.rate(50) == "50") + #expect(ClassResultFormat.rate(33.3) == "33.3") + } +} diff --git a/Projects/Feature/Class/Tests/Sources/ClassShareTests.swift b/Projects/Feature/Class/Tests/Sources/ClassShareTests.swift index a44a874b..46ee5b03 100644 --- a/Projects/Feature/Class/Tests/Sources/ClassShareTests.swift +++ b/Projects/Feature/Class/Tests/Sources/ClassShareTests.swift @@ -20,6 +20,18 @@ struct ClassShareTests { let state = ClassShareFeature.State(room: room) #expect(state.shareMessage.contains(room.name)) #expect(state.shareMessage.contains(room.joinCode)) + // Android class_share_code_message. + #expect(state.shareMessage == "[픽케] '\(room.name)' 클래스에 초대합니다.\n참여 코드: \(room.joinCode)\n픽케 앱 클래스 탭에서 참여 코드를 입력해 주세요.") + } + + @Test + func 기존_클래스에서_연_공유_화면의_클래스로_이동하기는_내_클래스_목록으로_간다() async { + let store = TestStore(initialState: ClassShareFeature.State(room: room, isExistingClass: true)) { + ClassShareFeature() + } + + await store.send(.view(.enterClassTapped)) + await store.receive(\.delegate, .openMyClasses) } @Test @@ -38,7 +50,7 @@ struct ClassShareTests { memberCapacity: room.memberCapacity ) #expect(ClassShareFeature.State(room: noDeadline).deadlineText == nil) - #expect(ClassShareFeature.State(room: room).deadlineText?.hasPrefix("참여 마감 · ") == true) + #expect(ClassShareFeature.State(room: room).deadlineText?.hasPrefix("참여 마감・") == true) } @Test diff --git a/Projects/Service/APIEndpoint/Sources/Class/Room/ClassroomService.swift b/Projects/Service/APIEndpoint/Sources/Class/Room/ClassroomService.swift index 74b634d4..0d35a9e7 100644 --- a/Projects/Service/APIEndpoint/Sources/Class/Room/ClassroomService.swift +++ b/Projects/Service/APIEndpoint/Sources/Class/Room/ClassroomService.swift @@ -11,6 +11,7 @@ public enum ClassroomService { case detail(Int) case updateDeadline(id: Int, deadline: Date) case updateName(id: Int, name: String) + case updateClass(id: Int, name: String, deadline: Date?) case delete(Int) case joinPreview(String) case join(code: String, nickname: String) @@ -24,7 +25,8 @@ extension ClassroomService: PickeDataRequest { switch self { case .myClasses, .create: return ClassroomAPI.classes.description - case let .detail(id), let .delete(id), let .updateDeadline(id, _), let .updateName(id, _): + case let .detail(id), let .delete(id), let .updateDeadline(id, _), let .updateName(id, _), + let .updateClass(id, _, _): return ClassroomAPI.detail(classID: id).description case .joinPreview: return ClassroomAPI.joinPreview.description @@ -39,7 +41,7 @@ extension ClassroomService: PickeDataRequest { switch self { case .myClasses, .detail, .joinPreview: return .get case .create, .join: return .post - case .updateDeadline, .updateName: return .patch + case .updateDeadline, .updateName, .updateClass: return .patch case .delete, .leave: return .delete } } @@ -52,6 +54,8 @@ extension ClassroomService: PickeDataRequest { return UpdateClassBody(name: nil, deadline: deadline.formatted(.serverDateTime)) case let .updateName(_, name): return UpdateClassBody(name: name, deadline: nil) + case let .updateClass(_, name, deadline): + return UpdateClassBody(name: name, deadline: deadline?.formatted(.serverDateTime)) case let .joinPreview(code): return ClassJoinPreviewQuery(inviteCode: code) case let .join(code, nickname): diff --git a/docs/class-android-ios-parity-20261120.md b/docs/class-android-ios-parity-20261120.md new file mode 100644 index 00000000..d937a141 --- /dev/null +++ b/docs/class-android-ios-parity-20261120.md @@ -0,0 +1,32 @@ +# 클래스 기능 Android 동일화 (2026-11-20, iOS 2차 QA 대응) + +기준: `SWYP-Find/Picke-android` `6fbdf86` (`presentation/src/main/java/com/picke/presentation/ui/classroom/` 이하 경로). +QA: 시트 "2차_iOS QA" 실패·보류 항목. + +| QA | Android 근거 | iOS 변경 | +|---|---|---| +| 02 이름 수정 화면 안 뜸 | `classdetail/ClassDetailViewModel.kt:69,77` 마감일 "수정"·"클래스 정보 수정" 모두 `NavigateToEdit` / `classedit/ClassEditViewModel.kt:115` PATCH 1회(이름 항상, 마감일은 바뀐 경우만) | `ClassDetailFeature` `.openEdit` → `ClassCoordinator`가 `classEdit` push, 저장 뒤 상세 재조회. `ClassroomService.updateClass` + `ClassRoomInterface.updateClass` 추가, `ClassEditFeature`는 PATCH 1회 | +| 07 운영자 참여 인원 숫자 | `classmember/ClassMemberScreen.kt:112` "멤버 %d" = 명단 수, `classdetail/ClassDetailScreen.kt:176`·`myclass/component/MyClassCard.kt:128` = `memberCount` | `ClassMemberFeature.memberCountTitle` = `members.count`(정원 표기 제거), 상세·목록 카드는 `memberCount` | +| 08 마감 표시 | `classdetail/ClassDetailScreen.kt:251` 진행 중 SECONDARY / 종료 TERTIARY, `ClassDetailViewModel.kt:134,138` 마감·미참여 토스트, `ClassDetailScreen.kt:326` 버튼 두 개 항상 노출 | 상세 배지 스타일 분리, "배틀 참여" 항상 노출 + "참여 기간이 마감되었어요." / "운영자 참여를 켜지 않은 클래스라 배틀에 참여할 수 없어요." 토스트, "결과 보기"는 역할과 무관하게 결과 화면 | +| 12 공유 화면 입장·카테고리 | `classshare/ClassShareViewModel.kt:70`·`ClassDetailViewModel.kt:108` 상세+`/battle` 병렬 조회, `component/ClassManageSheet.kt:93` 공유 행 → ClassShare, `ClassNavGraph.kt:82` "클래스로 이동하기" → 내 클래스 | `ClassRoom.applyingBattle` 로 카테고리·입장·소요 시간 채움(상세·공유·수정), 관리 시트 공유 행 → 공유 화면(멤버에게도 관리 시트·나가기), 공유 문구 Android `class_share_code_message` | +| 13 멤버 목록에 운영자 없음 | `classmember/ClassMemberViewModel.kt` 서버 `/members` 그대로 표시 | 클라이언트 차이 없음 → 변경 없음(서버 응답 확인 필요) | +| 20 입장분포 그래프·디자인 | `classresult/component/ClassResultAiInsightCard.kt:42` 분홍 카드(근거 목록 없음), `classresult/component/ClassResultStanceCard.kt:156` 도넛, `classresult/model/ClassResultInsightUiModel.kt:15` 주요 의견은 두 댓글이 모두 있을 때만 | 새 `ClassResult` 화면(`Feature/Class/Sources/ClassResult`) — 운영자·멤버 공용 | +| 21 리포트 구조 | `classresult/ClassResultViewModel.kt:88` 탭 조건, `classresult/model/ClassResultUiState.kt:25` 탭 바는 두 탭 모두 있을 때만, `ClassResultMyVoteCard.kt:64` 입장 변경 배지, `ClassResultFeedbackItemUiModel.kt:15` 고정 제목 3개, `ClassResultFeedbackCard.kt:118` "내가 남긴 의견 N개 보기" | `ClassResultFeature`/`ClassResultView`, 상태 보존 모델 `ClassResultInsightBoard`·`ClassResultMyReportBoard` | +| 25 내보낸 사용자 메인 이동 | classroom 패키지에 강제 이동 처리 없음(`classjoin/ClassJoinViewModel.kt` 다이얼로그만) | Android 와 동일하므로 변경 없음(기획 확인 필요) | +| 27 AI 답변 대기 중 삭제 문구 | `classdebate/ClassDebateViewModel.kt:83` 조회 실패 "정보를 불러오지 못했어요", `:119` 요청 실패 "요청을 처리하지 못했어요" 토스트 | `ClassAIChatFeature` 서버 실패를 같은 토스트 문구로 표시 | +| 1차 20 댓글 추가 입력창 | — | 2차 14번 "추가 댓글 등록" 통과 → 변경 없음 | + +기타: 상세 삭제·나가기 뒤 내 클래스 목록으로 돌아가 갱신(`ClassDetailViewModel.kt:178` `NavigateBackAfterClassRemoved`). + +## Codex 교차 점검 (codex-cli 0.170.0, effort xhigh, 판정 REVISE) + +| ID | 지적 | Android 대조 | 처리 | +|---|---|---|---| +| RESULT-01 | 주요 의견 항상 숨김 | `classresult/model/ClassResultInsightUiModel.kt` best·mostDebated 가 TODO 로 `""` → 항상 숨김 | 유지(동일) | +| RESULT-02 | 인사이트 재시도 후 재조회 없음 | `ClassResultViewModel.retryInsight` 응답 1회만 반영 | 유지(동일) | +| RESULT-03 | 사후 선택이 없어도 입장 변경 배지 | `ClassResultReportUiModel.isStanceChanged` = `pre != post`(nil→`""`) | 유지(동일) | +| RESULT-04 | 실패 후 재시도 없음 | `ClassResultScreen` 실패 시 `PickeLoadFailedSection` 만 | 유지(동일) | +| RESULT-05 | 보드 하나 실패 시 전체 실패 | `fetchClassResult` 인사이트·내 리포트 실패 시 전체 실패 | 유지(동일) | +| PLAN-01 | QA 25 기준 미정 | Android 도 처리 없음 | 기획 결정 필요 | + +코드 변경으로 이어진 지적은 없어 재점검은 하지 않았다.