Ktorfit Cleanup: Remove Duplicates and Align DI Configuration (openMF#2446)

Author: itsPronay

core/designsystem/src/commonMain/kotlin/com/mifos/core/designsystem/component/MifosTextFieldDropdown.kt

@@ -34,6 +34,7 @@ import androidx.compose.ui.unit.dp
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MifosTextFieldDropdown(
+    enabled: Boolean = true,
     value: String,
     onValueChanged: (String) -> Unit,
     onOptionSelected: (Int, String) -> Unit,
@@ -52,6 +53,7 @@ fun MifosTextFieldDropdown(
         onExpandedChange = { isExpanded = !isExpanded },
     ) {
         OutlinedTextField(
+            enabled = enabled,
             isError = errorMessage != null,
             supportingText = if (errorMessage != null) {
                 {

core/model/src/commonMain/kotlin/com/mifos/core/model/objects/account/loan/SavingsApproval.kt

@@ -11,8 +11,10 @@ package com.mifos.core.model.objects.account.loan
 
 import com.mifos.core.model.utils.Parcelable
 import com.mifos.core.model.utils.Parcelize
+import kotlinx.serialization.Serializable
 
 @Parcelize
+@Serializable
 data class SavingsApproval(
     var locale: String = "en",
 

core/network/src/commonMain/kotlin/com/mifos/core/network/BaseApiManager.kt

@@ -11,6 +11,20 @@ package com.mifos.core.network
 
 import com.mifos.core.common.utils.getInstanceUrl
 import com.mifos.core.datastore.UserPreferencesRepository
+import com.mifos.core.network.apis.CentersApi
+import com.mifos.core.network.apis.ClientApi
+import com.mifos.core.network.apis.ClientIdentifierApi
+import com.mifos.core.network.apis.DataTablesApi
+import com.mifos.core.network.apis.GroupsApi
+import com.mifos.core.network.apis.OfficesApi
+import com.mifos.core.network.apis.StaffApi
+import com.mifos.core.network.apis.createCentersApi
+import com.mifos.core.network.apis.createClientApi
+import com.mifos.core.network.apis.createClientIdentifierApi
+import com.mifos.core.network.apis.createDataTablesApi
+import com.mifos.core.network.apis.createGroupsApi
+import com.mifos.core.network.apis.createOfficesApi
+import com.mifos.core.network.apis.createStaffApi
 import com.mifos.core.network.services.CenterService
 import com.mifos.core.network.services.ChargeService
 import com.mifos.core.network.services.CheckerInboxService
@@ -52,24 +66,33 @@ class BaseApiManager(
     private val ktorfit: Ktorfit,
 ) {
 
-    val centerApi: CenterService = ktorfit.createCenterService()
-    val accountsApi: ClientAccountsService = ktorfit.createClientAccountsService()
-    val clientsApi: ClientService = ktorfit.createClientService()
-    val dataTableApi: DataTableService = ktorfit.createDataTableService()
-    val loanApi: LoanService = ktorfit.createLoanService()
-    val savingsApi: SavingsAccountService = ktorfit.createSavingsAccountService()
-    val searchApi: SearchService = ktorfit.createSearchService()
-    val groupApi: GroupService = ktorfit.createGroupService()
-    val documentApi: DocumentService = ktorfit.createDocumentService()
-    val officeApi: OfficeService = ktorfit.createOfficeService()
-    val staffApi: StaffService = ktorfit.createStaffService()
-    val surveyApi: SurveyService = ktorfit.createSurveyService()
-    val chargeApi: ChargeService = ktorfit.createChargeService()
-    val checkerInboxApi: CheckerInboxService = ktorfit.createCheckerInboxService()
-    val collectionSheetApi: CollectionSheetService = ktorfit.createCollectionSheetService()
-    val noteApi: NoteService = ktorfit.createNoteService()
+    val centerService: CenterService = ktorfit.createCenterService()
+    val accountsService: ClientAccountsService = ktorfit.createClientAccountsService()
+    val clientService: ClientService = ktorfit.createClientService()
+    val dataTableService: DataTableService = ktorfit.createDataTableService()
+    val loanService: LoanService = ktorfit.createLoanService()
+    val savingsService: SavingsAccountService = ktorfit.createSavingsAccountService()
+    val searchService: SearchService = ktorfit.createSearchService()
+    val groupService: GroupService = ktorfit.createGroupService()
+    val documentService: DocumentService = ktorfit.createDocumentService()
+    val officeService: OfficeService = ktorfit.createOfficeService()
+    val staffService: StaffService = ktorfit.createStaffService()
+    val surveyService: SurveyService = ktorfit.createSurveyService()
+    val chargeService: ChargeService = ktorfit.createChargeService()
+    val checkerInboxService: CheckerInboxService = ktorfit.createCheckerInboxService()
+    val collectionSheetService: CollectionSheetService = ktorfit.createCollectionSheetService()
+    val noteService: NoteService = ktorfit.createNoteService()
     val runReportsService: RunReportsService = ktorfit.createRunReportsService()
 
+    // sdk apis
+    val clientIdentifiersApi: ClientIdentifierApi = ktorfit.createClientIdentifierApi()
+    val centerApi: CentersApi = ktorfit.createCentersApi()
+    val officeApi: OfficesApi = ktorfit.createOfficesApi()
+    val clientsApi: ClientApi = ktorfit.createClientApi()
+    val groupApi: GroupsApi = ktorfit.createGroupsApi()
+    val staffApi: StaffApi = ktorfit.createStaffApi()
+    val dataTableApi: DataTablesApi = ktorfit.createDataTablesApi()
+
     companion object {
         fun build(prefManager: UserPreferencesRepository): BaseApiManager {
             val ktorfitClient = KtorfitClient.builder()

core/network/src/commonMain/kotlin/com/mifos/core/network/DataManager.kt

@@ -40,28 +40,27 @@ import org.koin.core.component.inject
 class DataManager : KoinComponent {
 
     private val mBaseApiManager: BaseApiManager by inject()
-//    private val mDataManagerClient: DataManagerClient by inject()
 
     /**
      * Center API
      */
     fun getGroupsByCenter(id: Int): Flow<CenterWithAssociations> {
-        return mBaseApiManager.centerApi.getAllGroupsForCenter(id)
+        return mBaseApiManager.centerService.getAllGroupsForCenter(id)
     }
 
     fun getCentersInOffice(id: Int, params: Map<String, String>): Flow<List<CenterEntity>> {
-        return mBaseApiManager.centerApi.getAllCentersInOffice(id, params)
+        return mBaseApiManager.centerService.getAllCentersInOffice(id, params)
     }
 
     fun getCollectionSheet(id: Long, payload: Payload?): Flow<CollectionSheet> {
-        return mBaseApiManager.centerApi.getCollectionSheet(id, payload)
+        return mBaseApiManager.centerService.getCollectionSheet(id, payload)
     }
 
     fun saveCollectionSheet(
         centerId: Int,
         collectionSheetPayload: CollectionSheetPayload?,
     ): Flow<SaveResponse> {
-        return mBaseApiManager.centerApi.saveCollectionSheet(
+        return mBaseApiManager.centerService.saveCollectionSheet(
             centerId,
             collectionSheetPayload,
         )
@@ -71,7 +70,7 @@ class DataManager : KoinComponent {
         id: Int,
         payload: CollectionSheetPayload?,
     ): Flow<SaveResponse> {
-        return mBaseApiManager.centerApi.saveCollectionSheetAsync(id, payload)
+        return mBaseApiManager.centerService.saveCollectionSheetAsync(id, payload)
     }
 
     fun getCenterList(
@@ -81,7 +80,7 @@ class DataManager : KoinComponent {
         officeId: Int,
         staffId: Int,
     ): Flow<List<OfflineCenter>> {
-        return mBaseApiManager.centerApi.getCenterList(
+        return mBaseApiManager.centerService.getCenterList(
             dateFormat,
             locale,
             meetingDate,
@@ -95,96 +94,96 @@ class DataManager : KoinComponent {
      */
     // TODO Remove this Method After fixing the Charge Test
     fun getClientCharges(clientId: Int, offset: Int, limit: Int): Flow<Page<ChargesEntity>> {
-        return mBaseApiManager.chargeApi.getListOfCharges(clientId, offset, limit)
+        return mBaseApiManager.chargeService.getListOfCharges(clientId, offset, limit)
     }
 
     suspend fun getAllChargesV2(clientId: Int): ChargeTemplate {
-        return mBaseApiManager.chargeApi.getAllChargesS(clientId)
+        return mBaseApiManager.chargeService.getAllChargesS(clientId)
     }
 
     suspend fun createCharges(
         clientId: Int,
         payload: ChargesPayload,
     ): ChargeCreationResponse {
-        return mBaseApiManager.chargeApi.createCharges(clientId, payload)
+        return mBaseApiManager.chargeService.createCharges(clientId, payload)
     }
 
     suspend fun getAllChargesV3(loanId: Int): HttpResponse {
-        return mBaseApiManager.chargeApi.getAllChargeV3(loanId)
+        return mBaseApiManager.chargeService.getAllChargeV3(loanId)
     }
 
     suspend fun createLoanCharges(
         loanId: Int,
         chargesPayload: ChargesPayload,
     ): ChargeCreationResponse {
-        return mBaseApiManager.chargeApi.createLoanCharges(loanId, chargesPayload)
+        return mBaseApiManager.chargeService.createLoanCharges(loanId, chargesPayload)
     }
 
     /**
      * Groups API
      */
     fun getGroups(groupid: Int): Flow<GroupWithAssociations> {
-        return mBaseApiManager.groupApi.getGroupWithAssociations(groupid)
+        return mBaseApiManager.groupService.getGroupWithAssociations(groupid)
     }
 
     fun getGroupsByOffice(
         office: Int,
         params: Map<String, String>,
     ): Flow<List<GroupEntity>> {
-        return mBaseApiManager.groupApi.getAllGroupsInOffice(office, params)
+        return mBaseApiManager.groupService.getAllGroupsInOffice(office, params)
     }
 
     /**
      * Offices API
      */
     fun offices(): Flow<List<OfficeEntity>> {
-        return mBaseApiManager.officeApi.allOffices()
+        return mBaseApiManager.officeService.allOffices()
     }
 
     /**
      * Staff API
      */
     fun getStaffInOffice(officeId: Int): Flow<List<StaffEntity>> {
-        return mBaseApiManager.staffApi.getStaffForOffice(officeId)
+        return mBaseApiManager.staffService.getStaffForOffice(officeId)
     }
 
     val allStaff: Flow<List<StaffEntity>>
-        get() = mBaseApiManager.staffApi.allStaff()
+        get() = mBaseApiManager.staffService.allStaff()
 
     /**
      * Loans API
      */
     fun getLoanTransactions(loan: Int): Flow<LoanWithAssociationsEntity> {
-        return mBaseApiManager.loanApi.getLoanWithTransactions(loan)
+        return mBaseApiManager.loanService.getLoanWithTransactions(loan)
     }
 
     val allLoans: Flow<List<com.mifos.core.model.objects.organisations.LoanProducts>>
-        get() = mBaseApiManager.loanApi.getAllLoans()
+        get() = mBaseApiManager.loanService.getAllLoans()
 
     fun getGroupLoansAccountTemplate(groupId: Int, productId: Int): Flow<GroupLoanTemplate> {
-        return mBaseApiManager.loanApi.getGroupLoansAccountTemplate(groupId, productId)
+        return mBaseApiManager.loanService.getGroupLoansAccountTemplate(groupId, productId)
     }
 
     fun createGroupLoansAccount(loansPayload: GroupLoanPayload?): Flow<Loan> {
-        return mBaseApiManager.loanApi.createGroupLoansAccount(loansPayload)
+        return mBaseApiManager.loanService.createGroupLoansAccount(loansPayload)
     }
 
     fun getLoanRepaySchedule(loanId: Int): Flow<LoanWithAssociationsEntity> {
-        return mBaseApiManager.loanApi.getLoanRepaymentSchedule(loanId)
+        return mBaseApiManager.loanService.getLoanRepaymentSchedule(loanId)
     }
 
     fun approveLoan(
         loanId: Int,
         loanApproval: com.mifos.core.model.objects.account.loan.LoanApproval?,
     ): Flow<GenericResponse> {
-        return mBaseApiManager.loanApi.approveLoanApplication(loanId, loanApproval)
+        return mBaseApiManager.loanService.approveLoanApplication(loanId, loanApproval)
     }
 
     fun getListOfLoanCharges(loanId: Int): Flow<List<ChargesEntity>> {
-        return mBaseApiManager.loanApi.getListOfLoanCharges(loanId)
+        return mBaseApiManager.loanService.getListOfLoanCharges(loanId)
     }
 
     fun getListOfCharges(clientId: Int): Flow<Page<ChargesEntity>> {
-        return mBaseApiManager.loanApi.getListOfCharges(clientId)
+        return mBaseApiManager.loanService.getListOfCharges(clientId)
     }
 }

core/network/src/commonMain/kotlin/com/mifos/core/network/apimanager/BaseApiManager.kt

@@ -41,7 +41,7 @@ interface CentersApi {
      * @param locale locale (optional)
      * @return [GetCentersResponse]
      */
-    @GET("v1/centers")
+    @GET("centers")
     suspend fun retrieveAll23(
         @Query("officeId") officeId: Long? = null,
         @Query("staffId") staffId: Long? = null,
@@ -69,7 +69,7 @@ interface CentersApi {
      * @param command command (optional)
      * @return [PostCentersCenterIdResponse]
      */
-    @POST("v1/centers/{centerId}")
+    @POST("centers/{centerId}")
     suspend fun activate2(
         @Path("centerId") centerId: Long,
         @Body postCentersCenterIdRequest: PostCentersCenterIdRequest,