github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-09-19 21:49:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[API/Vulcan] Fix teacher list subjects retrieving.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-10-31 10:12:35 +01:00
parent 3b80adf355
commit c39b5442c9
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/vulcan/data/hebe/VulcanHebeTeachers.kt
View File

@ -4,10 +4,12 @@
package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe package pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.hebe
import androidx.room.OnConflictStrategy
import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TEACHERS import pl.szczodrzynski.edziennik.data.api.VULCAN_HEBE_ENDPOINT_TEACHERS
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.DataVulcan
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TEACHERS import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.ENDPOINT_VULCAN_HEBE_TEACHERS
import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe import pl.szczodrzynski.edziennik.data.api.edziennik.vulcan.data.VulcanHebe
import pl.szczodrzynski.edziennik.data.db.entity.Teacher
import pl.szczodrzynski.edziennik.ext.DAY import pl.szczodrzynski.edziennik.ext.DAY
import pl.szczodrzynski.edziennik.ext.getString import pl.szczodrzynski.edziennik.ext.getString
@ -31,14 +33,26 @@ class VulcanHebeTeachers(
val name = person.getString("Name") val name = person.getString("Name")
val surname = person.getString("Surname") val surname = person.getString("Surname")
val displayName = person.getString("DisplayName") val displayName = person.getString("DisplayName")
val subjectName = person.getString("Description") ?: return@apiGetList val subjectName = person.getString("Description") ?: return@forEach
if (subjectName.isBlank()) {
return@forEach
}
val teacher = data.getTeacherByFirstLast( val teacher = data.getTeacherByFirstLast(
name?.plus(" ")?.plus(surname) ?: displayName ?: return@forEach name?.plus(" ")?.plus(surname) ?: displayName ?: return@forEach
) )
teacher.addSubject(data.getSubject(null, subjectName).id) when (subjectName) {
"Pedagog" -> teacher.setTeacherType(Teacher.TYPE_PEDAGOGUE)
else -> {
val subjectId = data.getSubject(null, subjectName).id
if (!teacher.subjects.contains(subjectId))
teacher.addSubject(subjectId)
}
}
} }
data.teacherOnConflictStrategy = OnConflictStrategy.REPLACE
data.setSyncNext(ENDPOINT_VULCAN_HEBE_TEACHERS, 2 * DAY) data.setSyncNext(ENDPOINT_VULCAN_HEBE_TEACHERS, 2 * DAY)
onSuccess(ENDPOINT_VULCAN_HEBE_TEACHERS) onSuccess(ENDPOINT_VULCAN_HEBE_TEACHERS)
} }