Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor/quest view #113

Merged
merged 2 commits into from
Dec 8, 2022
Merged

Refactor/quest view #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a9e522
[refactor] ํ€˜์ŠคํŠธ ๋“ฑ๋ก์‹œ, ๋ฐฉ์ถœํ•˜๋Š” Notification์ด Date์—์„œ [Date]๋กœ ๋ณ€๊ฒฝ
jinwoong16 Dec 7, 2022
05047d5
[feat] ์ด์ œ quest๋“ฑ๋ก์‹œ, ํ˜„์žฌ ๋‚ ์งœ์— ํ•ด๋‹นํ•˜๋Š” ํ€˜์ŠคํŠธ๋ฉด ํ€˜์ŠคํŠธ๋ทฐ์— ๋‚˜ํƒ€๋‚จ
jinwoong16 Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions DailyQuest/DailyQuest/Domain/UseCases/Home/DefaultEnrollUseCase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,8 @@ extension DefaultEnrollUseCase: EnrollUseCase {
}
.catchAndReturn(false)
.do(onSuccess: { _ in
let today = quests
.filter { quest in
Calendar.current.isDateInToday(quest.date)
}
if !today.isEmpty {
NotificationCenter.default.post(name: .updated, object: Date())
}
let dates = quests.map { $0.date }
NotificationCenter.default.post(name: .updated, object: dates)
})
.asObservable()
}
Expand Down
16 changes: 13 additions & 3 deletions DailyQuest/DailyQuest/Presentation/Home/ViewModel/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import RxCocoa
final class HomeViewModel {
private let questUseCase: QuestUseCase
private var calendarUseCase: CalendarUseCase
private var currentDate = Date()

init(questUseCase: QuestUseCase, calendarUseCase: CalendarUseCase) {
self.questUseCase = questUseCase
Expand Down Expand Up @@ -41,17 +42,26 @@ final class HomeViewModel {
.compactMap { $0.increaseCount() }
.flatMap(questUseCase.update(with:))
.filter({ $0 })
.map { _ in Date() }
.compactMap { [weak self] _ in self?.currentDate }
.asObservable()

let notification = NotificationCenter
.default
.rx
.notification(.updated)
.compactMap({ $0.object as? Date })
.compactMap({ $0.object as? [Date] })
.withUnretained(self)
.compactMap { owner, dates in
let result = dates.filter { date in
Calendar.current.isDate(owner.currentDate, inSameDayAs: date)
}

return !result.isEmpty ? owner.currentDate : nil
}

let data = Observable
.merge(updated, input.viewDidLoad, notification, input.daySelected)
.merge(updated, input.viewDidLoad, input.daySelected, notification)
.do(onNext: { [weak self] date in self?.currentDate = date })
.flatMap(questUseCase.fetch(by:))
.asDriver(onErrorJustReturn: [])

Expand Down