refactor: moving files from database module to model module (#2275)

* initial refactoring * MIFOSAC-321 * applying spotless and detekt MIFOSAC-321 * renaming modelObject package to just Object MIFOSAC-321 * changing the package names * renaming dbobjects to entity refactoring CenterPayload file moving LoanPayload to network module
openMF · Jan 8, 2025 · b2c41c3 · b2c41c3
1 parent 876e30f
commit b2c41c3
Show file tree

Hide file tree

Showing 674 changed files with 1,408 additions and 1,332 deletions.
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
@@ -11,9 +11,9 @@ package com.mifos.core.data.pagingSource
 
 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.client.Page
-import com.mifos.core.objects.group.Center
+import com.mifos.core.objects.clients.Page
 import rx.Subscriber
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers

diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt
@@ -11,9 +11,9 @@ package com.mifos.core.data.pagingSource
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
+import com.mifos.core.entity.client.Charges
 import com.mifos.core.network.datamanager.DataManagerCharge
-import com.mifos.core.objects.client.Charges
-import com.mifos.core.objects.client.Page
+import com.mifos.core.objects.clients.Page
 import kotlinx.coroutines.suspendCancellableCoroutine
 import rx.Subscriber
 import rx.android.schedulers.AndroidSchedulers

diff --git a/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt b/core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt
@@ -11,9 +11,9 @@ package com.mifos.core.data.pagingSource
 
 import androidx.paging.PagingSource
 import androidx.paging.PagingState
+import com.mifos.core.entity.client.Client
 import com.mifos.core.network.datamanager.DataManagerClient
-import com.mifos.core.objects.client.Client
-import com.mifos.core.objects.client.Page
+import com.mifos.core.objects.clients.Page
 import rx.Subscriber
 import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt
@@ -10,7 +10,7 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.client.ActivatePayload
+import com.mifos.core.objects.clients.ActivatePayload
 import org.openapitools.client.models.PostCentersCenterIdResponse
 import org.openapitools.client.models.PostClientsClientIdResponse
 import rx.Observable

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt
@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.group.CenterInfo
-import com.mifos.core.objects.group.CenterWithAssociations
+import com.mifos.core.entity.group.CenterWithAssociations
+import com.mifos.core.objects.groups.CenterInfo
 import kotlinx.coroutines.flow.Flow
 
 /**

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,9 +10,9 @@
 package com.mifos.core.data.repository
 
 import androidx.paging.PagingData
-import com.mifos.core.objects.client.Page
-import com.mifos.core.objects.group.Center
-import com.mifos.core.objects.group.CenterWithAssociations
+import com.mifos.core.entity.group.Center
+import com.mifos.core.entity.group.CenterWithAssociations
+import com.mifos.core.objects.clients.Page
 import kotlinx.coroutines.flow.Flow
 import rx.Observable
 

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.ChargesPayload
-import com.mifos.core.objects.client.ChargeCreationResponse
-import com.mifos.core.objects.templates.clients.ChargeTemplate
+import com.mifos.core.objects.clients.ChargeCreationResponse
+import com.mifos.core.objects.template.client.ChargeTemplate
+import com.mifos.core.payloads.ChargesPayload
 
 /**
  * Created by Aditya Gupta on 13/08/23.

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt
@@ -10,8 +10,8 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.checkerinboxandtasks.CheckerInboxSearchTemplate
-import com.mifos.core.objects.checkerinboxandtasks.CheckerTask
+import com.mifos.core.objects.checkerinboxtask.CheckerInboxSearchTemplate
+import com.mifos.core.objects.checkerinboxtask.CheckerTask
 
 interface CheckerInboxRepository {
 

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt
@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.checkerinboxandtasks.CheckerTask
-import com.mifos.core.objects.checkerinboxandtasks.RescheduleLoansTask
+import com.mifos.core.objects.checkerinboxtask.CheckerTask
+import com.mifos.core.objects.checkerinboxtask.RescheduleLoansTask
 import kotlinx.coroutines.flow.Flow
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientChargeRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientChargeRepository.kt
@@ -10,7 +10,7 @@
 package com.mifos.core.data.repository
 
 import androidx.paging.PagingData
-import com.mifos.core.objects.client.Charges
+import com.mifos.core.entity.client.Charges
 import kotlinx.coroutines.flow.Flow
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientDetailsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientDetailsRepository.kt
@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.ClientAccounts
-import com.mifos.core.objects.client.Client
+import com.mifos.core.entity.accounts.ClientAccounts
+import com.mifos.core.entity.client.Client
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import rx.Observable

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.noncore.IdentifierCreationResponse
-import com.mifos.core.objects.noncore.IdentifierPayload
-import com.mifos.core.objects.noncore.IdentifierTemplate
+import com.mifos.core.objects.noncoreobjects.IdentifierCreationResponse
+import com.mifos.core.objects.noncoreobjects.IdentifierPayload
+import com.mifos.core.objects.noncoreobjects.IdentifierTemplate
 
 /**
  * Created by Aditya Gupta on 16/08/23.

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.noncore.Identifier
+import com.mifos.core.objects.noncoreobjects.Identifier
 import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt
@@ -10,8 +10,8 @@
 package com.mifos.core.data.repository
 
 import androidx.paging.PagingData
-import com.mifos.core.objects.client.Client
-import com.mifos.core.objects.client.Page
+import com.mifos.core.entity.client.Client
+import com.mifos.core.objects.clients.Page
 import kotlinx.coroutines.flow.Flow
 import rx.Observable
 

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,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.CenterPayload
-import com.mifos.core.objects.response.SaveResponse
+import com.mifos.core.entity.center.CenterPayload
+import com.mifos.core.objects.responses.SaveResponse
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewClientRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewClientRepository.kt
@@ -9,11 +9,11 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.client.Client
-import com.mifos.core.objects.client.ClientPayload
-import com.mifos.core.objects.organisation.Office
-import com.mifos.core.objects.organisation.Staff
-import com.mifos.core.objects.templates.clients.ClientsTemplate
+import com.mifos.core.entity.client.Client
+import com.mifos.core.entity.client.ClientPayload
+import com.mifos.core.entity.organisation.Office
+import com.mifos.core.entity.organisation.Staff
+import com.mifos.core.entity.templates.clients.ClientsTemplate
 import okhttp3.MultipartBody
 import okhttp3.ResponseBody
 import rx.Observable

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.group.GroupPayload
-import com.mifos.core.objects.organisation.Office
-import com.mifos.core.objects.response.SaveResponse
+import com.mifos.core.entity.group.GroupPayload
+import com.mifos.core.entity.organisation.Office
+import com.mifos.core.objects.responses.SaveResponse
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/DataTableListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/DataTableListRepository.kt
@@ -9,11 +9,11 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.GroupLoanPayload
-import com.mifos.core.data.LoansPayload
-import com.mifos.core.objects.accounts.loan.Loans
-import com.mifos.core.objects.client.Client
-import com.mifos.core.objects.client.ClientPayload
+import com.mifos.core.entity.accounts.loan.Loans
+import com.mifos.core.entity.client.Client
+import com.mifos.core.entity.client.ClientPayload
+import com.mifos.core.network.model.LoansPayload
+import com.mifos.core.payloads.GroupLoanPayload
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/DataTableRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/DataTableRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.noncore.DataTable
+import com.mifos.core.entity.noncore.DataTable
 
 /**
  * Created by Aditya Gupta on 08/08/23.

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt
@@ -10,7 +10,7 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.noncore.Document
+import com.mifos.core.objects.noncoreobjects.Document
 import okhttp3.ResponseBody
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt
@@ -9,15 +9,15 @@
  */
 package com.mifos.core.data.repository
 
+import com.mifos.core.entity.collectionsheet.CenterDetail
+import com.mifos.core.entity.collectionsheet.CollectionSheetPayload
+import com.mifos.core.entity.collectionsheet.CollectionSheetResponse
+import com.mifos.core.entity.collectionsheet.ProductiveCollectionSheetPayload
+import com.mifos.core.entity.group.Center
+import com.mifos.core.entity.group.CenterWithAssociations
+import com.mifos.core.entity.group.Group
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.collectionsheet.CenterDetail
-import com.mifos.core.objects.collectionsheet.CollectionSheetPayload
-import com.mifos.core.objects.collectionsheet.CollectionSheetRequestPayload
-import com.mifos.core.objects.collectionsheet.CollectionSheetResponse
-import com.mifos.core.objects.collectionsheet.ProductiveCollectionSheetPayload
-import com.mifos.core.objects.group.Center
-import com.mifos.core.objects.group.CenterWithAssociations
-import com.mifos.core.objects.group.Group
+import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload
 
 /**
  * Created by Aditya Gupta on 12/08/23.

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GroupDetailsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GroupDetailsRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.GroupAccounts
-import com.mifos.core.objects.group.Group
-import com.mifos.core.objects.group.GroupWithAssociations
+import com.mifos.core.entity.accounts.GroupAccounts
+import com.mifos.core.entity.group.Group
+import com.mifos.core.entity.group.GroupWithAssociations
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GroupListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GroupListRepository.kt
@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.group.CenterWithAssociations
-import com.mifos.core.objects.group.GroupWithAssociations
+import com.mifos.core.entity.group.CenterWithAssociations
+import com.mifos.core.entity.group.GroupWithAssociations
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.GroupLoanPayload
-import com.mifos.core.objects.accounts.loan.Loans
-import com.mifos.core.objects.templates.loans.GroupLoanTemplate
+import com.mifos.core.entity.accounts.loan.Loans
+import com.mifos.core.objects.template.loan.GroupLoanTemplate
+import com.mifos.core.payloads.GroupLoanPayload
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/GroupsListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/GroupsListRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.group.Group
+import com.mifos.core.entity.group.Group
 import kotlinx.coroutines.flow.Flow
 
 interface GroupsListRepository {

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt
@@ -10,7 +10,7 @@
 package com.mifos.core.data.repository
 
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.accounts.loan.LoanApproval
+import com.mifos.core.objects.account.loan.LoanApproval
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
+import com.mifos.core.entity.templates.loans.LoanTransactionTemplate
 import com.mifos.core.network.GenericResponse
-import com.mifos.core.objects.accounts.loan.LoanDisbursement
-import com.mifos.core.objects.templates.loans.LoanTransactionTemplate
+import com.mifos.core.objects.account.loan.LoanDisbursement
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt
@@ -9,10 +9,10 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.LoansPayload
-import com.mifos.core.objects.accounts.loan.Loans
-import com.mifos.core.objects.organisation.LoanProducts
-import com.mifos.core.objects.templates.loans.LoanTemplate
+import com.mifos.core.entity.accounts.loan.Loans
+import com.mifos.core.entity.templates.loans.LoanTemplate
+import com.mifos.core.network.model.LoansPayload
+import com.mifos.core.objects.organisations.LoanProducts
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountSummaryRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanAccountSummaryRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.loan.LoanWithAssociations
+import com.mifos.core.entity.accounts.loan.LoanWithAssociations
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt
@@ -9,8 +9,8 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.data.ChargesPayload
-import com.mifos.core.objects.client.ChargeCreationResponse
+import com.mifos.core.objects.clients.ChargeCreationResponse
+import com.mifos.core.payloads.ChargesPayload
 import okhttp3.ResponseBody
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanChargeRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.client.Charges
+import com.mifos.core.entity.client.Charges
 
 /**
  * Created by Aditya Gupta on 10/08/23.

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt
@@ -9,9 +9,9 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest
-import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse
-import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate
+import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest
+import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate
+import com.mifos.core.objects.account.loan.LoanRepaymentResponse
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentScheduleRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentScheduleRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.loan.LoanWithAssociations
+import com.mifos.core.entity.accounts.loan.LoanWithAssociations
 import rx.Observable
 
 /**

diff --git a/core/data/src/main/java/com/mifos/core/data/repository/LoanTransactionsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/LoanTransactionsRepository.kt
@@ -9,7 +9,7 @@
  */
 package com.mifos.core.data.repository
 
-import com.mifos.core.objects.accounts.loan.LoanWithAssociations
+import com.mifos.core.entity.accounts.loan.LoanWithAssociations
 import rx.Observable
 
 /**