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.

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

Fix remove local notifications personal deadlines on delete schedule #867

Merged
merged 1 commit into from
Dec 30, 2020
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -12,16 +12,32 @@ extension NotificationsService {
private static let hoursBeforePersonalDeadlineNotification = [12, 36]

func updatePersonalDeadlineNotifications(for course: Course) {
let contentProviders = self.getLocalNotificationContentProviders(course: course)
for contentProvider in contentProviders {
self.scheduleLocalNotification(with: contentProvider, removeIdentical: true)
}
}

func removePersonalDeadlineNotifications(for course: Course) {
let identifiers = self.getLocalNotificationContentProviders(course: course).map(\.identifier)
self.removeLocalNotifications(withIdentifiers: identifiers)
}

private func getLocalNotificationContentProviders(
course: Course
) -> [PersonalDeadlineLocalNotificationContentProvider] {
var result = [PersonalDeadlineLocalNotificationContentProvider]()

guard let deadlines = course.sectionDeadlines else {
return
return []
}

for deadline in deadlines {
guard let section = course.sections.first(where: { $0.id == deadline.section }) else {
continue
}

NotificationsService.hoursBeforePersonalDeadlineNotification.forEach { hoursBeforeDeadline in
Self.hoursBeforePersonalDeadlineNotification.forEach { hoursBeforeDeadline in
let numberOfSeconds = Double(hoursBeforeDeadline) * 60.0 * 60.0
let fireDate = deadline.deadlineDate.addingTimeInterval(-numberOfSeconds)
let contentProvider = PersonalDeadlineLocalNotificationContentProvider(
@@ -31,8 +47,10 @@ extension NotificationsService {
hoursBeforeDeadline: hoursBeforeDeadline
)

self.scheduleLocalNotification(with: contentProvider, removeIdentical: true)
result.append(contentProvider)
}
}

return result
}
}
Original file line number Diff line number Diff line change
@@ -141,8 +141,8 @@ final class PersonalDeadlinesService: PersonalDeadlinesServiceProtocol {
return
}
storageRecordsAPI.delete(id: record.id).done { _ in
self.notificationsService.removePersonalDeadlineNotifications(for: course)
self.localStorageManager.deleteRecord(for: course)
self.notificationsService.updatePersonalDeadlineNotifications(for: course)
seal.fulfill(())
}.catch {
error in