github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Mitigate disappearing teachers in timetable (#485)

Browse Source
This commit is contained in:
Mikołaj Pich
2019-09-04 20:45:34 +02:00
committed by Rafał Borcz
parent e64e6676f3
commit c3bb489851
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
View File

@ -32,10 +32,11 @@ class TimetableRepository @Inject constructor(
.doOnSuccess { old ->
local.deleteTimetable(old.uniqueSubtract(new))
local.saveTimetable(new.uniqueSubtract(old).map { item ->
item.apply {
old.singleOrNull { this.start == it.start }?.let {
return@map copy(
room = if (room.isEmpty()) it.room else room
item.also { new ->
old.singleOrNull { new.start == it.start }?.let { old ->
return@map new.copy(
room = if (new.room.isEmpty()) old.room else new.room,
teacher = if (new.teacher.isEmpty() && !new.changes) old.teacher else new.teacher
)
}
}