Skip to content

Refactor UploadToShelfService to use User/Health repositories #11630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dogi wants to merge 1 commit into from
Closed

Refactor UploadToShelfService to use User/Health repositories #11630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/src/main/java/org/ole/planet/myplanet/di/ServiceModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,10 @@ object ServiceModule {
@AppPreferences preferences: SharedPreferences,
resourcesRepository: org.ole.planet.myplanet.repository.ResourcesRepository,
coursesRepository: org.ole.planet.myplanet.repository.CoursesRepository,
userRepository: org.ole.planet.myplanet.repository.UserRepository
userRepository: org.ole.planet.myplanet.repository.UserRepository,
healthRepository: org.ole.planet.myplanet.repository.HealthRepository
Copy link
Copy Markdown

@qltysh qltysh bot Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function with many parameters (count = 7): provideUploadToShelfService [qlty:function-parameters]

): UploadToShelfService {
return UploadToShelfService(context, databaseService, preferences, resourcesRepository, coursesRepository, userRepository)
return UploadToShelfService(context, databaseService, preferences, resourcesRepository, coursesRepository, userRepository, healthRepository)
}

@Provides
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/repository/HealthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ interface HealthRepository {
suspend fun getExaminationById(id: String): RealmHealthExamination?
suspend fun initHealth(): RealmMyHealth
suspend fun saveExamination(examination: RealmHealthExamination?, pojo: RealmHealthExamination?, user: RealmUser?)
suspend fun updateHealthUserId(modelId: String, userId: String?)
suspend fun updateHealthRevAndUpdatedStatus(pojoId: String, rev: String?, isUpdated: Boolean)
}
16 changes: 16 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/repository/HealthRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,20 @@ class HealthRepositoryImpl @Inject constructor(
examination?.let { realm.copyToRealmOrUpdate(it) }
}
}

override suspend fun updateHealthUserId(modelId: String, userId: String?) {
executeTransaction { realm ->
val list = realm.where(RealmHealthExamination::class.java).equalTo("_id", modelId).findAll()
for (p in list) {
p.userId = userId
}
}
}

override suspend fun updateHealthRevAndUpdatedStatus(pojoId: String, rev: String?, isUpdated: Boolean) {
update(RealmHealthExamination::class.java, "_id", pojoId) { managedPojo ->
managedPojo._rev = rev
managedPojo.isUpdated = isUpdated
}
}
}
4 changes: 4 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/repository/UserRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ interface UserRepository {
endMillis: Long,
): Map<Int, Int>
suspend fun saveUser(jsonDoc: JsonObject?, settings: SharedPreferences, key: String? = null, iv: String? = null): RealmUser?
suspend fun updateUserIdAndRev(modelId: String, id: String?, rev: String?)
suspend fun updateUserRevAndUpdatedStatus(modelId: String, rev: String?, isUpdated: Boolean)
suspend fun updateUserSecurityKeys(modelId: String, keyString: String?, iv: String?)

suspend fun ensureUserSecurityKeys(userId: String): RealmUser?
suspend fun updateSecurityData(
name: String,
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/repository/UserRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,27 @@ class UserRepositoryImpl @Inject constructor(
}
}

override suspend fun updateUserIdAndRev(modelId: String, id: String?, rev: String?) {
update(RealmUser::class.java, "id", modelId) { managedModel ->
managedModel._id = id
managedModel._rev = rev
}
}

override suspend fun updateUserRevAndUpdatedStatus(modelId: String, rev: String?, isUpdated: Boolean) {
update(RealmUser::class.java, "id", modelId) { managedModel ->
managedModel._rev = rev
managedModel.isUpdated = isUpdated
}
}

override suspend fun updateUserSecurityKeys(modelId: String, keyString: String?, iv: String?) {
update(RealmUser::class.java, "id", modelId) { managedModel ->
managedModel.key = keyString
managedModel.iv = iv
}
}

