클래스 API와 Android·Figma 화면 정합성 반영

Projects/App/AuditHost/Sources/MainTabAuditView.swift

@@ -59,6 +59,7 @@ struct MainTabAuditView: View {
     if case var .home(home) = state.homeState.routes[0].screen {
       home.hasLoadedHome = true
       home.hasTriedAttendance = true
+      home.isUnreadBadgeLoading = false
       home.viewState = .loaded
       state.homeState.routes[screenAt: 0] = .home(home)
     }

Projects/App/Sources/Navigation/Class/ClassCoordinator.swift

@@ -61,8 +61,8 @@ public struct ClassCoordinator {
       case let .members(members)?:
         return members.filter == nil && members.editName == nil
           && members.customAlert == nil && !members.isSaving
-      case .ticket?:
-        return true
+      case let .ticket(ticket)?:
+        return ticket.customAlert == nil
       default:
         return false
       }
@@ -190,7 +190,8 @@ public struct ClassCoordinator {
       effect,
       cancelRemovedReportLoads(state: &state),
       cancelRemovedChatObservers(state: &state),
-      cancelRemovedClassEffects(state: &state)
+      cancelRemovedClassEffects(state: &state),
+      cancelRemovedMyOpinionsLoads(state: state)
     )
   }
 }
@@ -450,7 +451,12 @@ private extension ClassCoordinator {
             .cancel(id: ClassAIVoteFeature.CancelID.submit(id)),
           ]
         }
