Merge pull request #362 from ffalswo2/fix/#361-출석-무한로딩

sopt-makers · Apr 5, 2024 · fe26ae5 · fe26ae5
2 parents 5c21b8e + ac39db2
commit fe26ae5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/SOPT-iOS/Projects/Domain/Sources/Model/AttendanceRoundModel.swift b/SOPT-iOS/Projects/Domain/Sources/Model/AttendanceRoundModel.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public struct AttendanceRoundModel {
+public struct AttendanceRoundModel: Equatable {
     public let subLectureId: Int
     public let round: Int
 

diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/ShowAttendanceUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/ShowAttendanceUseCase.swift
@@ -112,6 +112,7 @@ extension DefaultShowAttendanceUseCase: ShowAttendanceUseCase {
             })
             .sink(receiveCompletion: { event in
                 print("completion: fetchLectureRound \(event)")
+                self.lectureRound.send(.EMPTY)
             }, receiveValue: { result in
                 /// 출석 진행중인데 이미 출석 완료한 경우
                 if self.takenAttendance.rawValue == result?.round {

diff --git a/...res/AttendanceFeature/Sources/ShowAttendanceScene/ViewModel/ShowAttendanceViewModel.swift b/...res/AttendanceFeature/Sources/ShowAttendanceScene/ViewModel/ShowAttendanceViewModel.swift
@@ -133,6 +133,12 @@ extension ShowAttendanceViewModel {
             .compactMap { $0 }
             .withUnretained(self)
             .sink { owner, lectureRound in
+                if lectureRound == .EMPTY {
+                    output.isLoading.send(false)
+                    let buttonInfo = AttendanceButtonInfo(title: I18N.Attendance.takeNthAttendance(2), isEnalbed: false)
+                    output.attendanceButtonInfo.send(buttonInfo)
+                    return
+                }
                 owner.lectureRound = lectureRound
                 let buttonInfo = AttendanceButtonInfo(title: I18N.Attendance.takeNthAttendance(lectureRound.round), isEnalbed: true)
                 output.attendanceButtonInfo.send(buttonInfo)