[API/Librus] Fix TeacherFreeDays API problems (#215)

* [Librus] Fix TeacherFreeDays API problems

* [Librus] Small Teacher Free Days Bug fix & improvement

* [Librus] Implementation fix

* Apply suggestions from code review

---------

Co-authored-by: Kuba Szczodrzyński <kuba@szczodrzynski.pl>

Author: KrystianQur

app/src/main/java/pl/szczodrzynski/edziennik/data/api/Errors.kt

@@ -148,6 +148,7 @@ const val ERROR_LIBRUS_MESSAGES_NOT_FOUND                   = 186
 const val ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST            = 187
 const val ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND        = 188
 const val ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT               = 189
+const val ERROR_LIBRUS_API_TEACHER_FREE_DAYS_NOT_PUBLIC     = 190
 
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN        = 201
 const val ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD         = 202

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/Librus.kt

@@ -29,6 +29,9 @@ import pl.szczodrzynski.edziennik.data.db.enums.LoginMethod
 import pl.szczodrzynski.edziennik.data.db.full.AnnouncementFull
 import pl.szczodrzynski.edziennik.data.db.full.EventFull
 import pl.szczodrzynski.edziennik.data.db.full.MessageFull
+import pl.szczodrzynski.edziennik.ext.DAY
+import pl.szczodrzynski.edziennik.ext.HOUR
+import pl.szczodrzynski.edziennik.ext.WEEK
 import pl.szczodrzynski.edziennik.utils.Utils.d
 
 class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, val callback: EdziennikCallback) : EdziennikInterface {
@@ -235,6 +238,11 @@ class Librus(val app: App, val profile: Profile?, val loginStore: LoginStore, va
                                 data.app.config.sync.tokenLibrusList + data.profileId
                         data()
                     }
+                    ERROR_LIBRUS_API_TEACHER_FREE_DAYS_NOT_PUBLIC -> {
+                        d(TAG, "Student not have access to Teacher Free Days resource")
+                        data.setSyncNext(ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS, 1 * WEEK, FeatureType.AGENDA)
+                        data()
+                    }
                     else -> callback.onError(apiError)
                 }
             }

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/LibrusApi.kt

@@ -69,6 +69,7 @@ open class LibrusApi(open val data: DataLibrus, open val lastSync: Long?) {
                         "NoticeboardProblem" -> ERROR_LIBRUS_API_NOTICEBOARD_PROBLEM
                         "DeviceRegistered" -> ERROR_LIBRUS_API_DEVICE_REGISTERED
                         "Maintenance" -> ERROR_LIBRUS_API_MAINTENANCE
+                        "TeacherFreeDaysIsNotActive" -> ERROR_LIBRUS_API_TEACHER_FREE_DAYS_NOT_PUBLIC
                         else -> ERROR_LIBRUS_API_OTHER
                     }.let { errorCode ->
                         if (errorCode !in ignoreErrors) {

app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/librus/data/api/LibrusApiTeacherFreeDays.kt

@@ -29,7 +29,7 @@ class LibrusApiTeacherFreeDays(override val data: DataLibrus,
             data.db.teacherAbsenceTypeDao().getAllNow(profileId).toSparseArray(data.teacherAbsenceTypes) { it.id }
         }
 
-        apiGet(TAG, "TeacherFreeDays") { json ->
+        apiGet(TAG, "Calendars/TeacherFreeDays") { json ->
             val teacherAbsences = json.getJsonArray("TeacherFreeDays")?.asJsonObjectList()
 
             teacherAbsences?.forEach { teacherAbsence ->

app/src/main/res/values/errors.xml

@@ -120,6 +120,7 @@
     <string name="error_187" translatable="false">ERROR_LOGIN_LIBRUS_API_INVALID_REQUEST</string>
     <string name="error_188" translatable="false">ERROR_LIBRUS_MESSAGES_ATTACHMENT_NOT_FOUND</string>
     <string name="error_189" translatable="false">ERROR_LOGIN_LIBRUS_MESSAGES_TIMEOUT</string>
+    <string name="error_190" translatable="false">ERROR_LIBRUS_API_TEACHER_FREE_DAYS_NOT_PUBLIC</string>
 
     <string name="error_201" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_INVALID_LOGIN</string>
     <string name="error_202" translatable="false">ERROR_LOGIN_MOBIDZIENNIK_WEB_OLD_PASSWORD</string>