-        + removedTickets.map { .cancel(id: ClassTicketFeature.CancelID.check($0)) }
+        + removedTickets.flatMap { id in
+          [
+            .cancel(id: ClassTicketFeature.CancelID.check(id)),
+            .cancel(id: ClassTicketFeature.CancelID.existingTicket(id)),
+          ]
+        }
         + removedBattleFlows.flatMap { id in
           [
             .cancel(id: ClassBattleFlowFeature.CancelID.load(id)),
@@ -462,6 +468,7 @@ private extension ClassCoordinator {
             .cancel(id: ClassBattleFlowFeature.CancelID.voteStats(id)),
             .cancel(id: ClassBattleFlowFeature.CancelID.perspectiveLike(id)),
             .cancel(id: ClassBattleFlowFeature.CancelID.myPerspective(id)),
+            .cancel(id: ClassBattleFlowFeature.CancelID.perspectiveMutation(id)),
           ]
         }
     guard !removedBattleFlows.isEmpty else { return .merge(effects) }
@@ -481,6 +488,20 @@ private extension ClassCoordinator {
     return .merge(removedIDs.map { .cancel(id: ChatRoomFeature.CancelID.audioObserver($0)) })
   }
 
+  /// 내 의견 화면은 항상 최상단 하나뿐이고 CancelID가 전역이므로, 라우트에 없으면 남은 조회를 모두 취소한다.
+  func cancelRemovedMyOpinionsLoads(state: State) -> Effect<Action> {
+    let hasMyOpinions = state.routes.contains { route in
+      guard case .myOpinions = route.screen else { return false }
+      return true
+    }
+    guard !hasMyOpinions else { return .none }
+    return .merge(
+      .cancel(id: ClassMyOpinionsFeature.CancelID.fetch),
+      .cancel(id: ClassMyOpinionsFeature.CancelID.replies),
+      .cancel(id: ClassMyOpinionsFeature.CancelID.moreReplies)
+    )
+  }
+
   func cancelRemovedReportLoads(state: inout State) -> Effect<Action> {
     let reportIDs = Set(state.routes.compactMap { route -> UUID? in
       guard case let .report(report) = route.screen else { return nil }
@@ -500,14 +521,18 @@ private extension ClassCoordinator {
       cancelledReports.flatMap { id in
         [
           .cancel(id: ClassReportFeature.CancelID.load(id)),
+          .cancel(id: ClassReportFeature.CancelID.voteHistory(id)),
           .cancel(id: ClassReportFeature.CancelID.generate(id)),
+          .cancel(id: ClassReportFeature.CancelID.insight(id)),
+          .cancel(id: ClassReportFeature.CancelID.myActivity(id)),
         ]
       }
         + cancelledDashboards.flatMap { id in
           [
             .cancel(id: ClassOwnerDashboardFeature.CancelID.load(id)),
             .cancel(id: ClassOwnerDashboardFeature.CancelID.generate(id)),
             .cancel(id: ClassOwnerDashboardFeature.CancelID.generatePersonal(id)),
+            .cancel(id: ClassOwnerDashboardFeature.CancelID.myActivity(id)),
           ]
         }
     )
@@ -587,6 +612,30 @@ private extension ClassCoordinator {
       state.routes.push(.ticket(registration))
       return .none
 
+    case let .routeAction(routeID, action: .ticket(.delegate(.existingTicketFound(ticket)))):
+      // 내가 등록한 사용 중 이용권을 다시 입력함: 바로 아래가 개요면 그리로 돌아가고, 아니면 이 화면을 개요로 바꾼다.
+      guard routeID == state.routes.count - 1,
+            case var .ticket(current)? = state.routes.last?.screen
+      else { return .none }
+      if routeID >= 1,
+         case var .ticket(previous) = state.routes[routeID - 1].screen,
+         previous.phase == .overview
+      {
+        state.routes.goBack()
+        previous.ticket = ticket
+        previous.registrationStartDate = ticket.activatedAt
+        previous.expirationDate = ticket.expiresAt
+        state.routes[screenAt: routeID - 1] = .ticket(previous)
+        return .none
+      }
+      current.preview = nil
+      current.ticket = ticket
+      current.registrationStartDate = ticket.activatedAt
+      current.expirationDate = ticket.expiresAt
+      current.phase = .overview
+      state.routes[screenAt: routeID] = .ticket(current)
+      return .none
+
     case let .routeAction(routeID, action: .ticket(.delegate(.dismiss))):
       guard routeID == state.routes.count - 1,
             case .ticket = state.routes.last?.screen
@@ -669,7 +718,11 @@ private extension ClassCoordinator {
       state.routes.push(.myClasses(.init()))
       return .none
 
-    case .routeAction(_, action: .intro(.delegate(.create))):
+    case let .routeAction(routeID, action: .intro(.delegate(.create))):
+      // 이용권 확인 응답이 늦게 와도 소개 화면이 맨 위일 때만 만들기 흐름을 연다.
+      guard routeID == 0, state.routes.count == 1,
+            case .intro = state.routes[0].screen
+      else { return .none }
       invalidateCompletingJoin(state: &state)
       state.routes.push(.startMethod(.init()))
       return .none

Projects/App/Sources/Navigation/MainTab/MainTabCoordinator.swift

@@ -73,7 +73,7 @@ public struct MainTabCoordinator {
       case .classroom:
         return !classState.showsTabBar
       case .myPage:
-        if case .ticket? = myPageState.routes.last?.screen { return false }
+        if case let .ticket(ticket)? = myPageState.routes.last?.screen { return ticket.customAlert != nil }
         return myPageState.routes.count > 1
       case .none:
         return false
@@ -186,19 +186,26 @@ public struct MainTabCoordinator {
         state.selectedTab = Tab.myPage.rawValue
         return .none
 
+      case .classroom(.router(.routeAction(0, action: .intro(.delegate(.registerTicket))))):
+        // 만료 안내의 등록하기: Android와 같이 마이 탭의 코드 입력 화면으로 바로 간다.
+        state.classState.routes.goBackToRoot()
+        state.myPageState.routes.goBackToRoot()
+        var registration = ClassTicketFeature.State()
+        registration.shouldCheckExistingTicket = false
+        state.myPageState.routes.push(.ticket(registration))
+        if state.selectedTab != Tab.myPage.rawValue {
+          state.previousTab = state.selectedTab
+          trackTabSelection(Tab.myPage.rawValue)
+        }
+        state.selectedTab = Tab.myPage.rawValue
+        return .none
+
       case .myPage(.router(.routeAction(_, action: .settings(.delegate(.sessionEnded))))):
         return .send(.delegate(.sessionEnded))
 
       case .myPage(.router(.routeAction(_, action: .withdraw(.delegate(.sessionEnded))))):
         return .send(.delegate(.sessionEnded))
 
-      case .home(.router(.routeAction(_, action: .home(.delegate(.moveToExplore))))):
-        if state.selectedTab != Tab.explore.rawValue {
-          state.previousTab = state.selectedTab
-        }
-        state.selectedTab = Tab.explore.rawValue
-        return .none
-
       case .delegate:
         return .none
 
@@ -233,7 +240,14 @@ private extension MainTabCoordinator {
   ) -> Effect<Action> {
     switch Tab(rawValue: tab) {
     case .home:
-      state.homeState.routes.goBackToRoot()
+      guard state.homeState.routes.count == 1 else {
+        state.homeState.routes.goBackToRoot()
+        return .none
+      }
+      return .send(.home(.router(.routeAction(
+        id: 0,
+        action: .home(.view(.homeTabReselected))
+      ))))
     case .explore:
       state.exploreState.routes.goBackToRoot()
     case .quickBattle:

Projects/App/Sources/Navigation/Profile/ProfileCoordinator.swift

@@ -75,7 +75,12 @@ private extension ProfileCoordinator {
     })
     let removedIDs = state.ticketInstanceIDs.subtracting(currentIDs)
     state.ticketInstanceIDs = currentIDs
-    return .merge(removedIDs.map { .cancel(id: ClassTicketFeature.CancelID.check($0)) })
+    return .merge(removedIDs.flatMap { id in
+      [
+        .cancel(id: ClassTicketFeature.CancelID.check(id)),
+        .cancel(id: ClassTicketFeature.CancelID.existingTicket(id)),
+      ]
+    })
   }
 
   func routerAction(
@@ -215,6 +220,30 @@ private extension ProfileCoordinator {
       state.routes.push(.ticket(overview))
       return .none
 
+    case let .routeAction(routeID, action: .ticket(.delegate(.existingTicketFound(ticket)))):
+      // 내가 등록한 사용 중 이용권을 다시 입력함: 바로 아래가 개요면 그리로 돌아가고, 아니면 이 화면을 개요로 바꾼다.
+      guard routeID == state.routes.count - 1,
+            case var .ticket(current)? = state.routes.last?.screen
+      else { return .none }
+      if routeID >= 1,
+         case var .ticket(previous) = state.routes[routeID - 1].screen,
+         previous.phase == .overview
+      {
+        state.routes.goBack()
+        previous.ticket = ticket
+        previous.registrationStartDate = ticket.activatedAt
+        previous.expirationDate = ticket.expiresAt
+        state.routes[screenAt: routeID - 1] = .ticket(previous)
+        return .none
+      }
+      current.preview = nil
+      current.ticket = ticket
+      current.registrationStartDate = ticket.activatedAt
+      current.expirationDate = ticket.expiresAt
+      current.phase = .overview
+      state.routes[screenAt: routeID] = .ticket(current)
+      return .none
+
     case let .routeAction(routeID, action: .ticket(.delegate(.dismiss))):
       guard routeID == state.routes.count - 1,
             case .ticket = state.routes.last?.screen

Projects/App/Tests/Sources/ClassCoordinatorFeedbackTests.swift

@@ -28,7 +28,11 @@ struct ClassCoordinatorFeedbackTests {
     removed.report = MockClassReport.figma
     removed.sourceViewState = .ready
     var state = ClassCoordinator.State()
-    state.routes.push(.detail(.init(room: room)))
+    state.routes.push(.detail(withDependencies {
+      $0.uuid = .incrementing
+    } operation: {
+      ClassDetailFeature.State(room: room)
+    }))
     state.routes.push(.report(first))
     state.routes.push(.report(removed))
     let store = TestStore(initialState: state) { ClassCoordinator() } withDependencies: {
@@ -69,7 +73,11 @@ struct ClassCoordinatorFeedbackTests {
     original.report = MockClassReport.figma
     original.sourceViewState = .ready
     var state = ClassCoordinator.State()
-    state.routes.push(.detail(.init(room: room)))
+    state.routes.push(.detail(withDependencies {
+      $0.uuid = .incrementing
+    } operation: {
+      ClassDetailFeature.State(room: room)
+    }))
     state.routes.push(.report(original))
     let store = TestStore(initialState: state) { ClassCoordinator() } withDependencies: {
       $0.classResultUseCase = generator
@@ -116,7 +124,11 @@ struct ClassCoordinatorFeedbackTests {
     original.dashboard = MockClassOwnerDashboard.figma
     original.sourceViewState = .ready
     var state = ClassCoordinator.State()
-    state.routes.push(.detail(.init(room: room)))
+    state.routes.push(.detail(withDependencies {
+      $0.uuid = .incrementing
+    } operation: {
+      ClassDetailFeature.State(room: room)
+    }))
     state.routes.push(.ownerDashboard(original))
     let store = TestStore(initialState: state) { ClassCoordinator() } withDependencies: {
       $0.classResultUseCase = generator
@@ -243,6 +255,13 @@ private actor SuspendedFeedbackGenerator: ClassResultInterface {
     throw ClassAIFeedbackError.generationFailed
   }
 
+  func fetchMyActivity(
+    roomID _: Int,
+    cursor _: String?
+  ) async throws -> ClassMyActivity {
+    throw ClassAIFeedbackError.temporarilyUnavailable
+  }
+
   private func suspend<T: Sendable>(
     request: @escaping @Sendable (CheckedContinuation<T, Error>) -> Request
   ) async throws -> T {