override suspend fun ensureUserSecurityKeys(userId: String): RealmUser? {
return withRealm { realm ->
val user = realm.where(RealmUser::class.java).equalTo("id", userId).findFirst()
Expand Down
50 changes: 11 additions & 39 deletions app/src/main/java/org/ole/planet/myplanet/services/UploadToShelfService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import org.ole.planet.myplanet.model.RealmMeetup.Companion.getMyMeetUpIds
import org.ole.planet.myplanet.model.RealmRemovedLog.Companion.removedIds
import org.ole.planet.myplanet.model.RealmUser
import org.ole.planet.myplanet.repository.CoursesRepository
import org.ole.planet.myplanet.repository.HealthRepository
import org.ole.planet.myplanet.repository.ResourcesRepository
import org.ole.planet.myplanet.repository.UserRepository
import org.ole.planet.myplanet.utils.AndroidDecrypter.Companion.generateIv
Expand All @@ -46,9 +47,9 @@ class UploadToShelfService @Inject constructor(
@AppPreferences private val sharedPreferences: SharedPreferences,
private val resourcesRepository: ResourcesRepository,
private val coursesRepository: CoursesRepository,
private val userRepository: UserRepository
private val userRepository: UserRepository,
private val healthRepository: HealthRepository
) {
lateinit var mRealm: Realm

fun uploadUserData(listener: OnSuccessListener) {
val apiInterface = client.create(ApiInterface::class.java)
Expand Down Expand Up @@ -141,15 +142,7 @@ class UploadToShelfService @Inject constructor(
model._rev = rev

// Persist _id and _rev to database
dbService.executeTransactionAsync { realm ->
val managedModel = realm.where(RealmUser::class.java).equalTo("id", model.id).findFirst()
if (managedModel != null) {
managedModel._id = id
managedModel._rev = rev
} else {
android.util.Log.e("UploadToShelfService", "Failed to find user model with id: ${model.id} for persisting _id and _rev")
}
}
userRepository.updateUserIdAndRev(model.id ?: "", id, rev)

processUserAfterCreation(apiInterface, model, obj)
}
Expand All @@ -171,9 +164,7 @@ class UploadToShelfService @Inject constructor(
model.iterations = getString("iterations", fetchDataResponse.body())
saveKeyIv(apiInterface, model, obj)

dbService.executeTransactionAsync { realm ->
updateHealthData(realm, model)
}
updateHealthData(model)
}
} catch (e: Exception) {
e.printStackTrace()
Expand All @@ -199,11 +190,7 @@ class UploadToShelfService @Inject constructor(

if (updateResponse.isSuccessful) {
val updatedRev = updateResponse.body()?.get("rev")?.asString
dbService.executeTransactionAsync { realm ->
val managedModel = realm.where(RealmUser::class.java).equalTo("id", model.id).findFirst()
managedModel?._rev = updatedRev
managedModel?.isUpdated = false
}
userRepository.updateUserRevAndUpdatedStatus(model.id ?: "", updatedRev, false)
}
}
} catch (e: Exception) {
Expand All @@ -220,11 +207,8 @@ class UploadToShelfService @Inject constructor(
return "$protocol://$replacedUrl"
}

private fun updateHealthData(realm: Realm, model: RealmUser) {
val list: List<RealmHealthExamination> = realm.where(RealmHealthExamination::class.java).equalTo("_id", model.id).findAll()
for (p in list) {
p.userId = model._id
}
private suspend fun updateHealthData(model: RealmUser) {
healthRepository.updateHealthUserId(model.id ?: "", model._id)
}

suspend fun saveKeyIv(apiInterface: ApiInterface, model: RealmUser, obj: JsonObject) {
Expand Down Expand Up @@ -270,11 +254,7 @@ class UploadToShelfService @Inject constructor(
if (response?.isSuccessful == true && response.body() != null) {
changeUserSecurity(model, obj)

dbService.executeTransactionAsync { realm ->
val managedModel = realm.where(RealmUser::class.java).equalTo("id", model.id).findFirst()
managedModel?.key = keyString
managedModel?.iv = iv
}
userRepository.updateUserSecurityKeys(model.id ?: "", keyString, iv)
} else {
throw IOException("Failed to save key/IV after $maxAttempts attempts")
}
Expand All @@ -297,11 +277,7 @@ class UploadToShelfService @Inject constructor(

if (res.body() != null && res.body()?.has("id") == true) {
val rev = res.body()?.get("rev")?.asString
dbService.executeTransactionAsync { realm ->
val managedPojo = realm.where(RealmHealthExamination::class.java).equalTo("_id", pojo._id).findFirst()
managedPojo?._rev = rev
managedPojo?.isUpdated = false
}
healthRepository.updateHealthRevAndUpdatedStatus(pojo._id ?: "", rev, false)
}
} catch (e: Exception) {
e.printStackTrace()
Expand Down Expand Up @@ -335,11 +311,7 @@ class UploadToShelfService @Inject constructor(

if (res.body() != null && res.body()?.has("id") == true) {
val rev = res.body()?.get("rev")?.asString
dbService.executeTransactionAsync { realm ->
val managedPojo = realm.where(RealmHealthExamination::class.java).equalTo("_id", pojo._id).findFirst()
managedPojo?._rev = rev
managedPojo?.isUpdated = false
}
healthRepository.updateHealthRevAndUpdatedStatus(pojo._id ?: "", rev, false)
}
} catch (e: Exception) {
e.printStackTrace()
Expand Down