From b7f7b16aef883a4572efd9366205b18cfbc50c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Tue, 26 Mar 2024 12:54:07 +0100
Subject: [PATCH] Add logging error from units and symbols during registration
 (#2507)

---
 app/build.gradle                              |  2 +-
 .../data/repositories/StudentRepository.kt    | 23 +++++++++++++++----
 .../wulkanowy/utils/SemesterExtension.kt      |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d7174a2d3..d69ea5a34 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -195,7 +195,7 @@ ext {
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.5.3'
+    implementation 'io.github.wulkanowy:sdk:2.5.4-SNAPSHOT'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
index 61d6255b4..df47d7a63 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt
@@ -42,6 +42,7 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsFromHebe(token, pin, symbol, "")
         .mapToPojo(null)
+        .also { it.logErrors() }
 
     suspend fun getUserSubjectsFromScrapper(
         email: String,
@@ -52,6 +53,7 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getUserSubjectsFromScrapper(email, password, scrapperBaseUrl, domainSuffix, symbol)
         .mapToPojo(password)
+        .also { it.logErrors() }
 
     suspend fun getStudentsHybrid(
         email: String,
@@ -61,6 +63,7 @@ class StudentRepository @Inject constructor(
     ): RegisterUser = wulkanowySdkFactory.create()
         .getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol)
         .mapToPojo(password)
+        .also { it.logErrors() }
 
     suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
         return studentDb.loadStudentsWithSemesters().map { (student, semesters) ->
@@ -195,10 +198,10 @@ class StudentRepository @Inject constructor(
             .authorizePermission(pesel)
 
     suspend fun refreshStudentAfterAuthorize(student: Student, semester: Semester) {
-        val newCurrentApiStudent = wulkanowySdkFactory
-            .create(student, semester)
-            .getCurrentStudent()
-            ?: return Timber.d("Can't find student with id ${student.studentId}")
+        val wulkanowySdk = wulkanowySdkFactory.create(student, semester)
+        val newCurrentApiStudent = runCatching { wulkanowySdk.getCurrentStudent() }
+            .onFailure { Timber.e(it, "Can't find student with id ${student.studentId}") }
+            .getOrNull() ?: return
 
         val studentName = StudentName(
             studentName = "${newCurrentApiStudent.studentName} ${newCurrentApiStudent.studentSurname}"
@@ -221,6 +224,18 @@ class StudentRepository @Inject constructor(
             appDatabase.clearAllTables()
         }
     }
+
+    private fun RegisterUser.logErrors() {
+        val symbolsErrors = symbols.filter { it.error != null }
+            .map { it.error }
+        val unitsErrors = symbols.flatMap { it.schools }
+            .filter { it.error != null }
+            .map { it.error }
+
+        (symbolsErrors + unitsErrors).forEach { error ->
+            Timber.e(error, "Error occurred while fetching students")
+        }
+    }
 }
 
 class NoAuthorizationException : Exception()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
index e3b8a3b4c..6cfc4fa11 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -18,7 +18,7 @@ fun Semester.isCurrent(now: LocalDate = now()): Boolean {
 }
 
 fun List<Semester>.getCurrentOrLast(): Semester {
-    if (isEmpty()) throw RuntimeException("Empty semester list")
+    if (isEmpty()) throw IllegalStateException("Empty semester list")
 
     // when there is only one current semester
     singleOrNull { it.isCurrent() }?.let { return it }