Fix login process after was interrupted (#1505)

app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt

@@ -14,33 +14,39 @@ import javax.inject.Singleton
 
 @Singleton
 @Dao
-interface StudentDao {
+abstract class StudentDao {
 
     @Insert(onConflict = ABORT)
-    suspend fun insertAll(student: List<Student>): List<Long>
+    abstract suspend fun insertAll(student: List<Student>): List<Long>
 
     @Delete
-    suspend fun delete(student: Student)
+    abstract suspend fun delete(student: Student)
 
     @Update(entity = Student::class)
-    suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
+    abstract suspend fun update(studentNickAndAvatar: StudentNickAndAvatar)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
-    suspend fun loadCurrent(): Student?
+    abstract suspend fun loadCurrent(): Student?
 
     @Query("SELECT * FROM Students WHERE id = :id")
-    suspend fun loadById(id: Long): Student?
+    abstract suspend fun loadById(id: Long): Student?
 
     @Query("SELECT * FROM Students")
-    suspend fun loadAll(): List<Student>
+    abstract suspend fun loadAll(): List<Student>
 
     @Transaction
     @Query("SELECT * FROM Students")
-    suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
+    abstract suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    suspend fun updateCurrent(id: Long)
+    abstract suspend fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
-    suspend fun resetCurrent()
+    abstract suspend fun resetCurrent()
+
+    @Transaction
+    open suspend fun switchCurrent(id: Long) {
+        resetCurrent()
+        updateCurrent(id)
+    }
 }

app/src/main/java/io/github/wulkanowy/data/repositories/StudentRepository.kt

@@ -1,7 +1,9 @@
 package io.github.wulkanowy.data.repositories
 
 import android.content.Context
+import androidx.room.withTransaction
 import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
@@ -25,7 +27,8 @@ class StudentRepository @Inject constructor(
     private val studentDb: StudentDao,
     private val semesterDb: SemesterDao,
     private val sdk: Sdk,
-    private val appInfo: AppInfo
+    private val appInfo: AppInfo,
+    private val appDatabase: AppDatabase
 ) {
 
     suspend fun isStudentSaved() = getSavedStudents(false).isNotEmpty()
@@ -92,7 +95,7 @@ class StudentRepository @Inject constructor(
         return student
     }
 
-    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
+    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>) {
         val semesters = studentsWithSemesters.flatMap { it.semesters }
         val students = studentsWithSemesters.map { it.student }
             .map {
@@ -104,16 +107,21 @@ class StudentRepository @Inject constructor(
                     }
                 }
             }
+            .mapIndexed { index, student ->
+                if (index == 0) {
+                    student.copy(isCurrent = true).apply { avatarColor = student.avatarColor }
+                } else student
+            }
 
+        appDatabase.withTransaction {
+            studentDb.resetCurrent()
             semesterDb.insertSemesters(semesters)
-        return studentDb.insertAll(students)
+            studentDb.insertAll(students)
+        }
     }
 
     suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
-        with(studentDb) {
+        studentDb.switchCurrent(studentWithSemesters.student.id)
-            resetCurrent()
-            updateCurrent(studentWithSemesters.student.id)
-        }
     }
 
     suspend fun logoutStudent(student: Student) = studentDb.delete(student)

app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt

@@ -90,10 +90,10 @@ class LoginFormPresenter @Inject constructor(
 
         flowWithResource {
             studentRepository.getStudentsScrapper(
-                email,
+                email = email,
-                password,
+                password = password,
-                host,
+                scrapperBaseUrl = host,
-                symbol
+                symbol = symbol
             )
         }.onEach {
             when (it.status) {

app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt

@@ -78,7 +78,9 @@ class LoginStudentSelectPresenter @Inject constructor(
             when (it.status) {
                 Status.LOADING -> Timber.d("Login student select students load started")
                 Status.SUCCESS -> view?.updateData(studentsWithSemesters.map { studentWithSemesters ->
-                    studentWithSemesters to it.data!!.any { item -> compareStudents(studentWithSemesters.student, item.student) }
+                    studentWithSemesters to it.data!!.any { item ->
+                        compareStudents(studentWithSemesters.student, item.student)
+                    }
                 })
                 Status.ERROR -> {
                     errorHandler.dispatch(it.error!!)
@@ -95,11 +97,8 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     private fun registerStudents(studentsWithSemesters: List<StudentWithSemesters>) {
-        flowWithResource {
+        flowWithResource { studentRepository.saveStudents(studentsWithSemesters) }
-            val savedStudents = studentRepository.saveStudents(studentsWithSemesters)
+            .onEach {
-            val firstRegistered = studentsWithSemesters.first().apply { student.id = savedStudents.first() }
-            studentRepository.switchStudent(firstRegistered)
-        }.onEach {
                 when (it.status) {
                     Status.LOADING -> view?.run {
                         Timber.i("Registration started")
@@ -134,7 +133,10 @@ class LoginStudentSelectPresenter @Inject constructor(
         view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
     }
 
-    private fun logRegisterEvent(studentsWithSemesters: List<StudentWithSemesters>, error: Throwable? = null) {
+    private fun logRegisterEvent(
+        studentsWithSemesters: List<StudentWithSemesters>,
+        error: Throwable? = null
+    ) {
         studentsWithSemesters.forEach { student ->
             analytics.logEvent(
                 "registration_student_select",

app/src/test/java/io/github/wulkanowy/data/repositories/StudentTest.kt

@@ -37,7 +37,8 @@ class StudentTest {
             studentDb,
             semesterDb,
             mockSdk,
-            AppInfo()
+            AppInfo(),
+            mockk()
         )
     }
 

app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt

@@ -89,24 +89,11 @@ class LoginStudentSelectPresenterTest {
     @Test
     fun onSelectedStudentTest() {
         coEvery {
-            studentRepository.saveStudents(
+            studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList())))
-                listOf(
-                    StudentWithSemesters(
-                        testStudent,
-                        emptyList()
-                    )
-                )
-            )
-        } returns listOf(1L)
-        coEvery {
-            studentRepository.switchStudent(
-                StudentWithSemesters(
-                    testStudent,
-                    emptyList()
-                )
-            )
         } just Runs
+
         every { loginStudentSelectView.openMainView() } just Runs
+
         presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
         presenter.onSignIn()
 
@@ -118,18 +105,14 @@ class LoginStudentSelectPresenterTest {
     @Test
     fun onSelectedStudentErrorTest() {
         coEvery {
-            studentRepository.saveStudents(
+            studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList())))
-                listOf(
-                    StudentWithSemesters(
-                        testStudent,
-                        emptyList()
-                    )
-                )
-            )
         } throws testException
+
         coEvery { studentRepository.logoutStudent(testStudent) } just Runs
+
         presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
         presenter.onSignIn()
+
         verify { loginStudentSelectView.showContent(false) }
         verify { loginStudentSelectView.showProgress(true) }
         verify { errorHandler.dispatch(match { testException.message == it.message }) }