refactor: [database.center] dbFlow to room migration (#2307)

* MIFOSAC-342 [database.center] dbFlow to room migration
openMF · Feb 17, 2025 · 6197a5d · 6197a5d
1 parent 9627113
commit 6197a5d
Show file tree

Hide file tree

Showing 38 changed files with 529 additions and 596 deletions.
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -186,7 +186,7 @@ complexity:
     ignoreArgumentsMatchingNames: false
   NestedBlockDepth:
     active: true
-    threshold: 5
+    threshold: 6
   NestedScopeFunctions:
     active: false
     threshold: 1

diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt
@@ -9,17 +9,13 @@
  */
 package com.mifos.core.data.pagingSource
 
+import android.graphics.pdf.LoadParams
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
-import com.mifos.core.entity.group.Center
 import com.mifos.core.network.datamanager.DataManagerCenter
-import com.mifos.core.objects.clients.Page
-import rx.Subscriber
-import rx.android.schedulers.AndroidSchedulers
-import rx.schedulers.Schedulers
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
+import com.mifos.room.entities.group.Center
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 
 class CenterListPagingSource(private val dataManagerCenter: DataManagerCenter) :
     PagingSource<Int, Center>() {
@@ -55,38 +51,22 @@ class CenterListPagingSource(private val dataManagerCenter: DataManagerCenter) :
         return Pair(pagedClient.pageItems, pagedClient.totalFilteredRecords)
     }
 
-    private suspend fun getCenterDbList(): List<Center> = suspendCoroutine { continuation ->
-        try {
-            dataManagerCenter.allDatabaseCenters
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribeOn(Schedulers.io())
-                .subscribe(object : Subscriber<Page<Center>>() {
-                    override fun onCompleted() {
-                    }
-
-                    override fun onError(error: Throwable) {
-                        continuation.resumeWithException(error)
-                    }
-
-                    override fun onNext(centers: Page<Center>) {
-                        continuation.resume(centers.pageItems)
-                    }
-                })
-        } catch (exception: Exception) {
-            continuation.resumeWithException(exception)
-        }
+    private suspend fun getCenterDbList(): List<Center> {
+        return dataManagerCenter.allDatabaseCenters
+            .map { it.pageItems }
+            .first()
     }
 
     private fun getCenterListWithSync(
         centerList: List<Center>,
         centerDbList: List<Center>,
     ): List<Center> {
         if (centerDbList.isNotEmpty()) {
-            centerList.forEach { center ->
-                centerDbList.forEach { centerDb ->
-                    if (center.id == centerDb.id) {
-                        center.sync = true
-                    }
+            return centerList.map { center ->
+                if (centerDbList.any { it.id == center.id }) {
+                    center.copy(sync = true)
+                } else {
+                    center
                 }
             }
         }

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt
@@ -10,11 +10,10 @@
 package com.mifos.core.data.repository
 
 import androidx.paging.PagingData
-import com.mifos.core.entity.group.Center
-import com.mifos.core.objects.clients.Page
+import com.mifos.core.model.objects.clients.Page
+import com.mifos.room.entities.group.Center
 import com.mifos.room.entities.group.CenterWithAssociations
 import kotlinx.coroutines.flow.Flow
-import rx.Observable
 
 /**
  * Created by Aditya Gupta on 06/08/23.
@@ -25,5 +24,5 @@ interface CenterListRepository {
 
     suspend fun getCentersGroupAndMeeting(id: Int): CenterWithAssociations
 
-    fun allDatabaseCenters(): Observable<Page<Center>>
+    fun allDatabaseCenters(): Flow<Page<Center>>
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt
@@ -9,13 +9,11 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.entity.center.CenterPayload
-import com.mifos.core.objects.responses.SaveResponse
-import rx.Observable
+import com.mifos.room.entities.center.CenterPayload
 
 /**
  * Created by Aditya Gupta on 10/08/23.
  */
 interface CreateNewCenterRepository {
-    fun createCenter(centerPayload: CenterPayload): Observable<SaveResponse>
+    suspend fun createCenter(centerPayload: CenterPayload)
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repository/OfflineDashboardRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/OfflineDashboardRepository.kt
@@ -10,9 +10,9 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest
-import com.mifos.core.entity.center.CenterPayload
 import com.mifos.core.entity.client.ClientPayload
 import com.mifos.room.entities.accounts.loans.LoanRepaymentRequest
+import com.mifos.room.entities.center.CenterPayload
 import com.mifos.room.entities.group.GroupPayload
 import kotlinx.coroutines.flow.Flow
 import rx.Observable
@@ -26,7 +26,7 @@ interface OfflineDashboardRepository {
 
     fun allDatabaseGroupPayload(): Flow<List<GroupPayload>>
 
-    fun allDatabaseCenterPayload(): Observable<List<CenterPayload>>
+    fun allDatabaseCenterPayload(): Flow<List<CenterPayload>>
 
     fun databaseLoanRepayments(): Flow<List<LoanRepaymentRequest>>
 

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt
@@ -9,20 +9,19 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.entity.center.CenterPayload
-import com.mifos.core.objects.responses.SaveResponse
-import rx.Observable
+import com.mifos.room.entities.center.CenterPayload
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 16/08/23.
  */
 interface SyncCenterPayloadsRepository {
 
-    fun allDatabaseCenterPayload(): Observable<List<CenterPayload>>
+    fun allDatabaseCenterPayload(): Flow<List<CenterPayload>>
 
-    fun createCenter(centerPayload: CenterPayload): Observable<SaveResponse>
+    suspend fun createCenter(centerPayload: CenterPayload?)
 
-    fun deleteAndUpdateCenterPayloads(id: Int): Observable<List<CenterPayload>>
+    fun deleteAndUpdateCenterPayloads(id: Int): Flow<List<CenterPayload>>
 
-    fun updateCenterPayload(centerPayload: CenterPayload): Observable<CenterPayload>
+    suspend fun updateCenterPayload(centerPayload: CenterPayload)
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncCentersDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncCentersDialogRepository.kt
@@ -11,12 +11,12 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations
 import com.mifos.core.entity.client.Client
-import com.mifos.core.entity.group.Center
 import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate
 import com.mifos.room.entities.accounts.CenterAccounts
 import com.mifos.room.entities.accounts.ClientAccounts
 import com.mifos.room.entities.accounts.GroupAccounts
 import com.mifos.room.entities.accounts.loans.LoanWithAssociations
+import com.mifos.room.entities.group.Center
 import com.mifos.room.entities.group.CenterWithAssociations
 import com.mifos.room.entities.group.Group
 import com.mifos.room.entities.group.GroupWithAssociations
@@ -29,13 +29,13 @@ import rx.Observable
  */
 interface SyncCentersDialogRepository {
 
-    fun syncCenterAccounts(centerId: Int): Observable<CenterAccounts>
+    fun syncCenterAccounts(centerId: Int): Flow<CenterAccounts>
 
     fun syncLoanById(loanId: Int): Flow<LoanWithAssociations>
 
     fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate>
 
-    fun getCenterWithAssociations(centerId: Int): Observable<CenterWithAssociations>
+    fun getCenterWithAssociations(centerId: Int): Flow<CenterWithAssociations>
 
     fun getGroupWithAssociations(groupId: Int): Observable<GroupWithAssociations>
 
@@ -47,7 +47,7 @@ interface SyncCentersDialogRepository {
 
     fun syncClientInDatabase(client: Client): Observable<Client>
 
-    fun syncCenterInDatabase(center: Center): Observable<Center>
+    suspend fun syncCenterInDatabase(center: Center)
 
     fun syncSavingsAccount(
         type: String?,

diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterListRepositoryImp.kt
@@ -14,12 +14,11 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.mifos.core.data.pagingSource.CenterListPagingSource
 import com.mifos.core.data.repository.CenterListRepository
-import com.mifos.core.entity.group.Center
+import com.mifos.core.model.objects.clients.Page
 import com.mifos.core.network.datamanager.DataManagerCenter
-import com.mifos.core.objects.clients.Page
+import com.mifos.room.entities.group.Center
 import com.mifos.room.entities.group.CenterWithAssociations
 import kotlinx.coroutines.flow.Flow
-import rx.Observable
 import javax.inject.Inject
 
 /**
@@ -43,7 +42,7 @@ class CenterListRepositoryImp @Inject constructor(private val dataManagerCenter:
         return dataManagerCenter.getCentersGroupAndMeeting(id)
     }
 
-    override fun allDatabaseCenters(): Observable<Page<Center>> {
+    override fun allDatabaseCenters(): Flow<Page<Center>> {
         return dataManagerCenter.allDatabaseCenters
     }
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewCenterRepositoryImp.kt
@@ -10,10 +10,8 @@
 package com.mifos.core.data.repositoryImp
 
 import com.mifos.core.data.repository.CreateNewCenterRepository
-import com.mifos.core.entity.center.CenterPayload
 import com.mifos.core.network.datamanager.DataManagerCenter
-import com.mifos.core.objects.responses.SaveResponse
-import rx.Observable
+import com.mifos.room.entities.center.CenterPayload
 import javax.inject.Inject
 
 /**
@@ -22,7 +20,7 @@ import javax.inject.Inject
 class CreateNewCenterRepositoryImp @Inject constructor(private val dataManagerCenter: DataManagerCenter) :
     CreateNewCenterRepository {
 
-    override fun createCenter(centerPayload: CenterPayload): Observable<SaveResponse> {
-        return dataManagerCenter.createCenter(centerPayload)
+    override suspend fun createCenter(centerPayload: CenterPayload) {
+        dataManagerCenter.createCenter(centerPayload)
     }
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/OfflineDashboardRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/OfflineDashboardRepositoryImp.kt
@@ -11,14 +11,14 @@ package com.mifos.core.data.repositoryImp
 
 import com.mifos.core.data.repository.OfflineDashboardRepository
 import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest
-import com.mifos.core.entity.center.CenterPayload
 import com.mifos.core.entity.client.ClientPayload
 import com.mifos.core.network.datamanager.DataManagerCenter
 import com.mifos.core.network.datamanager.DataManagerClient
 import com.mifos.core.network.datamanager.DataManagerGroups
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.room.entities.accounts.loans.LoanRepaymentRequest
+import com.mifos.room.entities.center.CenterPayload
 import com.mifos.room.entities.group.GroupPayload
 import kotlinx.coroutines.flow.Flow
 import rx.Observable
@@ -43,7 +43,7 @@ class OfflineDashboardRepositoryImp @Inject constructor(
         return dataManagerGroups.allDatabaseGroupPayload
     }
 
-    override fun allDatabaseCenterPayload(): Observable<List<CenterPayload>> {
+    override fun allDatabaseCenterPayload(): Flow<List<CenterPayload>> {
         return dataManagerCenter.allDatabaseCenterPayload
     }
 

diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCenterPayloadsRepositoryImp.kt
@@ -10,10 +10,9 @@
 package com.mifos.core.data.repositoryImp
 
 import com.mifos.core.data.repository.SyncCenterPayloadsRepository
-import com.mifos.core.entity.center.CenterPayload
 import com.mifos.core.network.datamanager.DataManagerCenter
-import com.mifos.core.objects.responses.SaveResponse
-import rx.Observable
+import com.mifos.room.entities.center.CenterPayload
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 /**
@@ -22,19 +21,19 @@ import javax.inject.Inject
 class SyncCenterPayloadsRepositoryImp @Inject constructor(private val dataManagerCenter: DataManagerCenter) :
     SyncCenterPayloadsRepository {
 
-    override fun allDatabaseCenterPayload(): Observable<List<CenterPayload>> {
+    override fun allDatabaseCenterPayload(): Flow<List<CenterPayload>> {
         return dataManagerCenter.allDatabaseCenterPayload
     }
 
-    override fun createCenter(centerPayload: CenterPayload): Observable<SaveResponse> {
-        return dataManagerCenter.createCenter(centerPayload)
+    override suspend fun createCenter(centerPayload: CenterPayload?) {
+        dataManagerCenter.createCenter(centerPayload)
     }
 
-    override fun deleteAndUpdateCenterPayloads(id: Int): Observable<List<CenterPayload>> {
+    override fun deleteAndUpdateCenterPayloads(id: Int): Flow<List<CenterPayload>> {
         return dataManagerCenter.deleteAndUpdateCenterPayloads(id)
     }
 
-    override fun updateCenterPayload(centerPayload: CenterPayload): Observable<CenterPayload> {
-        return dataManagerCenter.updateCenterPayload(centerPayload)
+    override suspend fun updateCenterPayload(centerPayload: CenterPayload) {
+        dataManagerCenter.updateCenterPayload(centerPayload)
     }
 }
diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCentersDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCentersDialogRepositoryImp.kt
@@ -12,7 +12,6 @@ package com.mifos.core.data.repositoryImp
 import com.mifos.core.data.repository.SyncCentersDialogRepository
 import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations
 import com.mifos.core.entity.client.Client
-import com.mifos.core.entity.group.Center
 import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate
 import com.mifos.core.network.datamanager.DataManagerCenter
 import com.mifos.core.network.datamanager.DataManagerClient
@@ -23,6 +22,7 @@ import com.mifos.room.entities.accounts.CenterAccounts
 import com.mifos.room.entities.accounts.ClientAccounts
 import com.mifos.room.entities.accounts.GroupAccounts
 import com.mifos.room.entities.accounts.loans.LoanWithAssociations
+import com.mifos.room.entities.group.Center
 import com.mifos.room.entities.group.CenterWithAssociations
 import com.mifos.room.entities.group.Group
 import com.mifos.room.entities.group.GroupWithAssociations
@@ -42,7 +42,7 @@ class SyncCentersDialogRepositoryImp @Inject constructor(
     private val dataManagerClient: DataManagerClient,
 ) : SyncCentersDialogRepository {
 
-    override fun syncCenterAccounts(centerId: Int): Observable<CenterAccounts> {
+    override fun syncCenterAccounts(centerId: Int): Flow<CenterAccounts> {
         return dataManagerCenter.syncCenterAccounts(centerId)
     }
 
@@ -54,7 +54,7 @@ class SyncCentersDialogRepositoryImp @Inject constructor(
         return dataManagerLoan.syncLoanRepaymentTemplate(loanId)
     }
 
-    override fun getCenterWithAssociations(centerId: Int): Observable<CenterWithAssociations> {
+    override fun getCenterWithAssociations(centerId: Int): Flow<CenterWithAssociations> {
         return dataManagerCenter.getCenterWithAssociations(centerId)
     }
 
@@ -78,8 +78,8 @@ class SyncCentersDialogRepositoryImp @Inject constructor(
         return dataManagerClient.syncClientInDatabase(client)
     }
 
-    override fun syncCenterInDatabase(center: Center): Observable<Center> {
-        return dataManagerCenter.syncCenterInDatabase(center)
+    override suspend fun syncCenterInDatabase(center: Center) {
+        dataManagerCenter.syncCenterInDatabase(center)
     }
 
     override fun syncSavingsAccount(

diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt
@@ -16,8 +16,8 @@ import com.mifos.core.entity.group.Center
 import com.mifos.core.entity.group.CenterDate
 import com.mifos.core.entity.group.Group
 import com.mifos.core.entity.group.Group_Table
-import com.mifos.core.objects.clients.Page
-import com.mifos.core.objects.responses.SaveResponse
+import com.mifos.core.model.objects.clients.Page
+import com.mifos.core.model.objects.responses.SaveResponse
 import com.mifos.room.entities.accounts.CenterAccounts
 import com.mifos.room.entities.group.CenterWithAssociations
 import com.raizlabs.android.dbflow.sql.language.Delete