Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lsj8706
approved these changes
Apr 15, 2023
Comment on lines
+29
to
+35
| // promise(.success(AttendanceScheduleModel(type: "HAS_ATTENDANCE", | ||
| // location: "단국대학교 혜당관", | ||
| // name: "3차 세미나", | ||
| // startDate: "2023-04-06T14:14:00", endDate: "2023-04-06T18:00:00", message: "", | ||
| // attendances: [TodayAttendanceModel(status: "ATTENDANCE", attendedAt: "2023-04-13T14:12:09"), | ||
| // TodayAttendanceModel(status: "ABSENT", attendedAt: | ||
| // "2023-04-13T14:10:04")]))) |
|
|
||
| import Foundation | ||
|
|
||
| public struct AttendanceScheduleModel: Codable, Hashable { |
| image: DSKitAsset.Assets.opStateAttendance.image, | ||
| date: "4월 \(indexPath.row*7+1)일") | ||
| updateTableviewHeight() | ||
| cell.setData(model: attendanceModelList[safe: indexPath.row]!) |
There was a problem hiding this comment.
여기서 강제 언래핑을 한거라면 굳이 safe를 사용할 필요가 없을 것 같아요..!
| .store(in: self.cancelBag) | ||
|
|
||
| output.$scoreModel | ||
| .sink { model in |
L-j-h-c
approved these changes
Apr 15, 2023
Comment on lines
+100
to
+123
| private func convertDateString(_ dateString: String) -> String? { | ||
| let dateFormatter = DateFormatter() | ||
| dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss" | ||
| guard let date = dateFormatter.date(from: dateString) else { return nil } | ||
|
|
||
| dateFormatter.dateFormat = "M월 d일 EEEE H:mm" | ||
| dateFormatter.locale = Locale(identifier: "ko_KR") | ||
| dateFormatter.timeZone = TimeZone(identifier: "Asia/Seoul") | ||
| return dateFormatter.string(from: date) | ||
| } | ||
|
|
||
| func formatTimeInterval(startDate: String, endDate: String) -> String? { | ||
| let dateFormatter = DateFormatter() | ||
| dateFormatter.dateFormat = "M월 d일 EEEE HH:mm" | ||
|
|
||
| guard let startDateObject = dateFormatter.date(from: startDate), | ||
| let endDateObject = dateFormatter.date(from: endDate) else { return nil } | ||
|
|
||
| let formattedStartDate = dateFormatter.string(from: startDateObject) | ||
|
|
||
| dateFormatter.dateFormat = "HH:mm" | ||
| let formattedEndDate = dateFormatter.string(from: endDateObject) | ||
|
|
||
| return "\(formattedStartDate) ~ \(formattedEndDate)" |
There was a problem hiding this comment.
요부분은 Core에 Extension으로 빼줘도 좋을 것 같아요~
Comment on lines
+71
to
+97
| fetchedSchedule.asDriver() | ||
| .sink(receiveValue: { model in | ||
| if model.type != SessionType.noSession.rawValue { | ||
| self.sceneType = .scheduledDay | ||
| guard let convertedStartDate = self.convertDateString(model.startDate), | ||
| let convertedEndDate = self.convertDateString(model.endDate) else { return } | ||
|
|
||
| let newModel = AttendanceScheduleModel(type: model.type, | ||
| location: model.location, | ||
| name: model.name, | ||
| startDate: convertedStartDate, | ||
| endDate: convertedEndDate, | ||
| message: model.message, | ||
| attendances: model.attendances) | ||
| output.scheduleModel = newModel | ||
| } else { | ||
| self.sceneType = .unscheduledDay | ||
| output.scheduleModel = model | ||
| } | ||
| }) | ||
| .store(in: cancelBag) | ||
|
|
||
| fetchedScore.asDriver() | ||
| .sink(receiveValue: { model in | ||
| output.scoreModel = model | ||
| }) | ||
| .store(in: cancelBag) |
There was a problem hiding this comment.
요부분에서 fetchedSchedule과 fetchedScore의 순서가 서로에게 미치는 영향이 없을까요??
만약 순서가 중요하다면, viewDidload publisher를 받아서 한 번의 useCase 함수 호출만 하고, repository에서 flatMap을 통해 서버 호출을 순서대로 할 수 있어요!
Comment on lines
+94
to
+108
| let attributedString = NSMutableAttributedString(string: mainText + pointedText + subText) | ||
|
|
||
| attributedString.addAttributes([NSAttributedString.Key.font: UIFont.Main.body0, | ||
| NSAttributedString.Key.foregroundColor: UIColor.white], | ||
| range: NSRange(location: 0, length: mainText.count)) | ||
|
|
||
| attributedString.addAttributes([NSAttributedString.Key.font: UIFont.Main.headline1, | ||
| NSAttributedString.Key.foregroundColor: DSKitAsset.Colors.purple40.color], | ||
| range: NSRange(location: mainText.count, length: pointedText.count)) | ||
|
|
||
| attributedString.addAttributes([NSAttributedString.Key.font: UIFont.Main.body0, | ||
| NSAttributedString.Key.foregroundColor: UIColor.white], | ||
| range: NSRange(location: mainText.count + pointedText.count, length: subText.count)) | ||
|
|
||
| currentScoreLabel.attributedText = attributedString |
There was a problem hiding this comment.
attributedString을 사용하는 부분이 많아서 나중에 모듈을 따로 만들어도 될 것 같네용~
| private func bindViewModels() { | ||
| let input = ShowAttendanceViewModel.Input() | ||
|
|
||
| let input = ShowAttendanceViewModel.Input(viewDidLoad: viewdidload.asDriver(), |
There was a problem hiding this comment.
요기서 viewDidload.asDriver 말고 Driver.just를 사용하면 PublishSubject를 사용하지 않아도 됩니다!
Comment on lines
+150
to
+157
| if self.viewModel.sceneType == .scheduledDay { | ||
| self.sceneType = .scheduledDay | ||
| self.setScheduledData(model) | ||
| self.headerScheduleView.updateLayout(.scheduledDay) | ||
| } else { | ||
| self.sceneType = .unscheduledDay | ||
| self.headerScheduleView.updateLayout(.unscheduledDay) | ||
| } |
There was a problem hiding this comment.
sceneType은 viewModel에만 두고, viewController에서는 연산 프로퍼티로 get만 가능하게 하는 것이 어떨까요?
viewModel과 VC의 sceneType 모두를 관리하는 것보다 viewModel의 sceneType만 사용하는 것이 관리하기에 편하고, SSOT를 지킬 수 있을 것 같아요..!
|
리뷰 반영은 따로 하고 머지 먼저 진행하겠습니다 !! 🙇🏻♀️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🌴 PR 요약
🌱 작업한 브랜치
🌱 PR Point
📌 참고 사항
📸 스크린샷
📮 관련 이슈