update code

core/common/src/main/java/com/mifos/core/common/network/MifosDispatchers.kt

@@ -14,7 +14,7 @@ import kotlin.annotation.AnnotationRetention.RUNTIME
 
 @Qualifier
 @Retention(RUNTIME)
-annotation class Dispatcher(val mifosDispatcher: MifosDispatchers)
+annotation class Dispatcher(val dispatcher: MifosDispatchers)
 
 enum class MifosDispatchers {
     Default,

core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt

@@ -24,7 +24,7 @@ interface LoanRepaymentRepository {
     suspend fun submitPayment(
         loanId: Int,
         request: LoanRepaymentRequest,
-    ): Flow<LoanRepaymentResponse?>
+    ): LoanRepaymentResponse
 
     fun getDatabaseLoanRepaymentByLoanId(loanId: Int): Flow<LoanRepaymentRequest?>
 }

core/data/src/main/java/com/mifos/core/data/repository/SyncCentersDialogRepository.kt

@@ -31,9 +31,9 @@ interface SyncCentersDialogRepository {
 
     fun syncCenterAccounts(centerId: Int): Observable<CenterAccounts>
 
-    suspend fun syncLoanById(loanId: Int): Flow<LoanWithAssociations>
+    fun syncLoanById(loanId: Int): Flow<LoanWithAssociations>
 
-    suspend fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate>
+    fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate>
 
     fun getCenterWithAssociations(centerId: Int): Observable<CenterWithAssociations>
 

core/data/src/main/java/com/mifos/core/data/repository/SyncClientsDialogRepository.kt

@@ -25,7 +25,7 @@ interface SyncClientsDialogRepository {
 
     suspend fun syncClientAccounts(clientId: Int): ClientAccounts
 
-    suspend fun syncLoanById(loanId: Int): Flow<LoanWithAssociations>
+    fun syncLoanById(loanId: Int): Flow<LoanWithAssociations>
 
     fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate>
 

core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt

@@ -25,7 +25,7 @@ interface SyncLoanRepaymentTransactionRepository {
         request: LoanRepaymentRequest,
     ): LoanRepaymentResponse
 
-    suspend fun deleteAndUpdateLoanRepayments(loanId: Int): Flow<List<LoanRepaymentRequest>>
+    fun deleteAndUpdateLoanRepayments(loanId: Int): Flow<List<LoanRepaymentRequest>>
 
     fun updateLoanRepaymentTransaction(
         loanRepaymentRequest: LoanRepaymentRequest,

core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountSummaryRepositoryImp.kt

@@ -9,19 +9,27 @@
  */
 package com.mifos.core.data.repositoryImp
 
+import com.mifos.core.common.network.Dispatcher
+import com.mifos.core.common.network.MifosDispatchers
 import com.mifos.core.data.repository.LoanAccountSummaryRepository
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.room.entities.accounts.loans.LoanWithAssociations
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
 import javax.inject.Inject
 
 /**
  * Created by Aditya Gupta on 08/08/23.
  */
-class LoanAccountSummaryRepositoryImp @Inject constructor(private val dataManagerLoan: DataManagerLoan) :
-    LoanAccountSummaryRepository {
+class LoanAccountSummaryRepositoryImp @Inject constructor(
+    private val dataManagerLoan: DataManagerLoan,
+    @Dispatcher(MifosDispatchers.IO)
+    private val ioDispatcher: CoroutineDispatcher,
+) : LoanAccountSummaryRepository {
 
     override fun getLoanById(loanId: Int): Flow<LoanWithAssociations?> {
         return dataManagerLoan.getLoanById(loanId)
+            .flowOn(ioDispatcher)
     }
 }

core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt

@@ -9,35 +9,43 @@
  */
 package com.mifos.core.data.repositoryImp
 
+import com.mifos.core.common.network.Dispatcher
+import com.mifos.core.common.network.MifosDispatchers
 import com.mifos.core.data.repository.LoanRepaymentRepository
 import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.room.entities.accounts.loans.LoanRepaymentRequest
 import com.mifos.room.entities.accounts.loans.LoanRepaymentResponse
 import com.mifos.room.entities.templates.loans.LoanRepaymentTemplate
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 import javax.inject.Inject
 
 /**
  * Created by Aditya Gupta on 10/08/23.
  */
-class LoanRepaymentRepositoryImp @Inject constructor(private val dataManagerLoan: DataManagerLoan) :
-    LoanRepaymentRepository {
+class LoanRepaymentRepositoryImp @Inject constructor(
+    private val dataManagerLoan: DataManagerLoan,
+    @Dispatcher(MifosDispatchers.IO)
+    private val ioDispatcher: CoroutineDispatcher,
+) : LoanRepaymentRepository {
 
     override fun getLoanRepayTemplate(loanId: Int): Flow<LoanRepaymentTemplate?> {
         return dataManagerLoan.getLoanRepayTemplate(loanId)
+            .flowOn(ioDispatcher)
     }
 
     override suspend fun submitPayment(
         loanId: Int,
         request: LoanRepaymentRequest,
-    ): Flow<LoanRepaymentResponse> {
-        return submitPayment(loanId, request)
+    ): LoanRepaymentResponse {
+        return dataManagerLoan.submitPayment(loanId, request)
     }
 
     override fun getDatabaseLoanRepaymentByLoanId(loanId: Int): Flow<LoanRepaymentRequest?> {
         return flow {
             emit(dataManagerLoan.getDatabaseLoanRepaymentByLoanId(loanId))
-        }
+        }.flowOn(ioDispatcher)
     }
 }

core/data/src/main/java/com/mifos/core/data/repositoryImp/OfflineDashboardRepositoryImp.kt

@@ -20,7 +20,9 @@ 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 kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
 import rx.Observable
 import javax.inject.Inject
 
@@ -33,6 +35,7 @@ class OfflineDashboardRepositoryImp @Inject constructor(
     private val dataManagerCenter: DataManagerCenter,
     private val dataManagerLoan: DataManagerLoan,
     private val dataManagerSavings: DataManagerSavings,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : OfflineDashboardRepository {
 
     override fun allDatabaseClientPayload(): Observable<List<ClientPayload>> {
@@ -49,6 +52,7 @@ class OfflineDashboardRepositoryImp @Inject constructor(
 
     override fun databaseLoanRepayments(): Flow<List<LoanRepaymentRequest>> {
         return dataManagerLoan.databaseLoanRepayments
+            .flowOn(ioDispatcher)
     }
 
     override fun allSavingsAccountTransactions(): Observable<List<SavingsAccountTransactionRequest>> {

core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncCentersDialogRepositoryImp.kt

@@ -27,7 +27,7 @@ import com.mifos.room.entities.accounts.loans.LoanWithAssociations
 import com.mifos.room.entities.group.CenterWithAssociations
 import com.mifos.room.entities.group.GroupWithAssociations
 import com.mifos.room.entities.templates.loans.LoanRepaymentTemplate
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import rx.Observable
@@ -42,19 +42,21 @@ class SyncCentersDialogRepositoryImp @Inject constructor(
     private val dataManagerSavings: DataManagerSavings,
     private val dataManagerGroups: DataManagerGroups,
     private val dataManagerClient: DataManagerClient,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : SyncCentersDialogRepository {
 
     override fun syncCenterAccounts(centerId: Int): Observable<CenterAccounts> {
         return dataManagerCenter.syncCenterAccounts(centerId)
     }
 
-    override suspend fun syncLoanById(loanId: Int): Flow<LoanWithAssociations> {
+    override fun syncLoanById(loanId: Int): Flow<LoanWithAssociations> {
         return dataManagerLoan.syncLoanById(loanId)
-            .flowOn(Dispatchers.IO)
+            .flowOn(ioDispatcher)
     }
 
-    override suspend fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate> {
+    override fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate> {
         return dataManagerLoan.syncLoanRepaymentTemplate(loanId)
+            .flowOn(ioDispatcher)
     }
 
     override fun getCenterWithAssociations(centerId: Int): Observable<CenterWithAssociations> {

core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientsDialogRepositoryImp.kt

@@ -19,7 +19,7 @@ import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.room.entities.accounts.ClientAccounts
 import com.mifos.room.entities.accounts.loans.LoanWithAssociations
 import com.mifos.room.entities.templates.loans.LoanRepaymentTemplate
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import rx.Observable
@@ -32,19 +32,21 @@ class SyncClientsDialogRepositoryImp @Inject constructor(
     private val dataManagerClient: DataManagerClient,
     private val dataManagerLoan: DataManagerLoan,
     private val dataManagerSavings: DataManagerSavings,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : SyncClientsDialogRepository {
 
     override suspend fun syncClientAccounts(clientId: Int): ClientAccounts {
         return dataManagerClient.getClientAccounts(clientId)
     }
 
-    override suspend fun syncLoanById(loanId: Int): Flow<LoanWithAssociations> {
+    override fun syncLoanById(loanId: Int): Flow<LoanWithAssociations> {
         return dataManagerLoan.syncLoanById(loanId)
-            .flowOn(Dispatchers.IO)
+            .flowOn(ioDispatcher)
     }
 
     override fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate> {
         return dataManagerLoan.syncLoanRepaymentTemplate(loanId)
+            .flowOn(ioDispatcher)
     }
 
     override fun syncSavingsAccount(

core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupsDialogRepositoryImp.kt

@@ -23,7 +23,7 @@ import com.mifos.room.entities.accounts.GroupAccounts
 import com.mifos.room.entities.accounts.loans.LoanWithAssociations
 import com.mifos.room.entities.group.GroupWithAssociations
 import com.mifos.room.entities.templates.loans.LoanRepaymentTemplate
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import rx.Observable
@@ -37,6 +37,7 @@ class SyncGroupsDialogRepositoryImp @Inject constructor(
     private val dataManagerLoan: DataManagerLoan,
     private val dataManagerSavings: DataManagerSavings,
     private val dataManagerClient: DataManagerClient,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : SyncGroupsDialogRepository {
 
     override fun syncGroupAccounts(groupId: Int): Observable<GroupAccounts> {
@@ -45,11 +46,12 @@ class SyncGroupsDialogRepositoryImp @Inject constructor(
 
     override fun syncLoanById(loanId: Int): Flow<LoanWithAssociations> {
         return dataManagerLoan.syncLoanById(loanId)
-            .flowOn(Dispatchers.IO)
+            .flowOn(ioDispatcher)
     }
 
     override fun syncLoanRepaymentTemplate(loanId: Int): Flow<LoanRepaymentTemplate> {
         return dataManagerLoan.syncLoanRepaymentTemplate(loanId)
+            .flowOn(ioDispatcher)
     }
 
     override fun syncSavingsAccount(

core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt

@@ -14,20 +14,24 @@ import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.room.entities.PaymentTypeOption
 import com.mifos.room.entities.accounts.loans.LoanRepaymentRequest
 import com.mifos.room.entities.accounts.loans.LoanRepaymentResponse
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import javax.inject.Inject
 
-class SyncLoanRepaymentTransactionRepositoryImp @Inject constructor(private val dataManagerLoan: DataManagerLoan) :
-    SyncLoanRepaymentTransactionRepository {
+class SyncLoanRepaymentTransactionRepositoryImp @Inject constructor(
+    private val dataManagerLoan: DataManagerLoan,
+    private val ioDispatcher: CoroutineDispatcher,
+) : SyncLoanRepaymentTransactionRepository {
 
     override fun databaseLoanRepayments(): Flow<List<LoanRepaymentRequest>> {
         return dataManagerLoan.databaseLoanRepayments
+            .flowOn(ioDispatcher)
     }
 
     override fun paymentTypeOption(): Flow<List<PaymentTypeOption>> {
         return dataManagerLoan.paymentTypeOption
+            .flowOn(ioDispatcher)
     }
 
     override suspend fun submitPayment(
@@ -37,13 +41,13 @@ class SyncLoanRepaymentTransactionRepositoryImp @Inject constructor(private val
         return dataManagerLoan.submitPayment(loanId, request)
     }
 
-    override suspend fun deleteAndUpdateLoanRepayments(loanId: Int): Flow<List<LoanRepaymentRequest>> {
+    override fun deleteAndUpdateLoanRepayments(loanId: Int): Flow<List<LoanRepaymentRequest>> {
         return dataManagerLoan.deleteAndUpdateLoanRepayments(loanId)
-            .flowOn(Dispatchers.IO)
+            .flowOn(ioDispatcher)
     }
 
     override fun updateLoanRepaymentTransaction(loanRepaymentRequest: LoanRepaymentRequest): Flow<LoanRepaymentRequest> {
         return dataManagerLoan.updateLoanRepaymentTransaction(loanRepaymentRequest)
-            .flowOn(Dispatchers.IO)
+            .flowOn(ioDispatcher)
     }
 }

core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt

@@ -15,7 +15,9 @@ import com.mifos.core.network.datamanager.DataManagerLoan
 import com.mifos.core.network.datamanager.DataManagerSavings
 import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse
 import com.mifos.room.entities.PaymentTypeOption
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
 import rx.Observable
 import javax.inject.Inject
 
@@ -25,6 +27,7 @@ import javax.inject.Inject
 class SyncSavingsAccountTransactionRepositoryImp @Inject constructor(
     private val dataManagerSavings: DataManagerSavings,
     private val dataManagerLoan: DataManagerLoan,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : SyncSavingsAccountTransactionRepository {
 
     override fun allSavingsAccountTransactions(): Observable<List<SavingsAccountTransactionRequest>> {
@@ -33,6 +36,7 @@ class SyncSavingsAccountTransactionRepositoryImp @Inject constructor(
 
     override fun paymentTypeOption(): Flow<List<PaymentTypeOption>> {
         return dataManagerLoan.paymentTypeOption
+            .flowOn(ioDispatcher)
     }
 
     override fun processTransaction(

core/database/src/main/java/com/mifos/room/dao/LoanDao.kt

@@ -50,8 +50,8 @@ interface LoanDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertLoanRepaymentTemplate(template: LoanRepaymentTemplate)
 
-    @Query("SELECT * FROM LoanRepaymentTemplate WHERE loanId = :loanId")
-    fun getLoanRepaymentTemplate(loanId: Int): Flow<List<LoanRepaymentTemplate?>>
+    @Query("SELECT * FROM LoanRepaymentTemplate WHERE loanId = :loanId LIMIT 1")
+    fun getLoanRepaymentTemplate(loanId: Int): LoanRepaymentTemplate?
 
     @Query("DELETE FROM LoanRepaymentTemplate WHERE loanId = :loanId")
     suspend fun deleteLoanRepaymentByLoanId(loanId: Int)

core/database/src/main/java/com/mifos/room/entities/PaymentTypeOption.kt

@@ -22,23 +22,23 @@ data class PaymentTypeOption(
     @SerializedName("id")
     @PrimaryKey
     @ColumnInfo(name = "id")
-    var id: Int = 0,
+    val id: Int = 0,
 
     @SerializedName("name")
     @ColumnInfo(name = "name")
-    var name: String = "",
+    val name: String = "",
 
     @SerializedName("description")
     @ColumnInfo(name = "description")
-    var description: String? = null,
+    val description: String? = null,
 
     @SerializedName("isCashPayment")
     @ColumnInfo(name = "is_cash_payment")
-    var isCashPayment: Boolean? = null,
+    val isCashPayment: Boolean? = null,
 
     @SerializedName("position")
     @ColumnInfo(name = "position")
-    var position: Int? = null,
+    val position: Int? = null,
 ) : MifosBaseModel(), Comparable<PaymentTypeOption>, Parcelable {
 
     override fun compareTo(another: PaymentTypeOption): Int {

core/database/src/main/java/com/mifos/room/entities/accounts/loans/ActualDisbursementDate.kt

@@ -19,14 +19,14 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class ActualDisbursementDate(
     @PrimaryKey
-    var loanId: Int? = null,
+    val loanId: Int? = null,
 
     @ColumnInfo(name = "year")
-    var year: Int? = null,
+    val year: Int? = null,
 
     @ColumnInfo(name = "month")
-    var month: Int? = null,
+    val month: Int? = null,
 
     @ColumnInfo(name = "date")
-    var date: Int? = null,
+    val date: Int? = null,
 ) : Parcelable