From c5b173b40a1407e405443b1f947ff77e86128bb9 Mon Sep 17 00:00:00 2001 From: Mateusz T <84911097+matpl11@users.noreply.github.com> Date: Sun, 7 Jul 2024 22:24:50 +0200 Subject: [PATCH] [API/Usos] Remove non-digit characters from student number (#189) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Save only USOS ID number without indexes * Checking student number is or is not empty * Apply suggestions from code review --------- Co-authored-by: Kuba Szczodrzyński --- .../edziennik/data/api/edziennik/usos/data/api/UsosApiUser.kt | 2 +- .../data/api/edziennik/usos/firstlogin/UsosFirstLogin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/data/api/UsosApiUser.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/data/api/UsosApiUser.kt index 29a3e22b..806c2fd8 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/data/api/UsosApiUser.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/data/api/UsosApiUser.kt @@ -53,7 +53,7 @@ class UsosApiUser( data.studentId = json.getInt("id") ?: data.studentId profile?.studentNameLong = studentName profile?.studentNameShort = studentName.getShortName() - profile?.studentNumber = json.getInt("student_number", -1) + profile?.studentNumber = json.getString("student_number")?.replace(Regex("[^0-9]"), "")?.toIntOrNull() ?: -1 profile?.studentClassName = programmes.getJsonObject(0).getJsonObject("programme").getString("id") profile?.studentClassName?.let { diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/firstlogin/UsosFirstLogin.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/firstlogin/UsosFirstLogin.kt index 4d900673..32c9c4c5 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/firstlogin/UsosFirstLogin.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/usos/firstlogin/UsosFirstLogin.kt @@ -68,7 +68,7 @@ class UsosFirstLogin(val data: DataUsos, val onSuccess: () -> Unit) { "studentId" to json.getInt("id"), ), ).also { - it.studentNumber = json.getInt("student_number", -1) + it.studentNumber = json.getString("student_number")?.replace(Regex("[^0-9]"), "")?.toIntOrNull() ?: -1 it.studentClassName = programmes.getJsonObject(0).getJsonObject("programme").getString("id") }