refactor (core:network ) Network converted to KMP (#2346)

* initial setup

* updated

* Updated

* Changed Imports in Services

* Updated

* Updated

* Added ktorHttpClient

* Added ktorHttpClient

* Updated

* Updated

* Updated

* updated mappers

* updated mappers

* Updated

* Updated

* Updated

* Updated

* Updated

* Updated ImageLoader.Utils

* changed observable to flow in data

* Updated

* Updated

* Updated

* Updated based on suggestions

* Updated

* Updated

* Updated

Author: revanthkumarJ

core/data/build.gradle.kts

@@ -52,4 +52,6 @@ dependencies {
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.tracing.ktx)
+
+    implementation(libs.ktor.client.okhttp)
 }

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

@@ -11,9 +11,9 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.clients.ActivatePayload
 import com.mifos.core.network.GenericResponse
-import org.openapitools.client.models.PostCentersCenterIdResponse
-import org.openapitools.client.models.PostClientsClientIdResponse
-import rx.Observable
+import com.mifos.core.network.model.PostCentersCenterIdResponse
+import com.mifos.core.network.model.PostClientsClientIdResponse
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 06/08/23.
@@ -34,5 +34,5 @@ interface ActivateRepository {
     fun activateGroup(
         groupId: Int,
         activatePayload: ActivatePayload?,
-    ): Observable<GenericResponse>
+    ): Flow<GenericResponse>
 }

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

@@ -12,14 +12,15 @@ package com.mifos.core.data.repository
 import com.mifos.core.model.objects.checkerinboxtask.CheckerInboxSearchTemplate
 import com.mifos.core.model.objects.checkerinboxtask.CheckerTask
 import com.mifos.core.network.GenericResponse
+import kotlinx.coroutines.flow.Flow
 
 interface CheckerInboxRepository {
 
-    suspend fun loadCheckerTasks(
+    fun loadCheckerTasks(
         actionName: String? = null,
         entityName: String? = null,
         resourceId: Int? = null,
-    ): List<CheckerTask>
+    ): Flow<List<CheckerTask>>
 
     suspend fun approveCheckerEntry(auditId: Int): GenericResponse
 

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

@@ -11,14 +11,14 @@ package com.mifos.core.data.repository
 
 import com.mifos.room.entities.accounts.ClientAccounts
 import com.mifos.room.entities.client.ClientEntity
-import okhttp3.MultipartBody
+import io.ktor.http.content.PartData
 
 /**
  * Created by Aditya Gupta on 06/08/23.
  */
 interface ClientDetailsRepository {
 
-    suspend fun uploadClientImage(id: Int, file: MultipartBody.Part?)
+    suspend fun uploadClientImage(id: Int, file: PartData?)
 
     suspend fun deleteClientImage(clientId: Int)
 

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

@@ -10,8 +10,8 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.noncoreobjects.Identifier
+import com.mifos.core.network.model.DeleteClientsClientIdIdentifiersIdentifierIdResponse
 import kotlinx.coroutines.flow.Flow
-import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse
 
 /**
  * Created by Aditya Gupta on 08/08/23.

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

@@ -13,8 +13,8 @@ import com.mifos.room.entities.client.ClientPayloadEntity
 import com.mifos.room.entities.organisation.OfficeEntity
 import com.mifos.room.entities.organisation.StaffEntity
 import com.mifos.room.entities.templates.clients.ClientsTemplateEntity
+import io.ktor.http.content.PartData
 import kotlinx.coroutines.flow.Flow
-import okhttp3.MultipartBody
 
 /**
  * Created by Aditya Gupta on 10/08/23.
@@ -29,5 +29,5 @@ interface CreateNewClientRepository {
 
     suspend fun createClient(clientPayload: ClientPayloadEntity): Int?
 
-    suspend fun uploadClientImage(id: Int, file: MultipartBody.Part?)
+    suspend fun uploadClientImage(id: Int, file: PartData?)
 }

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

@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
+import com.mifos.core.network.model.DeleteDataTablesDatatableAppTableIdDatatableIdResponse
 import kotlinx.serialization.json.JsonArray
-import org.openapitools.client.models.DeleteDataTablesDatatableAppTableIdDatatableIdResponse
 
 /**
  * Created by Aditya Gupta on 10/08/23.

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

@@ -13,16 +13,16 @@ import com.mifos.core.model.objects.payloads.GroupLoanPayload
 import com.mifos.core.network.model.LoansPayload
 import com.mifos.room.entities.accounts.loans.Loan
 import com.mifos.room.entities.client.ClientPayloadEntity
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 10/08/23.
  */
 interface DataTableListRepository {
 
-    fun createLoansAccount(loansPayload: LoansPayload?): Observable<Loan>
+    fun createLoansAccount(loansPayload: LoansPayload?): Flow<Loan>
 
-    fun createGroupLoansAccount(loansPayload: GroupLoanPayload?): Observable<Loan>
+    fun createGroupLoansAccount(loansPayload: GroupLoanPayload?): Flow<Loan>
 
     suspend fun createClient(clientPayload: ClientPayloadEntity): Int?
 }

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

@@ -10,8 +10,8 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import okhttp3.MultipartBody
-import rx.Observable
+import io.ktor.http.content.PartData
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 16/08/23.
@@ -23,15 +23,15 @@ interface DocumentDialogRepository {
         entityId: Int,
         name: String?,
         desc: String?,
-        file: MultipartBody.Part?,
-    ): Observable<GenericResponse>
+        file: PartData?,
+    ): Flow<GenericResponse>
 
     fun updateDocument(
         entityType: String?,
         entityId: Int,
         documentId: Int,
         name: String?,
         desc: String?,
-        file: MultipartBody.Part?,
-    ): Observable<GenericResponse>
+        file: PartData?,
+    ): Flow<GenericResponse>
 }

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

