sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Add skipping migration when previous attempt failed (#2508)

Browse Source
This commit is contained in:
Rafał Borcz 2024-03-26 19:19:44 +01:00 committed by GitHub
parent 254719f22f
commit d799ec7ac9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/io/github/wulkanowy/data/WulkanowySdkFactory.kt
View File

@ -23,6 +23,7 @@ class WulkanowySdkFactory @Inject constructor(
) { ) {
private val eduOneMutex = Mutex() private val eduOneMutex = Mutex()
private val migrationFailedStudentIds = mutableSetOf<Long>()
private val sdk = Sdk().apply { private val sdk = Sdk().apply {
androidVersion = android.os.Build.VERSION.RELEASE androidVersion = android.os.Build.VERSION.RELEASE
@ -78,14 +79,24 @@ class WulkanowySdkFactory @Inject constructor(
private suspend fun checkEduOneAndMigrateIfNecessary(student: Student): Boolean { private suspend fun checkEduOneAndMigrateIfNecessary(student: Student): Boolean {
if (student.isEduOne != null) return student.isEduOne if (student.isEduOne != null) return student.isEduOne
if (student.id in migrationFailedStudentIds) {
Timber.i("Migration eduOne: skipping because of previous failure")
return false
}
eduOneMutex.withLock { eduOneMutex.withLock {
if (student.id in migrationFailedStudentIds) {
Timber.i("Migration eduOne: skipping because of previous failure")
return false
}
val studentFromDatabase = studentDb.loadById(student.id) val studentFromDatabase = studentDb.loadById(student.id)
if (studentFromDatabase?.isEduOne != null) { if (studentFromDatabase?.isEduOne != null) {
Timber.d("Migration eduOne: already done") Timber.i("Migration eduOne: already done")
return studentFromDatabase.isEduOne return studentFromDatabase.isEduOne
} }
Timber.d("Migration eduOne: flag missing. Running migration...") Timber.i("Migration eduOne: flag missing. Running migration...")
val initializedSdk = buildSdk( val initializedSdk = buildSdk(
student = student, student = student,
semester = null, semester = null,
@ -96,7 +107,8 @@ class WulkanowySdkFactory @Inject constructor(
.getOrNull() .getOrNull()
if (newCurrentStudent == null) { if (newCurrentStudent == null) {
Timber.d("Migration eduOne: failed, so skipping") Timber.i("Migration eduOne: failed, so skipping")
migrationFailedStudentIds.add(student.id)
return false return false
} }

5
app/src/main/java/io/github/wulkanowy/data/repositories/SemesterRepository.kt
View File

@ -64,7 +64,10 @@ class SemesterRepository @Inject constructor(
.getSemesters() .getSemesters()
.mapToEntities(student.studentId) .mapToEntities(student.studentId)
if (new.isEmpty()) return Timber.i("Empty semester list!") if (new.isEmpty()) {
Timber.i("Empty semester list from SDK!")
return
}
val old = semesterDb.loadAll(student) val old = semesterDb.loadAll(student)
semesterDb.removeOldAndSaveNew( semesterDb.removeOldAndSaveNew(