From ac39db230ada3f9b427efe23482fb03045c0fc31 Mon Sep 17 00:00:00 2001 From: MINJAE KIM Date: Fri, 5 Apr 2024 18:07:06 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]=20sopt-makers#361=20-=20completion?= =?UTF-8?q?=EC=8B=9C=EC=97=90=EB=8F=84=20=EB=A1=9C=EB=94=A9=20=EB=A9=88?= =?UTF-8?q?=EC=B6=94=EA=B2=8C=EB=81=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Domain/Sources/Model/AttendanceRoundModel.swift | 2 +- .../Domain/Sources/UseCase/ShowAttendanceUseCase.swift | 1 + .../ViewModel/ShowAttendanceViewModel.swift | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SOPT-iOS/Projects/Domain/Sources/Model/AttendanceRoundModel.swift b/SOPT-iOS/Projects/Domain/Sources/Model/AttendanceRoundModel.swift index ddfb392ca..d7fe8784e 100644 --- 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 index e676bbdb2..89cbd1d15 100644 --- 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/SOPT-iOS/Projects/Features/AttendanceFeature/Sources/ShowAttendanceScene/ViewModel/ShowAttendanceViewModel.swift b/SOPT-iOS/Projects/Features/AttendanceFeature/Sources/ShowAttendanceScene/ViewModel/ShowAttendanceViewModel.swift index ab6ea831a..2c286904b 100644 --- a/SOPT-iOS/Projects/Features/AttendanceFeature/Sources/ShowAttendanceScene/ViewModel/ShowAttendanceViewModel.swift +++ b/SOPT-iOS/Projects/Features/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)