@@ -11,7 +11,7 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.noncoreobjects.Document
 import com.mifos.core.network.GenericResponse
-import okhttp3.ResponseBody
+import io.ktor.client.statement.HttpResponse
 
 /**
  * Created by Aditya Gupta on 08/08/23.
@@ -24,7 +24,7 @@ interface DocumentListRepository {
         entityType: String,
         entityId: Int,
         documentId: Int,
-    ): ResponseBody
+    ): HttpResponse
 
     suspend fun removeDocument(
         entityType: String,

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

@@ -18,28 +18,29 @@ import com.mifos.room.entities.collectionsheet.ProductiveCollectionSheetPayload
 import com.mifos.room.entities.group.CenterEntity
 import com.mifos.room.entities.group.CenterWithAssociations
 import com.mifos.room.entities.group.GroupEntity
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 12/08/23.
  */
 interface GenerateCollectionSheetRepository {
 
-    suspend fun getCentersInOffice(id: Int, params: Map<String, String>): List<CenterEntity>
+    fun getCentersInOffice(id: Int, params: Map<String, String>): Flow<List<CenterEntity>>
 
-    suspend fun getGroupsByOffice(
+    fun getGroupsByOffice(
         office: Int,
         params: Map<String, String>,
-    ): List<GroupEntity>
+    ): Flow<List<GroupEntity>>
 
     suspend fun fetchGroupsAssociatedWithCenter(centerId: Int): CenterWithAssociations
 
-    suspend fun fetchCenterDetails(
+    fun fetchCenterDetails(
         format: String?,
         locale: String?,
         meetingDate: String?,
         officeId: Int,
         staffId: Int,
-    ): List<CenterDetail>
+    ): Flow<List<CenterDetail>>
 
     suspend fun fetchProductiveCollectionSheet(
         centerId: Int,

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

@@ -12,14 +12,14 @@ package com.mifos.core.data.repository
 import com.mifos.core.model.objects.payloads.GroupLoanPayload
 import com.mifos.core.model.objects.template.loan.GroupLoanTemplate
 import com.mifos.room.entities.accounts.loans.Loan
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 12/08/23.
  */
 interface GroupLoanAccountRepository {
 
-    fun getGroupLoansAccountTemplate(groupId: Int, productId: Int): Observable<GroupLoanTemplate>
+    fun getGroupLoansAccountTemplate(groupId: Int, productId: Int): Flow<GroupLoanTemplate>
 
-    fun createGroupLoansAccount(loansPayload: GroupLoanPayload): Observable<Loan>
+    fun createGroupLoansAccount(loansPayload: GroupLoanPayload): Flow<Loan>
 }

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

@@ -11,12 +11,12 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.account.loan.LoanApproval
 import com.mifos.core.network.GenericResponse
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 10/08/23.
  */
 interface LoanAccountApprovalRepository {
 
-    fun approveLoan(loanId: Int, loanApproval: LoanApproval?): Observable<GenericResponse>
+    fun approveLoan(loanId: Int, loanApproval: LoanApproval?): Flow<GenericResponse>
 }

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

@@ -12,7 +12,7 @@ package com.mifos.core.data.repository
 import com.mifos.core.model.objects.account.loan.LoanDisbursement
 import com.mifos.core.network.GenericResponse
 import com.mifos.room.entities.templates.loans.LoanTransactionTemplate
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 10/08/23.
@@ -22,10 +22,10 @@ interface LoanAccountDisbursementRepository {
     fun getLoanTransactionTemplate(
         loanId: Int,
         command: String?,
-    ): Observable<LoanTransactionTemplate>
+    ): Flow<LoanTransactionTemplate>
 
     fun disburseLoan(
         loanId: Int,
         loanDisbursement: LoanDisbursement?,
-    ): Observable<GenericResponse>
+    ): Flow<GenericResponse>
 }

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

@@ -12,16 +12,16 @@ package com.mifos.core.data.repository
 import com.mifos.core.network.model.LoansPayload
 import com.mifos.room.entities.accounts.loans.Loan
 import com.mifos.room.entities.templates.loans.LoanTemplate
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 08/08/23.
  */
 interface LoanAccountRepository {
 
-    suspend fun allLoans(): Observable<List<com.mifos.core.model.objects.organisations.LoanProducts>>
+    fun allLoans(): Flow<List<com.mifos.core.model.objects.organisations.LoanProducts>>
 
-    suspend fun getLoansAccountTemplate(clientId: Int, productId: Int): Observable<LoanTemplate>
+    fun getLoansAccountTemplate(clientId: Int, productId: Int): Flow<LoanTemplate>
 
-    suspend fun createLoansAccount(loansPayload: LoansPayload): Observable<Loan>
+    fun createLoansAccount(loansPayload: LoansPayload): Flow<Loan>
 }

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

@@ -11,14 +11,14 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.clients.ChargeCreationResponse
 import com.mifos.core.model.objects.payloads.ChargesPayload
-import okhttp3.ResponseBody
+import io.ktor.client.statement.HttpResponse
 
 /**
  * Created by Aditya Gupta on 16/08/23.
  */
 interface LoanChargeDialogRepository {
 
-    suspend fun getAllChargesV3(loanId: Int): ResponseBody
+    suspend fun getAllChargesV3(loanId: Int): HttpResponse
 
     suspend fun createLoanCharges(
         loanId: Int,

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

@@ -10,12 +10,12 @@
 package com.mifos.core.data.repository
 
 import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 12/08/23.
  */
 interface LoanRepaymentScheduleRepository {
 
-    fun getLoanRepaySchedule(loanId: Int): Observable<LoanWithAssociationsEntity>
+    fun getLoanRepaySchedule(loanId: Int): Flow<LoanWithAssociationsEntity>
 }

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

@@ -10,12 +10,12 @@
 package com.mifos.core.data.repository
 
 import com.mifos.room.entities.accounts.loans.LoanWithAssociationsEntity
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 12/08/23.
  */
 interface LoanTransactionsRepository {
 
-    fun getLoanTransactions(loan: Int): Observable<LoanWithAssociationsEntity>
+    fun getLoanTransactions(loan: Int): Flow<LoanWithAssociationsEntity>
 }

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

@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import org.openapitools.client.models.PostAuthenticationResponse
+import com.mifos.core.network.model.PostAuthenticationResponse
 
 /**
  * Created by Aditya Gupta on 06/08/23.

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

@@ -26,5 +26,5 @@ interface NewIndividualCollectionSheetRepository {
 
     fun offices(): Flow<List<OfficeEntity>>
 
-    suspend fun getStaffInOffice(officeId: Int): List<StaffEntity>
+    fun getStaffInOffice(officeId: Int): Flow<List<StaffEntity>>
 }

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

@@ -10,15 +10,16 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.runreport.client.ClientReportTypeItem
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 12/08/23.
  */
 interface ReportCategoryRepository {
 
-    suspend fun getReportCategories(
+    fun getReportCategories(
         reportCategory: String,
         genericResultSet: Boolean,
         parameterType: Boolean,
-    ): List<ClientReportTypeItem>
+    ): Flow<List<ClientReportTypeItem>>
 }

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

@@ -10,7 +10,7 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 13/08/23.
@@ -20,5 +20,5 @@ interface SavingsAccountActivateRepository {
     fun activateSavings(
         savingsAccountId: Int,
         request: HashMap<String, String>,
-    ): Observable<GenericResponse>
+    ): Flow<GenericResponse>
 }

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

@@ -11,7 +11,7 @@ package com.mifos.core.data.repository
 
 import com.mifos.core.model.objects.account.loan.SavingsApproval
 import com.mifos.core.network.GenericResponse
-import rx.Observable
+import kotlinx.coroutines.flow.Flow
 
 /**
  * Created by Aditya Gupta on 13/08/23.
@@ -21,5 +21,5 @@ interface SavingsAccountApprovalRepository {
     fun approveSavingsApplication(
         savingsAccountId: Int,
         savingsApproval: SavingsApproval?,
-    ): Observable<GenericResponse>
+    ): Flow<GenericResponse>
 }