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 index 8ff2a54448..196562690a 100644 --- 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 index c1a64e60b9..12a15b8b5f 100644 --- 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 index 6f8243569d..292202491f 100644 --- 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 index 8a6c49c3a6..306a48b782 100644 --- 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 index 5b40c70507..2a545982c6 100644 --- 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 index d927d08f8b..5d943f2a0a 100644 --- 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 index c3c372dfad..e5e1b57645 100644 --- 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 index 953e0bcab7..02391280ae 100644 --- 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 index 250a5886f5..0c16cc560a 100644 --- 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 index 7a1f2a22f6..afc655ee37 100644 --- 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 index 7dd9862b77..6f48fbada8 100644 --- 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 index 345fabcb80..ed8d34d2d1 100644 --- 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 index 108181f690..d1d5c98c53 100644 --- 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 index c2e608c9c3..cdd21e49a5 100644 --- 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 index 02893acbaa..a260516604 100644 --- 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 index c2066f9977..9667e1cc0f 100644 --- 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 index 641b9732a9..df76c381d2 100644 --- 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 index cc3a0c4b35..1296abb087 100644 --- 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 index 6f1255b43a..4fc076b6fc 100644 --- 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 index bb44b8ab88..747e0ac609 100644 --- 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 index f456059099..7dd8ec649e 100644 --- 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 index a22f652ce6..15bf2c6a26 100644 --- 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 index 231525719f..b0ced9777e 100644 --- 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 index 8265ab04c5..5b583c96e5 100644 --- 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 index da870acb23..7d4cab31a0 100644 --- 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 index 30f9bc971a..046b7e8455 100644 --- 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 index 8f293da27f..9953cf957a 100644 --- 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 index 1fd7b747d5..4f0f01290c 100644 --- 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 index abf4181360..7b54d7d3a6 100644 --- 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 index 7e77c99880..3a2be4c6c2 100644 --- 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 index 5b75c66acc..72f012d981 100644 --- 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 index d924247b8a..f52099b892 100644 --- 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 index 8d75356a16..7ec2704372 100644 --- 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 index 40752ecc3a..2b3dcee3b0 100644 --- 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 /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/NewIndividualCollectionSheetRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/NewIndividualCollectionSheetRepository.kt index a96965de4c..4e177ce817 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/NewIndividualCollectionSheetRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/NewIndividualCollectionSheetRepository.kt @@ -9,10 +9,10 @@ */ package com.mifos.core.data.repository +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff import com.mifos.core.network.model.RequestCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff /** * Created by Aditya Gupta on 10/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/NoteRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/NoteRepository.kt index 4cd303bbdc..cfeade7aa6 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/NoteRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/NoteRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.noncore.Note +import com.mifos.core.entity.noncore.Note interface NoteRepository { 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 index 98a1466ff7..74b3bd01c2 100644 --- 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 @@ -9,11 +9,11 @@ */ package com.mifos.core.data.repository -import com.mifos.core.data.CenterPayload -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +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.entity.group.GroupPayload import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt index 8e89dc2121..2204de196f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation /** * Created by Aditya Gupta on 06/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt index 31a2c516a9..2d97750a47 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.client.ClientAddressRequest -import com.mifos.core.objects.client.ClientAddressResponse +import com.mifos.core.objects.clients.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressResponse /** * Created by Aditya Gupta on 08/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt index d68577c360..fbec880361 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.client.ClientReportTypeItem /** * Created by Aditya Gupta on 12/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt index 35eed144d3..3d367634d9 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse /** * Created by Aditya Gupta on 12/08/23. diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt index 76f868855f..605fb26d6f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.data.repository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval +import com.mifos.core.objects.account.loan.SavingsApproval import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt index 9adb358ebf..f65704ef60 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt @@ -9,10 +9,10 @@ */ package com.mifos.core.data.repository -import com.mifos.core.data.SavingsPayload -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.objects.organisations.ProductSavings +import com.mifos.core.payloads.SavingsPayload import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountSummaryRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountSummaryRepository.kt index 32a61c551a..08a051492f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountSummaryRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountSummaryRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt index c5f8ccba3b..788d60c6cd 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SurveyListRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SurveyListRepository.kt index 7501c6c72f..fabf14ebb3 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SurveyListRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SurveyListRepository.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt index 9f8b5a6995..11c98ad2d8 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.survey.Scorecard +import com.mifos.core.objects.surveys.Scorecard import rx.Observable /** 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 index 4eeeddec8a..266306fad7 100644 --- 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,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/SyncCentersDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncCentersDialogRepository.kt index 8333515423..11de9a697c 100644 --- 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 @@ -9,18 +9,18 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -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.group.GroupWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +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.group.CenterWithAssociations +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncClientPayloadsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncClientPayloadsRepository.kt index 81b41a5ad1..815448fcfa 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncClientPayloadsRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncClientPayloadsRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientPayload +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientPayload import rx.Observable interface SyncClientPayloadsRepository { diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncClientsDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncClientsDialogRepository.kt index e5e3a29971..839e88f789 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncClientsDialogRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncClientsDialogRepository.kt @@ -9,12 +9,12 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt index 43eff7d122..affce3ea33 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.objects.responses.SaveResponse import rx.Observable interface SyncGroupPayloadsRepository { diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupsDialogRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupsDialogRepository.kt index 18009e6caf..908969e6c0 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupsDialogRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncGroupsDialogRepository.kt @@ -9,15 +9,15 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import rx.Observable /** diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt index c03d325e7a..6f48fc86fb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt @@ -9,15 +9,15 @@ */ 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.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.objects.account.loan.LoanRepaymentResponse import rx.Observable interface SyncLoanRepaymentTransactionRepository { fun databaseLoanRepayments(): Observable> - fun paymentTypeOption(): Observable> + fun paymentTypeOption(): Observable> fun submitPayment( loanId: Int, diff --git a/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt b/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt index 20ebbe0496..cc3c5ea41c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt +++ b/core/data/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.data.repository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import rx.Observable /** @@ -20,7 +20,7 @@ interface SyncSavingsAccountTransactionRepository { fun allSavingsAccountTransactions(): Observable> - fun paymentTypeOption(): Observable> + fun paymentTypeOption(): Observable> fun processTransaction( savingsAccountType: String?, diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt index c57e5f4e76..9bf590a2d1 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt @@ -14,7 +14,7 @@ import com.mifos.core.network.GenericResponse 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.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/repositoryImp/CenterDetailsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt index a5813df54d..d00b051ce3 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CenterDetailsRepository +import com.mifos.core.entity.group.CenterWithAssociations import com.mifos.core.network.datamanager.DataManagerCenter import com.mifos.core.network.datamanager.DataManagerRunReport -import com.mifos.core.objects.group.CenterInfo -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.objects.groups.CenterInfo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject 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 index 7b87193d10..915b5b53ef 100644 --- 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,10 +14,10 @@ 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.entity.group.CenterWithAssociations 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.group.CenterWithAssociations +import com.mifos.core.objects.clients.Page import kotlinx.coroutines.flow.Flow import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt index 279321cf66..c35d716b59 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ChargeDialogRepositoryImp.kt @@ -9,11 +9,11 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.ChargesPayload import com.mifos.core.data.repository.ChargeDialogRepository import com.mifos.core.network.DataManager -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 import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt index 485fd0dede..d24db2b23d 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxRepositoryImp.kt @@ -12,8 +12,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CheckerInboxRepository import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerCheckerInbox -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 import javax.inject.Inject class CheckerInboxRepositoryImp @Inject constructor( diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt index f38221ec4d..b926ae11cb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CheckerInboxTasksRepositoryImp.kt @@ -11,8 +11,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CheckerInboxTasksRepository import com.mifos.core.network.datamanager.DataManagerCheckerInbox -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 import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientChargeRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientChargeRepositoryImp.kt index 60bdd54adf..3e37d25136 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientChargeRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientChargeRepositoryImp.kt @@ -14,8 +14,8 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.mifos.core.data.pagingSource.ClientChargesPagingSource import com.mifos.core.data.repository.ClientChargeRepository +import com.mifos.core.entity.client.Charges import com.mifos.core.network.datamanager.DataManagerCharge -import com.mifos.core.objects.client.Charges import kotlinx.coroutines.flow.Flow import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt index eed9c06a74..2322d5bc7f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientDetailsRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ClientDetailsRepository +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.client.Client import com.mifos.core.network.datamanager.DataManagerClient -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.client.Client import okhttp3.MultipartBody import okhttp3.ResponseBody import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt index 71b3b9c2f1..5e0ad8ecfa 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifierDialogRepositoryImp.kt @@ -11,9 +11,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ClientIdentifierDialogRepository import com.mifos.core.network.datamanager.DataManagerClient -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 import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt index e8b1ba95e6..bf0e74a045 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientIdentifiersRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ClientIdentifiersRepository import com.mifos.core.network.datamanager.DataManagerClient -import com.mifos.core.objects.noncore.Identifier +import com.mifos.core.objects.noncoreobjects.Identifier import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt index a89eee4eb6..d491775369 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ClientListRepositoryImp.kt @@ -14,9 +14,9 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import com.mifos.core.data.pagingSource.ClientListPagingSource import com.mifos.core.data.repository.ClientListRepository +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 kotlinx.coroutines.flow.Flow import rx.Observable import javax.inject.Inject 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 index 5d7f941a12..69792f571a 100644 --- 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 @@ -9,10 +9,10 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.CenterPayload 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.response.SaveResponse +import com.mifos.core.objects.responses.SaveResponse import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewClientRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewClientRepositoryImp.kt index 5e3d2cebfb..164c67c96f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewClientRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewClientRepositoryImp.kt @@ -10,14 +10,14 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CreateNewClientRepository +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 com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.network.datamanager.DataManagerOffices import com.mifos.core.network.datamanager.DataManagerStaff -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 okhttp3.MultipartBody import okhttp3.ResponseBody import rx.Observable diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt index 657d184296..ca69303e20 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/CreateNewGroupRepositoryImp.kt @@ -10,11 +10,11 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.CreateNewGroupRepository +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.entity.organisation.Office import com.mifos.core.network.datamanager.DataManagerGroups import com.mifos.core.network.datamanager.DataManagerOffices -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.objects.responses.SaveResponse import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableListRepositoryImp.kt index 9f41329748..04c8e6a9d2 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableListRepositoryImp.kt @@ -9,15 +9,15 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.GroupLoanPayload -import com.mifos.core.data.LoansPayload import com.mifos.core.data.repository.DataTableListRepository +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.DataManager import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.network.datamanager.DataManagerLoan -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.network.model.LoansPayload +import com.mifos.core.payloads.GroupLoanPayload import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableRepositoryImp.kt index 0be9fef3d2..70126c0d76 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DataTableRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.DataTableRepository +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.network.datamanager.DataManagerDataTable -import com.mifos.core.objects.noncore.DataTable import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt index ab9872bda6..9304d5986e 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/DocumentListRepositoryImp.kt @@ -12,7 +12,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.DocumentListRepository import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerDocument -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import okhttp3.ResponseBody import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt index 9e9289f070..e91e2ab823 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GenerateCollectionSheetRepositoryImp.kt @@ -10,17 +10,17 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GenerateCollectionSheetRepository +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.DataManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerCollectionSheet -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 import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupDetailsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupDetailsRepositoryImp.kt index ce8b0441b3..366c1485de 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupDetailsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupDetailsRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GroupDetailsRepository +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations import com.mifos.core.network.datamanager.DataManagerGroups -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupListRepositoryImp.kt index 79947277f0..4f7a452727 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupListRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GroupListRepository +import com.mifos.core.entity.group.CenterWithAssociations +import com.mifos.core.entity.group.GroupWithAssociations import com.mifos.core.network.DataManager -import com.mifos.core.objects.group.CenterWithAssociations -import com.mifos.core.objects.group.GroupWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt index a426685329..066b82b882 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupLoanAccountRepositoryImp.kt @@ -9,11 +9,11 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.GroupLoanPayload import com.mifos.core.data.repository.GroupLoanAccountRepository +import com.mifos.core.entity.accounts.loan.Loans import com.mifos.core.network.DataManager -import com.mifos.core.objects.accounts.loan.Loans -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.template.loan.GroupLoanTemplate +import com.mifos.core.payloads.GroupLoanPayload import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt index 36fb8a95c2..a36262850c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/GroupsListRepositoryImpl.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.GroupsListRepository +import com.mifos.core.entity.group.Group import com.mifos.core.network.datamanager.DataManagerGroups -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Group +import com.mifos.core.objects.clients.Page import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import rx.Subscriber diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt index c474b00684..57f320ff4e 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountApprovalRepositoryImp.kt @@ -12,7 +12,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanAccountApprovalRepository import com.mifos.core.network.DataManager 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 import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt index 2f067fa988..512fcb7a37 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountDisbursementRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanAccountDisbursementRepository +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerLoan -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 import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt index 362531fa4a..514451326c 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountRepositoryImp.kt @@ -9,12 +9,12 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.LoansPayload import com.mifos.core.data.repository.LoanAccountRepository +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.entity.templates.loans.LoanTemplate import com.mifos.core.network.datamanager.DataManagerLoan -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.network.model.LoansPayload +import com.mifos.core.objects.organisations.LoanProducts import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountSummaryRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountSummaryRepositoryImp.kt index cc392adf2c..309194c7ad 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountSummaryRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanAccountSummaryRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanAccountSummaryRepository +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import com.mifos.core.network.datamanager.DataManagerLoan -import com.mifos.core.objects.accounts.loan.LoanWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt index ca9e2c5120..13143f0543 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeDialogRepositoryImp.kt @@ -9,10 +9,10 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.ChargesPayload import com.mifos.core.data.repository.LoanChargeDialogRepository import com.mifos.core.network.DataManager -import com.mifos.core.objects.client.ChargeCreationResponse +import com.mifos.core.objects.clients.ChargeCreationResponse +import com.mifos.core.payloads.ChargesPayload import okhttp3.ResponseBody import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeRepositoryImp.kt index a2870a72dd..fb77ed98ba 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanChargeRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanChargeRepository +import com.mifos.core.entity.client.Charges import com.mifos.core.network.DataManager -import com.mifos.core.objects.client.Charges import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt index 60295a87ee..8741b01186 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanRepaymentRepository +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate import com.mifos.core.network.datamanager.DataManagerLoan -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.objects.account.loan.LoanRepaymentResponse import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentScheduleRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentScheduleRepositoryImp.kt index 99050e51f1..2c5930a51b 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentScheduleRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanRepaymentScheduleRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanRepaymentScheduleRepository +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import com.mifos.core.network.DataManager -import com.mifos.core.objects.accounts.loan.LoanWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanTransactionsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanTransactionsRepositoryImp.kt index 6dd34f3ee3..b743985696 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanTransactionsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/LoanTransactionsRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.LoanTransactionsRepository +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import com.mifos.core.network.DataManager -import com.mifos.core.objects.accounts.loan.LoanWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/NewIndividualCollectionSheetRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/NewIndividualCollectionSheetRepositoryImp.kt index ffe2f7aca6..454c400140 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/NewIndividualCollectionSheetRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/NewIndividualCollectionSheetRepositoryImp.kt @@ -10,12 +10,12 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.NewIndividualCollectionSheetRepository +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff import com.mifos.core.network.DataManager import com.mifos.core.network.datamanager.DataManagerCollectionSheet import com.mifos.core.network.model.RequestCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/NoteRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/NoteRepositoryImp.kt index a2915e8846..7da447501b 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/NoteRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/NoteRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.NoteRepository +import com.mifos.core.entity.noncore.Note import com.mifos.core.network.datamanager.DataManagerNote -import com.mifos.core.objects.noncore.Note import javax.inject.Inject class NoteRepositoryImp @Inject constructor(private val dataManagerNote: DataManagerNote) : 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 index 79d7452a2e..7e213c8ade 100644 --- 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 @@ -9,17 +9,17 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.OfflineDashboardRepository +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +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.entity.group.GroupPayload 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.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.group.GroupPayload import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt index 5a54a002cf..08c164074a 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PathTrackingRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.PathTrackingRepository import com.mifos.core.network.datamanager.DataManagerDataTable -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt index fa1fbaec2c..7c9bb21cf9 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/PinPointClientRepositoryImp.kt @@ -12,8 +12,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.PinPointClientRepository import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerClient -import com.mifos.core.objects.client.ClientAddressRequest -import com.mifos.core.objects.client.ClientAddressResponse +import com.mifos.core.objects.clients.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressResponse import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt index ea47eee513..9fbb92b913 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportCategoryRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ReportCategoryRepository import com.mifos.core.network.datamanager.DataManagerRunReport -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt index b1e4942699..167a1e75fb 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/ReportDetailRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.ReportDetailRepository import com.mifos.core.network.datamanager.DataManagerRunReport -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import javax.inject.Inject /** diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt index 275ffbb1b3..fc7c4c28f0 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountApprovalRepositoryImp.kt @@ -12,7 +12,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountApprovalRepository import com.mifos.core.network.GenericResponse import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.accounts.loan.SavingsApproval +import com.mifos.core.objects.account.loan.SavingsApproval import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt index d83d00c07c..afcbf7104a 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountRepositoryImp.kt @@ -9,12 +9,12 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.SavingsPayload import com.mifos.core.data.repository.SavingsAccountRepository +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.templates.savings.SavingProductsTemplate import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.objects.organisations.ProductSavings +import com.mifos.core.payloads.SavingsPayload import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountSummaryRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountSummaryRepositoryImp.kt index ea0b628247..bacf5596a8 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountSummaryRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountSummaryRepositoryImp.kt @@ -10,8 +10,8 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountSummaryRepository +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt index 9afc79c66d..f60377e0f3 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SavingsAccountTransactionRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SavingsAccountTransactionRepository +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveyListRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveyListRepositoryImp.kt index 51d996cb61..5c35c03b33 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveyListRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveyListRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SurveyListRepository +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import com.mifos.core.network.datamanager.DataManagerSurveys -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt index ef2f5e1762..3c6e9736fc 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SurveySubmitRepositoryImp.kt @@ -11,7 +11,7 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SurveySubmitRepository import com.mifos.core.network.datamanager.DataManagerSurveys -import com.mifos.core.objects.survey.Scorecard +import com.mifos.core.objects.surveys.Scorecard import rx.Observable import javax.inject.Inject 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 index 41367c6ec0..39645fed20 100644 --- 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 @@ -9,10 +9,10 @@ */ package com.mifos.core.data.repositoryImp -import com.mifos.core.data.CenterPayload 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.response.SaveResponse +import com.mifos.core.objects.responses.SaveResponse import rx.Observable import javax.inject.Inject 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 index 1ed198ba81..b263fb03c7 100644 --- 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 @@ -10,23 +10,23 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncCentersDialogRepository +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +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.group.CenterWithAssociations +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate 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.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -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.group.GroupWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientPayloadsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientPayloadsRepositoryImp.kt index c9a862a056..847921a685 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientPayloadsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientPayloadsRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncClientPayloadsRepository +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientPayload import com.mifos.core.network.datamanager.DataManagerClient -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientPayload import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientsDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientsDialogRepositoryImp.kt index 7be61d67d9..d0f5b0156f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientsDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncClientsDialogRepositoryImp.kt @@ -10,15 +10,15 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncClientsDialogRepository +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt index f6f0923025..0f1c2f687f 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupPayloadsRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncGroupPayloadsRepository +import com.mifos.core.entity.group.GroupPayload import com.mifos.core.network.datamanager.DataManagerGroups -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.objects.responses.SaveResponse import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupsDialogRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupsDialogRepositoryImp.kt index 3630e8838a..1c0c5b95b0 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupsDialogRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncGroupsDialogRepositoryImp.kt @@ -10,19 +10,19 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncGroupsDialogRepository +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate 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.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate import rx.Observable import javax.inject.Inject diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt index 4e292311ba..285d57a8a6 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncLoanRepaymentTransactionRepositoryImp.kt @@ -10,9 +10,9 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncLoanRepaymentTransactionRepository +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest import com.mifos.core.network.datamanager.DataManagerLoan -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse +import com.mifos.core.objects.account.loan.LoanRepaymentResponse import rx.Observable import javax.inject.Inject @@ -23,7 +23,7 @@ class SyncLoanRepaymentTransactionRepositoryImp @Inject constructor(private val return dataManagerLoan.databaseLoanRepayments } - override fun paymentTypeOption(): Observable> { + override fun paymentTypeOption(): Observable> { return dataManagerLoan.paymentTypeOption } diff --git a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt index bb4b4f5ec9..f97ad801fc 100644 --- a/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt +++ b/core/data/src/main/java/com/mifos/core/data/repositoryImp/SyncSavingsAccountTransactionRepositoryImp.kt @@ -10,10 +10,10 @@ package com.mifos.core.data.repositoryImp import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.network.datamanager.DataManagerLoan import com.mifos.core.network.datamanager.DataManagerSavings -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import rx.Observable import javax.inject.Inject @@ -29,7 +29,7 @@ class SyncSavingsAccountTransactionRepositoryImp @Inject constructor( return dataManagerSavings.allSavingsAccountTransactions } - override fun paymentTypeOption(): Observable> { + override fun paymentTypeOption(): Observable> { return dataManagerLoan.paymentTypeOption } diff --git a/core/database/src/main/java/com/mifos/core/database/MigrationVersion2.kt b/core/database/src/main/java/com/mifos/core/database/MigrationVersion2.kt index 9035219b90..70626999dd 100644 --- a/core/database/src/main/java/com/mifos/core/database/MigrationVersion2.kt +++ b/core/database/src/main/java/com/mifos/core/database/MigrationVersion2.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.database -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.group.Center import com.raizlabs.android.dbflow.annotation.Migration import com.raizlabs.android.dbflow.sql.SQLiteType import com.raizlabs.android.dbflow.sql.migration.AlterTableMigration 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 index 13d4156de1..98d2980cf6 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCenter.kt @@ -10,16 +10,16 @@ package com.mifos.core.databasehelper import android.os.AsyncTask -import com.mifos.core.data.CenterPayload -import com.mifos.core.data.CenterPayload_Table -import com.mifos.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Center -import com.mifos.core.objects.group.CenterDate -import com.mifos.core.objects.group.CenterWithAssociations -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.Group_Table -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.entity.center.CenterPayload_Table +import com.mifos.core.entity.group.Center +import com.mifos.core.entity.group.CenterDate +import com.mifos.core.entity.group.CenterWithAssociations +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.raizlabs.android.dbflow.sql.language.Delete import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt index e900ba9edf..4959aea98c 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperCharge.kt @@ -10,10 +10,10 @@ package com.mifos.core.databasehelper import android.os.AsyncTask -import com.mifos.core.objects.client.Charges -import com.mifos.core.objects.client.Charges_Table -import com.mifos.core.objects.client.ClientDate -import com.mifos.core.objects.client.Page +import com.mifos.core.entity.client.Charges +import com.mifos.core.entity.client.Charges_Table +import com.mifos.core.entity.client.ClientDate +import com.mifos.core.objects.clients.Page import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable import javax.inject.Inject diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt index 29bc07a06c..307e691927 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperClient.kt @@ -14,33 +14,33 @@ import com.google.gson.GsonBuilder import com.google.gson.reflect.TypeToken import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.MapDeserializer -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.loan.LoanAccount_Table -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount_Table -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientDate -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.client.ClientPayload_Table -import com.mifos.core.objects.client.Client_Table -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.noncore.ColumnHeader -import com.mifos.core.objects.noncore.ColumnHeader_Table -import com.mifos.core.objects.noncore.ColumnValue -import com.mifos.core.objects.noncore.ColumnValue_Table -import com.mifos.core.objects.noncore.DataTable -import com.mifos.core.objects.noncore.DataTablePayload -import com.mifos.core.objects.noncore.DataTablePayload_Table -import com.mifos.core.objects.noncore.DataTable_Table -import com.mifos.core.objects.templates.clients.ClientsTemplate -import com.mifos.core.objects.templates.clients.InterestType -import com.mifos.core.objects.templates.clients.OfficeOptions -import com.mifos.core.objects.templates.clients.Options -import com.mifos.core.objects.templates.clients.Options_Table -import com.mifos.core.objects.templates.clients.SavingProductOptions -import com.mifos.core.objects.templates.clients.StaffOptions +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.loan.LoanAccount_Table +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount_Table +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientDate +import com.mifos.core.entity.client.ClientPayload +import com.mifos.core.entity.client.ClientPayload_Table +import com.mifos.core.entity.client.Client_Table +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.noncore.ColumnHeader +import com.mifos.core.entity.noncore.ColumnHeader_Table +import com.mifos.core.entity.noncore.ColumnValue +import com.mifos.core.entity.noncore.ColumnValue_Table +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.entity.noncore.DataTablePayload +import com.mifos.core.entity.noncore.DataTablePayload_Table +import com.mifos.core.entity.noncore.DataTable_Table +import com.mifos.core.entity.templates.clients.ClientsTemplate +import com.mifos.core.entity.templates.clients.InterestType +import com.mifos.core.entity.templates.clients.OfficeOptions +import com.mifos.core.entity.templates.clients.Options +import com.mifos.core.entity.templates.clients.Options_Table +import com.mifos.core.entity.templates.clients.SavingProductOptions +import com.mifos.core.entity.templates.clients.StaffOptions +import com.mifos.core.objects.clients.Page import com.raizlabs.android.dbflow.sql.language.Delete import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt index c428cb7e32..657332f0db 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperGroups.kt @@ -9,18 +9,18 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.loan.LoanAccount_Table -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount_Table -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupDate -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.group.GroupPayload_Table -import com.mifos.core.objects.group.Group_Table -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.loan.LoanAccount_Table +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount_Table +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupDate +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload_Table +import com.mifos.core.entity.group.Group_Table +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.responses.SaveResponse import com.raizlabs.android.dbflow.sql.language.Delete import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt index 8c46f57c7e..1950c1c842 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperLoan.kt @@ -9,15 +9,15 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.loan.ActualDisbursementDate -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest_Table -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.LoanWithAssociations_Table -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate_Table +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.loan.ActualDisbursementDate +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest_Table +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations_Table +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate_Table +import com.mifos.core.objects.account.loan.LoanRepaymentResponse import com.raizlabs.android.dbflow.sql.language.Delete import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperOffices.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperOffices.kt index d1e205fc6b..6058e6e3db 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperOffices.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperOffices.kt @@ -10,8 +10,8 @@ package com.mifos.core.databasehelper import android.os.AsyncTask -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.OfficeOpeningDate +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.OfficeOpeningDate import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable import javax.inject.Inject diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt index 76abc44a15..6af2b2d86c 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSavings.kt @@ -9,17 +9,17 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest_Table -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations_Table -import com.mifos.core.objects.accounts.savings.SavingsTransactionDate -import com.mifos.core.objects.accounts.savings.Transaction -import com.mifos.core.objects.accounts.savings.Transaction_Table -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate_Table +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest_Table +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations_Table +import com.mifos.core.entity.accounts.savings.SavingsTransactionDate +import com.mifos.core.entity.accounts.savings.Transaction +import com.mifos.core.entity.accounts.savings.Transaction_Table +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate_Table +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import com.raizlabs.android.dbflow.sql.language.Delete import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperStaff.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperStaff.kt index 789384ca81..ac65d09eed 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperStaff.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperStaff.kt @@ -10,8 +10,8 @@ package com.mifos.core.databasehelper import android.os.AsyncTask -import com.mifos.core.objects.organisation.Staff -import com.mifos.core.objects.organisation.Staff_Table +import com.mifos.core.entity.organisation.Staff +import com.mifos.core.entity.organisation.Staff_Table import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable import javax.inject.Inject diff --git a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSurveys.kt b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSurveys.kt index 592612f62b..89e0ca6b06 100644 --- a/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSurveys.kt +++ b/core/database/src/main/java/com/mifos/core/databasehelper/DatabaseHelperSurveys.kt @@ -9,11 +9,11 @@ */ package com.mifos.core.databasehelper -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.QuestionDatas_Table -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.ResponseDatas_Table -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.QuestionDatas_Table +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.ResponseDatas_Table +import com.mifos.core.entity.survey.Survey import com.raizlabs.android.dbflow.sql.language.SQLite import rx.Observable import javax.inject.Inject diff --git a/core/database/src/main/java/com/mifos/core/objects/PaymentTypeOption.kt b/core/database/src/main/java/com/mifos/core/entity/PaymentTypeOption.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/PaymentTypeOption.kt rename to core/database/src/main/java/com/mifos/core/entity/PaymentTypeOption.kt index 68785585de..64c6c58177 100644 --- a/core/database/src/main/java/com/mifos/core/objects/PaymentTypeOption.kt +++ b/core/database/src/main/java/com/mifos/core/entity/PaymentTypeOption.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects +package com.mifos.core.entity import android.os.Parcel import android.os.Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/Timeline.kt b/core/database/src/main/java/com/mifos/core/entity/Timeline.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/Timeline.kt rename to core/database/src/main/java/com/mifos/core/entity/Timeline.kt index d9c30d1280..33a5d791fb 100644 --- a/core/database/src/main/java/com/mifos/core/objects/Timeline.kt +++ b/core/database/src/main/java/com/mifos/core/entity/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects +package com.mifos.core.entity import android.os.Parcel import android.os.Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/CenterAccounts.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/CenterAccounts.kt similarity index 80% rename from core/database/src/main/java/com/mifos/core/objects/accounts/CenterAccounts.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/CenterAccounts.kt index 3d112072e8..e56f82d19e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/CenterAccounts.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/CenterAccounts.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts +package com.mifos.core.entity.accounts import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/ClientAccounts.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/ClientAccounts.kt similarity index 87% rename from core/database/src/main/java/com/mifos/core/objects/accounts/ClientAccounts.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/ClientAccounts.kt index 938c41bfcf..6c0f324761 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/ClientAccounts.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/ClientAccounts.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts +package com.mifos.core.entity.accounts import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/GroupAccounts.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/GroupAccounts.kt similarity index 87% rename from core/database/src/main/java/com/mifos/core/objects/accounts/GroupAccounts.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/GroupAccounts.kt index d366dbbabb..82f9205b52 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/GroupAccounts.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/GroupAccounts.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts +package com.mifos.core.entity.accounts import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount import kotlinx.parcelize.Parcelize @Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/ActualDisbursementDate.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/ActualDisbursementDate.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/ActualDisbursementDate.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/ActualDisbursementDate.kt index d61a77f899..10ac85f040 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/ActualDisbursementDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/ActualDisbursementDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loan.kt similarity index 81% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loan.kt index 11a3633e1e..3dc91adfe3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loan.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loan.kt @@ -7,7 +7,15 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan + +import com.mifos.core.objects.account.loan.AmortizationType +import com.mifos.core.objects.account.loan.Currency +import com.mifos.core.objects.account.loan.InterestCalculationPeriodType +import com.mifos.core.objects.account.loan.InterestRateFrequencyType +import com.mifos.core.objects.account.loan.InterestType +import com.mifos.core.objects.account.loan.RepaymentFrequencyType +import com.mifos.core.objects.account.loan.TermPeriodFrequencyType data class Loan( var id: Int? = null, diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanAccount.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanAccount.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanAccount.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanAccount.kt index 243db77e73..deeb467510 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanAccount.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanAccount.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalData.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanApprovalData.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalData.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanApprovalData.kt index f4db018d25..c55ce68001 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalData.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanApprovalData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentRequest.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanRepaymentRequest.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentRequest.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanRepaymentRequest.kt index f9e08e6022..017273e3ab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentRequest.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanRepaymentRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanType.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanType.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanType.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanType.kt index d7428d3e82..9c42086873 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanWithAssociations.kt similarity index 84% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanWithAssociations.kt index bcc859e595..db6c8ca818 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/LoanWithAssociations.kt @@ -7,11 +7,20 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel +import com.mifos.core.objects.account.loan.AmortizationType +import com.mifos.core.objects.account.loan.Currency +import com.mifos.core.objects.account.loan.InterestCalculationPeriodType +import com.mifos.core.objects.account.loan.InterestRateFrequencyType +import com.mifos.core.objects.account.loan.InterestType +import com.mifos.core.objects.account.loan.RepaymentFrequencyType +import com.mifos.core.objects.account.loan.RepaymentSchedule +import com.mifos.core.objects.account.loan.TermPeriodFrequencyType +import com.mifos.core.objects.account.loan.Transaction import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loans.kt similarity index 82% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loans.kt index 5397f350a3..918abb70a4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Loans.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Loans.kt @@ -7,9 +7,16 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable +import com.mifos.core.objects.account.loan.AmortizationType +import com.mifos.core.objects.account.loan.Currency +import com.mifos.core.objects.account.loan.InterestCalculationPeriodType +import com.mifos.core.objects.account.loan.InterestRateFrequencyType +import com.mifos.core.objects.account.loan.InterestType +import com.mifos.core.objects.account.loan.RepaymentFrequencyType +import com.mifos.core.objects.account.loan.TermPeriodFrequencyType import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Status.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Status.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Status.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/Status.kt index e3752515ff..9ecec3892e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Status.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Summary.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/Summary.kt index 954be68ddf..222b1d04d6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Summary.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Summary.kt @@ -7,11 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel +import com.mifos.core.objects.account.loan.Currency import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Timeline.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Timeline.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Timeline.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/loan/Timeline.kt index 225c55b91f..493d6114db 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Timeline.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/loan/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.entity.accounts.loan import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Charge.kt similarity index 88% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/Charge.kt index ff0b569cf8..0e41a52bf0 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Charge.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Charge.kt @@ -7,9 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable +import com.mifos.core.objects.account.saving.ChargeCalculationType +import com.mifos.core.objects.account.saving.ChargeTimeType import kotlinx.parcelize.Parcelize import javax.annotation.processing.Generated diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Currency.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Currency.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Currency.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/Currency.kt index 97ad218a7b..0bf70d2d6a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Currency.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/DepositType.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/DepositType.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/DepositType.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/DepositType.kt index 50eccb4195..38b2319512 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/DepositType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/DepositType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccount.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccount.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccount.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccount.kt index 90f2a07360..bf464a6910 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccount.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccount.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionRequest.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountTransactionRequest.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionRequest.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountTransactionRequest.kt index 0bb4709af1..7c03ba0aef 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionRequest.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountTransactionRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountWithAssociations.kt similarity index 83% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountWithAssociations.kt index b125f7913c..c97861d89a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsAccountWithAssociations.kt @@ -7,11 +7,17 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel +import com.mifos.core.objects.account.saving.InterestCalculationDaysInYearType +import com.mifos.core.objects.account.saving.InterestCalculationType +import com.mifos.core.objects.account.saving.InterestCompoundingPeriodType +import com.mifos.core.objects.account.saving.InterestPostingPeriodType +import com.mifos.core.objects.account.saving.LockinPeriodFrequencyType +import com.mifos.core.objects.account.saving.Timeline import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsSummaryData.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsSummaryData.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsSummaryData.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsSummaryData.kt index dab749e150..a07435805f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsSummaryData.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsSummaryData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionData.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionData.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionData.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionData.kt index 8828247baf..991eeb428e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionData.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionDate.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionDate.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionDate.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionDate.kt index 95874f1586..98580ba740 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsTransactionDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/SavingsTransactionDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Status.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Status.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Status.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/Status.kt index 036c26563a..e7d5fecc4d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Status.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Summary.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Summary.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Summary.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/Summary.kt index 58917400ca..e339b8d6e3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Summary.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Summary.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Transaction.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Transaction.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Transaction.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/Transaction.kt index c60a698586..4b1440b993 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Transaction.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/Transaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/TransactionType.kt b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/TransactionType.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/TransactionType.kt rename to core/database/src/main/java/com/mifos/core/entity/accounts/savings/TransactionType.kt index bff399dae1..b820d81bab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/TransactionType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/accounts/savings/TransactionType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.entity.accounts.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/data/CenterPayload.kt b/core/database/src/main/java/com/mifos/core/entity/center/CenterPayload.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/data/CenterPayload.kt rename to core/database/src/main/java/com/mifos/core/entity/center/CenterPayload.kt index 1f8fe2d9d2..c6d7c72dcb 100644 --- a/core/database/src/main/java/com/mifos/core/data/CenterPayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/center/CenterPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.data +package com.mifos.core.entity.center import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ChargeCalculationType.kt b/core/database/src/main/java/com/mifos/core/entity/client/ChargeCalculationType.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/client/ChargeCalculationType.kt rename to core/database/src/main/java/com/mifos/core/entity/client/ChargeCalculationType.kt index 5af1d762e0..02461df315 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ChargeCalculationType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ChargeTimeType.kt b/core/database/src/main/java/com/mifos/core/entity/client/ChargeTimeType.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/client/ChargeTimeType.kt rename to core/database/src/main/java/com/mifos/core/entity/client/ChargeTimeType.kt index 99db12cb7b..7c2f858689 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ChargeTimeType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Charges.kt b/core/database/src/main/java/com/mifos/core/entity/client/Charges.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/client/Charges.kt rename to core/database/src/main/java/com/mifos/core/entity/client/Charges.kt index d618902ac3..ec0e029a44 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Charges.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/Charges.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Client.kt b/core/database/src/main/java/com/mifos/core/entity/client/Client.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/client/Client.kt rename to core/database/src/main/java/com/mifos/core/entity/client/Client.kt index 8ec08ff001..ac7ae0f10a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Client.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/Client.kt @@ -7,13 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase +import com.mifos.core.entity.Timeline +import com.mifos.core.entity.group.Group import com.mifos.core.model.MifosBaseModel -import com.mifos.core.objects.Timeline -import com.mifos.core.objects.group.Group import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ClientDate.kt b/core/database/src/main/java/com/mifos/core/entity/client/ClientDate.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/client/ClientDate.kt rename to core/database/src/main/java/com/mifos/core/entity/client/ClientDate.kt index 046503de21..485700ef26 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ClientDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/ClientDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt b/core/database/src/main/java/com/mifos/core/entity/client/ClientPayload.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt rename to core/database/src/main/java/com/mifos/core/entity/client/ClientPayload.kt index 5508b182b5..f80dfade03 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ClientPayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/ClientPayload.kt @@ -7,12 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase +import com.mifos.core.entity.noncore.DataTablePayload import com.mifos.core.model.MifosBaseModel -import com.mifos.core.objects.noncore.DataTablePayload +import com.mifos.core.objects.clients.Address import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Currency.kt b/core/database/src/main/java/com/mifos/core/entity/client/Currency.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/client/Currency.kt rename to core/database/src/main/java/com/mifos/core/entity/client/Currency.kt index 71e7ed6a75..8147896aab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Currency.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/client/PageItem.kt b/core/database/src/main/java/com/mifos/core/entity/client/PageItem.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/client/PageItem.kt rename to core/database/src/main/java/com/mifos/core/entity/client/PageItem.kt index bae78a765e..c967cced12 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/PageItem.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/PageItem.kt @@ -7,9 +7,9 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client -import com.mifos.core.objects.Timeline +import com.mifos.core.entity.Timeline /** * Created by ishankhanna on 09/02/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Savings.kt b/core/database/src/main/java/com/mifos/core/entity/client/Savings.kt similarity index 88% rename from core/database/src/main/java/com/mifos/core/objects/client/Savings.kt rename to core/database/src/main/java/com/mifos/core/entity/client/Savings.kt index 409cb2242e..4c8ae3bbab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Savings.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/Savings.kt @@ -7,9 +7,9 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client -import com.mifos.core.objects.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.DepositType /** * Created by nellyk on 2/19/2016. diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Status.kt b/core/database/src/main/java/com/mifos/core/entity/client/Status.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/client/Status.kt rename to core/database/src/main/java/com/mifos/core/entity/client/Status.kt index b8de2e012d..f75fc61944 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Status.kt +++ b/core/database/src/main/java/com/mifos/core/entity/client/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.entity.client import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CenterDetail.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CenterDetail.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CenterDetail.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/CenterDetail.kt index e01317b036..f721879683 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CenterDetail.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CenterDetail.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/ClientCollectionSheet.kt similarity index 80% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/ClientCollectionSheet.kt index 280c2a0e12..4f7ce2685d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ClientCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/ClientCollectionSheet.kt @@ -7,9 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable +import com.mifos.core.objects.collectionsheets.AttendanceTypeOption +import com.mifos.core.objects.collectionsheets.LoanCollectionSheet import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetPayload.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetPayload.kt index d14d7f00e0..c0537037fd 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetPayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetPayload.kt @@ -7,11 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable import com.mifos.core.model.BulkRepaymentTransactions import com.mifos.core.model.ClientsAttendance +import com.mifos.core.objects.collectionsheets.BulkSavingsDueTransaction import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetResponse.kt similarity index 70% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetResponse.kt index 4783251a46..9face4b8f9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetResponse.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/CollectionSheetResponse.kt @@ -7,10 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable -import com.mifos.core.objects.organisation.LoanProducts +import com.mifos.core.objects.collectionsheets.AttendanceTypeOption +import com.mifos.core.objects.collectionsheets.SavingsProduct +import com.mifos.core.objects.organisations.LoanProducts import kotlinx.parcelize.Parcelize /** @@ -26,7 +28,7 @@ data class CollectionSheetResponse( var loanProducts: List = ArrayList(), - var paymentTypeOptions: List = ArrayList(), + var paymentTypeOptions: List = ArrayList(), var savingsProducts: List = ArrayList(), ) : Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/GroupCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/GroupCollectionSheet.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/GroupCollectionSheet.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/GroupCollectionSheet.kt index e791255117..e7e5e4f8db 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/GroupCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/GroupCollectionSheet.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/IndividualCollectionSheet.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/IndividualCollectionSheet.kt index ba3e88fc0d..62f97ea976 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/IndividualCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/IndividualCollectionSheet.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.PaymentTypeOptions +import com.mifos.core.objects.account.loan.PaymentTypeOptions import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/MeetingFallCalendar.kt similarity index 86% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/MeetingFallCalendar.kt index 20a78c53bf..02349b9163 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/MeetingFallCalendar.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/MeetingFallCalendar.kt @@ -7,10 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.Status +import com.mifos.core.entity.accounts.loan.Status +import com.mifos.core.objects.collectionsheets.CollectionMeetingCalendar import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ProductiveCollectionSheetPayload.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/ProductiveCollectionSheetPayload.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/ProductiveCollectionSheetPayload.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/ProductiveCollectionSheetPayload.kt index 0346a22ca3..6a688b2918 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/ProductiveCollectionSheetPayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/ProductiveCollectionSheetPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable import com.mifos.core.model.BulkRepaymentTransactions diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsCollectionSheet.kt b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/SavingsCollectionSheet.kt similarity index 88% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsCollectionSheet.kt rename to core/database/src/main/java/com/mifos/core/entity/collectionsheet/SavingsCollectionSheet.kt index c81ea8694e..20fb72f002 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsCollectionSheet.kt +++ b/core/database/src/main/java/com/mifos/core/entity/collectionsheet/SavingsCollectionSheet.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.entity.collectionsheet import android.os.Parcelable -import com.mifos.core.objects.accounts.savings.Currency +import com.mifos.core.entity.accounts.savings.Currency import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/group/Center.kt b/core/database/src/main/java/com/mifos/core/entity/group/Center.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/group/Center.kt rename to core/database/src/main/java/com/mifos/core/entity/group/Center.kt index cad34f269b..3969ea6bdd 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/Center.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/Center.kt @@ -7,13 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable import com.mifos.core.database.MifosDatabase +import com.mifos.core.entity.Timeline +import com.mifos.core.entity.client.Status import com.mifos.core.model.MifosBaseModel -import com.mifos.core.objects.Timeline -import com.mifos.core.objects.client.Status import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/group/CenterDate.kt b/core/database/src/main/java/com/mifos/core/entity/group/CenterDate.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/group/CenterDate.kt rename to core/database/src/main/java/com/mifos/core/entity/group/CenterDate.kt index a1d5073027..f6c72a427b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/CenterDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/CenterDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt b/core/database/src/main/java/com/mifos/core/entity/group/CenterWithAssociations.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt rename to core/database/src/main/java/com/mifos/core/entity/group/CenterWithAssociations.kt index 8468688339..069c045c11 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/CenterWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/CenterWithAssociations.kt @@ -7,12 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable -import com.mifos.core.objects.Timeline -import com.mifos.core.objects.client.Status -import com.mifos.core.objects.collectionsheet.CollectionMeetingCalendar +import com.mifos.core.entity.Timeline +import com.mifos.core.entity.client.Status +import com.mifos.core.objects.collectionsheets.CollectionMeetingCalendar import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/group/Group.kt b/core/database/src/main/java/com/mifos/core/entity/group/Group.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/group/Group.kt rename to core/database/src/main/java/com/mifos/core/entity/group/Group.kt index 2d4ec0b38e..179d67a94d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/Group.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/Group.kt @@ -7,13 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable import com.mifos.core.database.MifosDatabase +import com.mifos.core.entity.Timeline +import com.mifos.core.entity.client.Status import com.mifos.core.model.MifosBaseModel -import com.mifos.core.objects.Timeline -import com.mifos.core.objects.client.Status import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ForeignKey import com.raizlabs.android.dbflow.annotation.ModelContainer diff --git a/core/database/src/main/java/com/mifos/core/objects/group/GroupDate.kt b/core/database/src/main/java/com/mifos/core/entity/group/GroupDate.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/group/GroupDate.kt rename to core/database/src/main/java/com/mifos/core/entity/group/GroupDate.kt index 4080101e83..9ee4c50cfb 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/GroupDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/GroupDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/group/GroupPayload.kt b/core/database/src/main/java/com/mifos/core/entity/group/GroupPayload.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/group/GroupPayload.kt rename to core/database/src/main/java/com/mifos/core/entity/group/GroupPayload.kt index 1c962adb1e..1b34a78960 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/GroupPayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/GroupPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/group/GroupWithAssociations.kt b/core/database/src/main/java/com/mifos/core/entity/group/GroupWithAssociations.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/group/GroupWithAssociations.kt rename to core/database/src/main/java/com/mifos/core/entity/group/GroupWithAssociations.kt index 46f902dcad..44819fb445 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/GroupWithAssociations.kt +++ b/core/database/src/main/java/com/mifos/core/entity/group/GroupWithAssociations.kt @@ -7,12 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.entity.group import android.os.Parcelable -import com.mifos.core.objects.Timeline -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.Status +import com.mifos.core.entity.Timeline +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.Status import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/navigation/ClientListArgs.kt b/core/database/src/main/java/com/mifos/core/entity/navigation/ClientListArgs.kt similarity index 87% rename from core/database/src/main/java/com/mifos/core/objects/navigation/ClientListArgs.kt rename to core/database/src/main/java/com/mifos/core/entity/navigation/ClientListArgs.kt index 58cd690cd2..e5b890d04c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/navigation/ClientListArgs.kt +++ b/core/database/src/main/java/com/mifos/core/entity/navigation/ClientListArgs.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.navigation +package com.mifos.core.entity.navigation import android.os.Parcelable -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client import kotlinx.parcelize.Parcelize /* diff --git a/core/database/src/main/java/com/mifos/core/objects/navigation/DataTableDataNavigationArg.kt b/core/database/src/main/java/com/mifos/core/entity/navigation/DataTableDataNavigationArg.kt similarity index 83% rename from core/database/src/main/java/com/mifos/core/objects/navigation/DataTableDataNavigationArg.kt rename to core/database/src/main/java/com/mifos/core/entity/navigation/DataTableDataNavigationArg.kt index 446c00c917..7172b13644 100644 --- a/core/database/src/main/java/com/mifos/core/objects/navigation/DataTableDataNavigationArg.kt +++ b/core/database/src/main/java/com/mifos/core/entity/navigation/DataTableDataNavigationArg.kt @@ -7,9 +7,9 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.navigation +package com.mifos.core.entity.navigation -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable data class DataTableDataNavigationArg( diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/ColumnHeader.kt b/core/database/src/main/java/com/mifos/core/entity/noncore/ColumnHeader.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/noncore/ColumnHeader.kt rename to core/database/src/main/java/com/mifos/core/entity/noncore/ColumnHeader.kt index 29ab4b001d..517ed4e2db 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/ColumnHeader.kt +++ b/core/database/src/main/java/com/mifos/core/entity/noncore/ColumnHeader.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.entity.noncore import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/ColumnValue.kt b/core/database/src/main/java/com/mifos/core/entity/noncore/ColumnValue.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/noncore/ColumnValue.kt rename to core/database/src/main/java/com/mifos/core/entity/noncore/ColumnValue.kt index 6b05e9487c..bdc9fc4355 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/ColumnValue.kt +++ b/core/database/src/main/java/com/mifos/core/entity/noncore/ColumnValue.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.entity.noncore import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/DataTable.kt b/core/database/src/main/java/com/mifos/core/entity/noncore/DataTable.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/noncore/DataTable.kt rename to core/database/src/main/java/com/mifos/core/entity/noncore/DataTable.kt index bf314d253b..0ba5c1c4c8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/DataTable.kt +++ b/core/database/src/main/java/com/mifos/core/entity/noncore/DataTable.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.entity.noncore import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/DataTablePayload.kt b/core/database/src/main/java/com/mifos/core/entity/noncore/DataTablePayload.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/noncore/DataTablePayload.kt rename to core/database/src/main/java/com/mifos/core/entity/noncore/DataTablePayload.kt index 62c8632082..d68f995683 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/DataTablePayload.kt +++ b/core/database/src/main/java/com/mifos/core/entity/noncore/DataTablePayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.entity.noncore import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/Note.kt b/core/database/src/main/java/com/mifos/core/entity/noncore/Note.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/noncore/Note.kt rename to core/database/src/main/java/com/mifos/core/entity/noncore/Note.kt index 1a1d590527..20e4536f59 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/Note.kt +++ b/core/database/src/main/java/com/mifos/core/entity/noncore/Note.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.entity.noncore import android.os.Parcelable import com.mifos.core.model.MifosBaseModel diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/Office.kt b/core/database/src/main/java/com/mifos/core/entity/organisation/Office.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/organisation/Office.kt rename to core/database/src/main/java/com/mifos/core/entity/organisation/Office.kt index 2f61676b4f..c352f97809 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/Office.kt +++ b/core/database/src/main/java/com/mifos/core/entity/organisation/Office.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.entity.organisation import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/OfficeOpeningDate.kt b/core/database/src/main/java/com/mifos/core/entity/organisation/OfficeOpeningDate.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/organisation/OfficeOpeningDate.kt rename to core/database/src/main/java/com/mifos/core/entity/organisation/OfficeOpeningDate.kt index ef9faf7ae6..740c0121dd 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/OfficeOpeningDate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/organisation/OfficeOpeningDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.entity.organisation import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/Staff.kt b/core/database/src/main/java/com/mifos/core/entity/organisation/Staff.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/organisation/Staff.kt rename to core/database/src/main/java/com/mifos/core/entity/organisation/Staff.kt index c6e58baefb..ee63e51f52 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/Staff.kt +++ b/core/database/src/main/java/com/mifos/core/entity/organisation/Staff.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.entity.organisation import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/ComponentDatas.kt b/core/database/src/main/java/com/mifos/core/entity/survey/ComponentDatas.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/survey/ComponentDatas.kt rename to core/database/src/main/java/com/mifos/core/entity/survey/ComponentDatas.kt index 399bbbeb35..85d216bb9c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/ComponentDatas.kt +++ b/core/database/src/main/java/com/mifos/core/entity/survey/ComponentDatas.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.entity.survey import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/QuestionDatas.kt b/core/database/src/main/java/com/mifos/core/entity/survey/QuestionDatas.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/survey/QuestionDatas.kt rename to core/database/src/main/java/com/mifos/core/entity/survey/QuestionDatas.kt index c19457963a..a62a5d4f47 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/QuestionDatas.kt +++ b/core/database/src/main/java/com/mifos/core/entity/survey/QuestionDatas.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.entity.survey import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/ResponseDatas.kt b/core/database/src/main/java/com/mifos/core/entity/survey/ResponseDatas.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/survey/ResponseDatas.kt rename to core/database/src/main/java/com/mifos/core/entity/survey/ResponseDatas.kt index 848b72ed69..deae6ee14c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/ResponseDatas.kt +++ b/core/database/src/main/java/com/mifos/core/entity/survey/ResponseDatas.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.entity.survey import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/Survey.kt b/core/database/src/main/java/com/mifos/core/entity/survey/Survey.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/survey/Survey.kt rename to core/database/src/main/java/com/mifos/core/entity/survey/Survey.kt index 087099cf52..d59ad4cb08 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/Survey.kt +++ b/core/database/src/main/java/com/mifos/core/entity/survey/Survey.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.entity.survey import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ClientsTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/ClientsTemplate.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ClientsTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/ClientsTemplate.kt index 7945557ce8..31de94b234 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ClientsTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/ClientsTemplate.kt @@ -7,12 +7,12 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcelable import com.mifos.core.database.MifosDatabase +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.model.MifosBaseModel -import com.mifos.core.objects.noncore.DataTable import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey import com.raizlabs.android.dbflow.annotation.Table diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/InterestType.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/InterestType.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/InterestType.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/InterestType.kt index 9b8836f76a..b8be008045 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/InterestType.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/OfficeOptions.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/OfficeOptions.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/OfficeOptions.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/OfficeOptions.kt index 726bdfc489..35dc1ae6b5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/OfficeOptions.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/OfficeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/Options.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/Options.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/Options.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/Options.kt index c098111184..f8ed32cdc1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/Options.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/Options.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcel import android.os.Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/SavingProductOptions.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/SavingProductOptions.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/SavingProductOptions.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/SavingProductOptions.kt index 44e458f3f0..86de7535f0 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/SavingProductOptions.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/SavingProductOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcelable import com.mifos.core.database.MifosDatabase diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/StaffOptions.kt b/core/database/src/main/java/com/mifos/core/entity/templates/clients/StaffOptions.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/StaffOptions.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/clients/StaffOptions.kt index 9fd357b624..32f15086bb 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/StaffOptions.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/clients/StaffOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.entity.templates.clients import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanRepaymentTemplate.kt similarity index 84% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanRepaymentTemplate.kt index 1cd4a73d24..fc531a44e9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanRepaymentTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanRepaymentTemplate.kt @@ -7,11 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.entity.templates.loans import android.os.Parcelable import com.mifos.core.database.MifosDatabase import com.mifos.core.model.MifosBaseModel +import com.mifos.core.objects.template.loan.Currency +import com.mifos.core.objects.template.loan.Type import com.raizlabs.android.dbflow.annotation.Column import com.raizlabs.android.dbflow.annotation.ModelContainer import com.raizlabs.android.dbflow.annotation.PrimaryKey @@ -46,5 +48,5 @@ data class LoanRepaymentTemplate( @Column var penaltyChargesPortion: Double? = null, - var paymentTypeOptions: MutableList? = null, + var paymentTypeOptions: MutableList? = null, ) : MifosBaseModel(), Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTemplate.kt similarity index 67% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTemplate.kt index 61ede1e4a0..f6df0c83b3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTemplate.kt @@ -7,11 +7,36 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.entity.templates.loans import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.AccountLinkingOptions -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.objects.account.loan.AccountLinkingOptions +import com.mifos.core.objects.template.loan.AmortizationType +import com.mifos.core.objects.template.loan.AmortizationTypeOptions +import com.mifos.core.objects.template.loan.ChargeOptions +import com.mifos.core.objects.template.loan.Currency +import com.mifos.core.objects.template.loan.DaysInMonthType +import com.mifos.core.objects.template.loan.DaysInYearType +import com.mifos.core.objects.template.loan.FundOptions +import com.mifos.core.objects.template.loan.InterestCalculationPeriodType +import com.mifos.core.objects.template.loan.InterestRateFrequencyType +import com.mifos.core.objects.template.loan.InterestRateFrequencyTypeOptions +import com.mifos.core.objects.template.loan.InterestType +import com.mifos.core.objects.template.loan.InterestTypeOptions +import com.mifos.core.objects.template.loan.LoanCollateralOptions +import com.mifos.core.objects.template.loan.LoanOfficerOptions +import com.mifos.core.objects.template.loan.LoanPurposeOptions +import com.mifos.core.objects.template.loan.Product +import com.mifos.core.objects.template.loan.ProductOptions +import com.mifos.core.objects.template.loan.RepaymentFrequencyDaysOfWeekTypeOptions +import com.mifos.core.objects.template.loan.RepaymentFrequencyNthDayTypeOptions +import com.mifos.core.objects.template.loan.RepaymentFrequencyType +import com.mifos.core.objects.template.loan.RepaymentFrequencyTypeOptions +import com.mifos.core.objects.template.loan.TermFrequencyTypeOptions +import com.mifos.core.objects.template.loan.TermPeriodFrequencyType +import com.mifos.core.objects.template.loan.Timeline +import com.mifos.core.objects.template.loan.TransactionProcessingStrategyOptions import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTransactionTemplate.kt similarity index 79% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTransactionTemplate.kt index 9bc9515c61..ee6e4cb6b9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanTransactionTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/loans/LoanTransactionTemplate.kt @@ -7,9 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.entity.templates.loans import android.os.Parcelable +import com.mifos.core.objects.template.loan.Type import kotlinx.parcelize.Parcelize /** @@ -27,5 +28,5 @@ data class LoanTransactionTemplate( var possibleNextRepaymentDate: List = ArrayList(), - var paymentTypeOptions: List = ArrayList(), + var paymentTypeOptions: List = ArrayList(), ) : Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingProductsTemplate.kt similarity index 82% rename from core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingProductsTemplate.kt index c2dbe9f9e6..493e249b21 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingProductsTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingProductsTemplate.kt @@ -7,12 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.savings +package com.mifos.core.entity.templates.savings import android.os.Parcelable -import com.mifos.core.objects.accounts.savings.Currency -import com.mifos.core.objects.accounts.savings.FieldOfficerOptions -import com.mifos.core.objects.common.InterestType +import com.mifos.core.entity.accounts.savings.Currency +import com.mifos.core.objects.account.saving.FieldOfficerOptions +import com.mifos.core.objects.commonfiles.InterestType +import com.mifos.core.objects.template.saving.AccountOptions import kotlinx.parcelize.Parcelize /* @@ -50,7 +51,7 @@ class SavingProductsTemplate( var withdrawalFeeTypeOptions: List? = null, - var paymentTypeOptions: List? = null, + var paymentTypeOptions: List? = null, var accountingRuleOptions: List? = null, diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingsAccountTransactionTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingsAccountTransactionTemplate.kt similarity index 89% rename from core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingsAccountTransactionTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingsAccountTransactionTemplate.kt index a82b15f03b..492c660f5c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/savings/SavingsAccountTransactionTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/templates/savings/SavingsAccountTransactionTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.savings +package com.mifos.core.entity.templates.savings import android.os.Parcelable import com.mifos.core.database.MifosDatabase @@ -36,7 +36,7 @@ class SavingsAccountTransactionTemplate( @Column var reversed: Boolean? = null, - var paymentTypeOptions: List = ArrayList(), + var paymentTypeOptions: List = ArrayList(), ) : MifosBaseModel(), Parcelable { diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/ClientAndClientAccounts.kt b/core/database/src/main/java/com/mifos/core/entity/zipmodels/ClientAndClientAccounts.kt similarity index 81% rename from core/database/src/main/java/com/mifos/core/objects/zipmodels/ClientAndClientAccounts.kt rename to core/database/src/main/java/com/mifos/core/entity/zipmodels/ClientAndClientAccounts.kt index 0aff81f91d..e7adae4b9c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/ClientAndClientAccounts.kt +++ b/core/database/src/main/java/com/mifos/core/entity/zipmodels/ClientAndClientAccounts.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.zipmodels +package com.mifos.core.entity.zipmodels -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 /** * Model for Observable.zip. This Model used to combine the Client and ClientAccount in response diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/GroupAndGroupAccounts.kt b/core/database/src/main/java/com/mifos/core/entity/zipmodels/GroupAndGroupAccounts.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/zipmodels/GroupAndGroupAccounts.kt rename to core/database/src/main/java/com/mifos/core/entity/zipmodels/GroupAndGroupAccounts.kt index e182b9c69f..05d39e6de9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/GroupAndGroupAccounts.kt +++ b/core/database/src/main/java/com/mifos/core/entity/zipmodels/GroupAndGroupAccounts.kt @@ -7,13 +7,13 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.zipmodels +package com.mifos.core.entity.zipmodels import android.os.Parcel import android.os.Parcelable import android.os.Parcelable.Creator -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.group.Group /** * Created by Rajan Maurya on 11/09/16. diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/LoanAndLoanRepayment.kt b/core/database/src/main/java/com/mifos/core/entity/zipmodels/LoanAndLoanRepayment.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/zipmodels/LoanAndLoanRepayment.kt rename to core/database/src/main/java/com/mifos/core/entity/zipmodels/LoanAndLoanRepayment.kt index 6fbc834e7e..00d6662af2 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/LoanAndLoanRepayment.kt +++ b/core/database/src/main/java/com/mifos/core/entity/zipmodels/LoanAndLoanRepayment.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.zipmodels +package com.mifos.core.entity.zipmodels -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate /** * diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingProductsAndTemplate.kt similarity index 87% rename from core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingProductsAndTemplate.kt index 0b0d7909fe..799bbec368 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingProductsAndTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingProductsAndTemplate.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.zipmodels +package com.mifos.core.entity.zipmodels -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.objects.organisations.ProductSavings /** * Created by Rajan Maurya on 02/09/16. diff --git a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingsAccountAndTransactionTemplate.kt b/core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingsAccountAndTransactionTemplate.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingsAccountAndTransactionTemplate.kt rename to core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingsAccountAndTransactionTemplate.kt index 52fec61e9d..e392190135 100644 --- a/core/database/src/main/java/com/mifos/core/objects/zipmodels/SavingsAccountAndTransactionTemplate.kt +++ b/core/database/src/main/java/com/mifos/core/entity/zipmodels/SavingsAccountAndTransactionTemplate.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.zipmodels +package com.mifos.core.entity.zipmodels -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate /** * Created by Rajan Maurya on 21/08/16. diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt index 73c2a1e385..8e5bce3a04 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateCenterUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.objects.client.ActivatePayload +import com.mifos.core.objects.clients.ActivatePayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.openapitools.client.models.PostCentersCenterIdResponse diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt index f65d55f5cb..05235b65de 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateClientUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository -import com.mifos.core.objects.client.ActivatePayload +import com.mifos.core.objects.clients.ActivatePayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.openapitools.client.models.PostClientsClientIdResponse diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt index e0b2da4cd6..7bf1e41fd9 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ActivateGroupUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ActivateRepository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.client.ActivatePayload +import com.mifos.core.objects.clients.ActivatePayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt index 07f92b166c..b04fb24a81 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/AddClientPinpointLocationUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.client.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressRequest import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseCenterPayloadUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseCenterPayloadUseCase.kt index 35f4bd6b59..0ef33a0206 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseCenterPayloadUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseCenterPayloadUseCase.kt @@ -10,8 +10,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository +import com.mifos.core.entity.center.CenterPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseGroupPayloadUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseGroupPayloadUseCase.kt index a0fbf4e7ba..21e7f9277b 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseGroupPayloadUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllDatabaseGroupPayloadUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncGroupPayloadsRepository -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllSavingsAccountTransactionsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllSavingsAccountTransactionsUseCase.kt index b5702e5cf0..f3d0025326 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/AllSavingsAccountTransactionsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/AllSavingsAccountTransactionsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt index 8c5c5ca181..b4c0d97586 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ApproveSavingsApplicationUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountApprovalRepository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval +import com.mifos.core.objects.account.loan.SavingsApproval import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ClientTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ClientTemplateUseCase.kt index d46682673a..4bb529b3ec 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ClientTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ClientTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewClientRepository -import com.mifos.core.objects.templates.clients.ClientsTemplate +import com.mifos.core.entity.templates.clients.ClientsTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt index af79dc7f23..827eeeaa5f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateCenterUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.objects.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt index fee659f59d..71d69a8f19 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateChargesUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.ChargesPayload import com.mifos.core.data.repository.ChargeDialogRepository -import com.mifos.core.objects.client.ChargeCreationResponse +import com.mifos.core.objects.clients.ChargeCreationResponse +import com.mifos.core.payloads.ChargesPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt index a5912849a5..5fb48ac715 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateClientIdentifierUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifierDialogRepository -import com.mifos.core.objects.noncore.IdentifierCreationResponse -import com.mifos.core.objects.noncore.IdentifierPayload +import com.mifos.core.objects.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.objects.noncoreobjects.IdentifierPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupLoansAccountUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupLoansAccountUseCase.kt index 432e1ab743..cee79a37f1 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupLoansAccountUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupLoansAccountUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.GroupLoanPayload import com.mifos.core.data.repository.GroupLoanAccountRepository -import com.mifos.core.objects.accounts.loan.Loans +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.payloads.GroupLoanPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt index 8fab8cc3a9..c8031c3204 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateGroupUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.objects.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanAccountUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanAccountUseCase.kt index d43aa398fa..a875137ee0 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanAccountUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanAccountUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.LoansPayload import com.mifos.core.data.repository.LoanAccountRepository -import com.mifos.core.objects.accounts.loan.Loans +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.network.model.LoansPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt index ae9c96f418..5656a41d03 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateLoanChargesUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.ChargesPayload import com.mifos.core.data.repository.LoanChargeDialogRepository -import com.mifos.core.objects.client.ChargeCreationResponse +import com.mifos.core.objects.clients.ChargeCreationResponse +import com.mifos.core.payloads.ChargesPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt index 149e432b5a..505590d42f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewCenterUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.CreateNewCenterRepository -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.objects.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt index a64f475278..c820069fbb 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateNewGroupUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.objects.responses.SaveResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateSavingsAccountUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateSavingsAccountUseCase.kt index 1acc975dc5..f8941a91c0 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateSavingsAccountUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/CreateSavingsAccountUseCase.kt @@ -10,9 +10,9 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.SavingsPayload import com.mifos.core.data.repository.SavingsAccountRepository -import com.mifos.core.objects.client.Savings +import com.mifos.core.entity.client.Savings +import com.mifos.core.payloads.SavingsPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateCenterPayloadsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateCenterPayloadsUseCase.kt index 0eb37c3716..eaf96886ac 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateCenterPayloadsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateCenterPayloadsUseCase.kt @@ -10,8 +10,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository +import com.mifos.core.entity.center.CenterPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateGroupPayloadUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateGroupPayloadUseCase.kt index 065eed4edd..c593ff396d 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateGroupPayloadUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateGroupPayloadUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncGroupPayloadsRepository -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateTransactionsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateTransactionsUseCase.kt index b5f6e8876f..f1a0c6351c 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateTransactionsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/DeleteAndUpdateTransactionsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCenterDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCenterDetailsUseCase.kt index 80e8b3711d..9000078e66 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCenterDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCenterDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.collectionsheet.CenterDetail +import com.mifos.core.entity.collectionsheet.CenterDetail import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt index 8b38ec2df4..8d21558ff5 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchCollectionSheetUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.collectionsheet.CollectionSheetRequestPayload -import com.mifos.core.objects.collectionsheet.CollectionSheetResponse +import com.mifos.core.entity.collectionsheet.CollectionSheetResponse +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchGroupsAssociatedWithCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchGroupsAssociatedWithCenterUseCase.kt index 92bb8f2d67..07a781a467 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchGroupsAssociatedWithCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchGroupsAssociatedWithCenterUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.entity.group.CenterWithAssociations import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt index 955df0cd42..de37553e43 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/FetchProductiveCollectionSheetUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.collectionsheet.CollectionSheetRequestPayload -import com.mifos.core.objects.collectionsheet.CollectionSheetResponse +import com.mifos.core.entity.collectionsheet.CollectionSheetResponse +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt index 76fb348598..e7263139c3 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllChargesV2UseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ChargeDialogRepository -import com.mifos.core.objects.templates.clients.ChargeTemplate +import com.mifos.core.objects.template.client.ChargeTemplate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt index 2893142e63..12758b5044 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetAllLoanUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.LoanAccountRepository -import com.mifos.core.objects.organisation.LoanProducts +import com.mifos.core.objects.organisations.LoanProducts import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt index f5b68f26be..31621acefe 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterDetailsUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CenterDetailsRepository -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 import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.zip diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt index eb0cde5f7c..ac752a4d75 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCenterListDbUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CenterListRepository -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center +import com.mifos.core.objects.clients.Page import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import rx.Subscriber diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCentersInOfficeUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCentersInOfficeUseCase.kt index 743d382320..38930887f8 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCentersInOfficeUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCentersInOfficeUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt index 27b148f29b..42118abc93 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetCheckerTasksUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CheckerInboxRepository -import com.mifos.core.objects.checkerinboxandtasks.CheckerTask +import com.mifos.core.objects.checkerinboxtask.CheckerTask import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt index a2075259bd..d9bd9a9fec 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientDetailsRepository -import com.mifos.core.objects.zipmodels.ClientAndClientAccounts +import com.mifos.core.entity.zipmodels.ClientAndClientAccounts import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.flow.Flow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt index 36c5650752..70892ea2d8 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifierTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifierDialogRepository -import com.mifos.core.objects.noncore.IdentifierTemplate +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt index c2e2257f3f..ccf0d71e5f 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientIdentifiersUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ClientIdentifiersRepository -import com.mifos.core.objects.noncore.Identifier +import com.mifos.core.objects.noncoreobjects.Identifier import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt index ec4f22c3a8..48c9e8e3de 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientPinpointLocationsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository -import com.mifos.core.objects.client.ClientAddressResponse +import com.mifos.core.objects.clients.ClientAddressResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientSavingsAccountTemplateByProductUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientSavingsAccountTemplateByProductUseCase.kt index 8a076ab80e..6f97550297 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientSavingsAccountTemplateByProductUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetClientSavingsAccountTemplateByProductUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountRepository -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingProductsTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt index 76d9eb3fa3..b402c02b54 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetDocumentsListUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.DocumentListRepository -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupAssociateClientsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupAssociateClientsUseCase.kt index ff38731756..0022af1c6d 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupAssociateClientsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupAssociateClientsUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupDetailsRepository -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.GroupWithAssociations +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.GroupWithAssociations import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupDetailsUseCase.kt index 0c2fdc48ce..e6680066dd 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupDetailsRepository -import com.mifos.core.objects.zipmodels.GroupAndGroupAccounts +import com.mifos.core.entity.zipmodels.GroupAndGroupAccounts import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt index 27feb0dcac..04e382376a 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupLoansAccountTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupLoanAccountRepository -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.template.loan.GroupLoanTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt index 974f53507f..19230bef7d 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupOfficesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewGroupRepository -import com.mifos.core.objects.organisation.Office +import com.mifos.core.entity.organisation.Office import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupSavingsAccountTemplateByProductUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupSavingsAccountTemplateByProductUseCase.kt index cfdf41c155..6065ac4051 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupSavingsAccountTemplateByProductUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupSavingsAccountTemplateByProductUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountRepository -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingProductsTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByCenterUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByCenterUseCase.kt index 2b4702fcb3..712b4ba062 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByCenterUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByCenterUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupListRepository -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.entity.group.CenterWithAssociations import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByOfficeUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByOfficeUseCase.kt index 6191226935..479dea167b 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByOfficeUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsByOfficeUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsUseCase.kt index 4dc283f71a..266804e5d5 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetGroupsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GroupListRepository -import com.mifos.core.objects.group.GroupWithAssociations +import com.mifos.core.entity.group.GroupWithAssociations import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetIndividualCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetIndividualCollectionSheetUseCase.kt index c1e1a930fe..4912c5a3da 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetIndividualCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetIndividualCollectionSheetUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.NewIndividualCollectionSheetRepository +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.core.network.model.RequestCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetListOfLoanChargesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetListOfLoanChargesUseCase.kt index f98cd49fbd..7cc15938ee 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetListOfLoanChargesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetListOfLoanChargesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.LoanChargeRepository -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetLoansAccountTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetLoansAccountTemplateUseCase.kt index 9a8a564a38..65d34d52ec 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetLoansAccountTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetLoansAccountTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.LoanAccountRepository -import com.mifos.core.objects.templates.loans.LoanTemplate +import com.mifos.core.entity.templates.loans.LoanTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetOfficeListUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetOfficeListUseCase.kt index f960a54495..83ae590306 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetOfficeListUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetOfficeListUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.NewIndividualCollectionSheetRepository -import com.mifos.core.objects.organisation.Office +import com.mifos.core.entity.organisation.Office import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt index dfda49197d..b9cc7634f2 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportCategoryUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportCategoryRepository -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt index 8ce8fe2437..efc5195ea7 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportFullParameterListUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt index 924dd51e66..3e3dbe15ee 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetReportParameterDetailsUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt index 6d913b8261..cc01284978 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportOfficesUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt index ed82c6bea2..1d60abfe58 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportProductUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt index 595ab38488..145d0326af 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetRunReportWithQueryUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.ReportDetailRepository -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionTemplateUseCase.kt index 14e90a9ec3..dd27eaa732 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountTransactionRepository -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionUseCase.kt index 24e4536881..95e895569e 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountTransactionUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountTransactionRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountUseCase.kt index 7bd55add11..8ea0c3aeb8 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetSavingsAccountUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountSummaryRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeForCreateNewClientUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeForCreateNewClientUseCase.kt index 39ad8e9886..5c1cb9a793 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeForCreateNewClientUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeForCreateNewClientUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewClientRepository -import com.mifos.core.objects.organisation.Staff +import com.mifos.core.entity.organisation.Staff import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeUseCase.kt index 40e7ccc77e..1636c29a91 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetStaffInOfficeUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.NewIndividualCollectionSheetRepository -import com.mifos.core.objects.organisation.Staff +import com.mifos.core.entity.organisation.Staff import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt index 629866e862..271756179d 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GetUserPathTrackingUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PathTrackingRepository -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/GroupsListPagingDataSource.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/GroupsListPagingDataSource.kt index 4ef273a579..f42ab33080 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/GroupsListPagingDataSource.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/GroupsListPagingDataSource.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import androidx.paging.PagingSource import androidx.paging.PagingState import com.mifos.core.data.repository.GroupsListRepository -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import retrofit2.HttpException import java.io.IOException diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/LoadSavingsAccountsAndTemplateUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/LoadSavingsAccountsAndTemplateUseCase.kt index d3b8747b3f..ef174cfc54 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/LoadSavingsAccountsAndTemplateUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/LoadSavingsAccountsAndTemplateUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountRepository -import com.mifos.core.objects.zipmodels.SavingProductsAndTemplate +import com.mifos.core.entity.zipmodels.SavingProductsAndTemplate import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/PaymentTypeOptionUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/PaymentTypeOptionUseCase.kt index 5dce8edf65..3b9d853ec2 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/PaymentTypeOptionUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/PaymentTypeOptionUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository -import com.mifos.core.objects.PaymentTypeOption +import com.mifos.core.entity.PaymentTypeOption import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt index 27342a14cd..f9620ad4e9 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/ProcessTransactionUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SavingsAccountTransactionRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitCollectionSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitCollectionSheetUseCase.kt index 5e0c9ea643..0b06600423 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitCollectionSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitCollectionSheetUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository +import com.mifos.core.entity.collectionsheet.CollectionSheetPayload import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.collectionsheet.CollectionSheetPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitProductiveSheetUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitProductiveSheetUseCase.kt index 9f8a3c95ad..f05324b55e 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitProductiveSheetUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/SubmitProductiveSheetUseCase.kt @@ -11,8 +11,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.GenerateCollectionSheetRepository +import com.mifos.core.entity.collectionsheet.ProductiveCollectionSheetPayload import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.collectionsheet.ProductiveCollectionSheetPayload import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateCenterPayloadUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateCenterPayloadUseCase.kt index cfb8c6c356..aa127b52d4 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateCenterPayloadUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateCenterPayloadUseCase.kt @@ -10,8 +10,8 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.SyncCenterPayloadsRepository +import com.mifos.core.entity.center.CenterPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt index d60af14a51..953c1645a1 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateClientPinpointUseCase.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.PinPointClientRepository import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.client.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressRequest import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import javax.inject.Inject diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateGroupPayloadUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateGroupPayloadUseCase.kt index 1c9af62a2d..931a02cefc 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateGroupPayloadUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateGroupPayloadUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncGroupPayloadsRepository -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateLoanRepaymentTransactionUseCase.kt b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateLoanRepaymentTransactionUseCase.kt index 66b31dd931..5f2bf42915 100644 --- a/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateLoanRepaymentTransactionUseCase.kt +++ b/core/domain/src/main/java/com/mifos/core/domain/useCases/UpdateLoanRepaymentTransactionUseCase.kt @@ -11,7 +11,7 @@ package com.mifos.core.domain.useCases import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.SyncSavingsAccountTransactionRepository -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow diff --git a/core/domain/src/test/java/com/mifos/core/domain/GroupListPagingSourceTest.kt b/core/domain/src/test/java/com/mifos/core/domain/GroupListPagingSourceTest.kt index 4a53c43b8f..14fb7207a7 100644 --- a/core/domain/src/test/java/com/mifos/core/domain/GroupListPagingSourceTest.kt +++ b/core/domain/src/test/java/com/mifos/core/domain/GroupListPagingSourceTest.kt @@ -12,7 +12,7 @@ package com.mifos.core.domain import androidx.paging.PagingConfig import androidx.paging.PagingSource import androidx.paging.testing.TestPager -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import com.mifos.core.testing.repository.ERROR_MESSAGE import com.mifos.core.testing.repository.TestGroupsListRepository import com.mifos.core.testing.repository.getPagedData diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index cf6c1a6bc2..ccb7fd6519 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -9,10 +9,15 @@ */ plugins { alias(libs.plugins.mifos.android.library) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.serialization) + id(libs.plugins.kotlin.parcelize.get().pluginId) } android{ namespace = "com.mifos.core.model" - + defaultConfig { + consumerProguardFiles("consumer-rules.pro") + } } dependencies { implementation(libs.converter.gson) diff --git a/core/database/src/main/java/com/mifos/core/objects/Changes.kt b/core/model/src/main/kotlin/com/mifos/core/objects/Changes.kt similarity index 100% rename from core/database/src/main/java/com/mifos/core/objects/Changes.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/Changes.kt diff --git a/core/database/src/main/java/com/mifos/core/objects/ErrorSyncServerMessage.kt b/core/model/src/main/kotlin/com/mifos/core/objects/ErrorSyncServerMessage.kt similarity index 90% rename from core/database/src/main/java/com/mifos/core/objects/ErrorSyncServerMessage.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/ErrorSyncServerMessage.kt index 89f11d72b6..26bd935f84 100644 --- a/core/database/src/main/java/com/mifos/core/objects/ErrorSyncServerMessage.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/ErrorSyncServerMessage.kt @@ -17,7 +17,7 @@ class ErrorSyncServerMessage { var httpStatusCode = 0 var defaultUserMessage: String? = null var userMessageGlobalisationCode: String? = null - var errors: List? = null + var errors: List? = null inner class Error { var developerMessage: String? = null diff --git a/core/database/src/main/java/com/mifos/core/objects/SearchedEntity.kt b/core/model/src/main/kotlin/com/mifos/core/objects/SearchedEntity.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/SearchedEntity.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/SearchedEntity.kt index a10fc3b01b..d4a695bc75 100644 --- a/core/database/src/main/java/com/mifos/core/objects/SearchedEntity.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/SearchedEntity.kt @@ -10,7 +10,7 @@ package com.mifos.core.objects import android.os.Parcelable -import com.mifos.core.objects.common.InterestType +import com.mifos.core.objects.commonfiles.InterestType import kotlinx.parcelize.Parcelize /** diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/AccountLinkingOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AccountLinkingOptions.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/AccountLinkingOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AccountLinkingOptions.kt index bfb060fb71..3b13e662ab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/AccountLinkingOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AccountLinkingOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AmortizationType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AmortizationType.kt index 2ac9931294..be4994b2da 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Currency.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Currency.kt index 1ba788cfe7..169f99c7fe 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInMonthType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInMonthType.kt index d4ae7da0bc..e00bfe57f4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInYearType.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInYearType.kt index 2fdb4cebed..845ce0266e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestCalculationPeriodType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestCalculationPeriodType.kt index dc99221835..ef94c693aa 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestRateFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestRateFrequencyType.kt index b92df0f6b7..bc8dc0059b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestType.kt index a5cbe5328d..bbbcc0f8c6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApproval.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApproval.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApproval.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApproval.kt index 1cf009ba39..e891be988f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApproval.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApproval.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalRequest.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApprovalRequest.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalRequest.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApprovalRequest.kt index 7356d55bf7..ab22e1fe34 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanApprovalRequest.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanApprovalRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanDisbursement.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanDisbursement.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanDisbursement.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanDisbursement.kt index 2f2ebf0e70..4ed0b63f54 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanDisbursement.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanDisbursement.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanPurposeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanPurposeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanPurposeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanPurposeOptions.kt index 4e8a062d6b..afcd9386ef 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanPurposeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanPurposeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanRepaymentResponse.kt similarity index 85% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanRepaymentResponse.kt index 8e5e8042a6..9b042b4797 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/LoanRepaymentResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/LoanRepaymentResponse.kt @@ -7,10 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import com.google.gson.annotations.Expose +import com.mifos.core.objects.Changes import kotlinx.parcelize.Parcelize @Parcelize @@ -28,5 +29,5 @@ data class LoanRepaymentResponse( var resourceId: Int? = null, @Expose - var changes: com.mifos.core.objects.Changes? = null, + var changes: Changes? = null, ) : Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentDetailData.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentDetailData.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentDetailData.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentDetailData.kt index 84fd610796..1eed09c29d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentDetailData.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentDetailData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentType.kt index 2ab6a7208f..1cb3dc3c87 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentTypeOptions.kt index db87f918ed..e1bb851335 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/PaymentTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/PaymentTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Period.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Period.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Period.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Period.kt index 90811df1d4..656b510ea4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Period.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Period.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyDayOfWeekType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyDayOfWeekType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyDayOfWeekType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyDayOfWeekType.kt index fccc351939..c5f9217a06 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyDayOfWeekType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyDayOfWeekType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyNthDayType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyNthDayType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyNthDayType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyNthDayType.kt index 6186331ef9..e2cb4de098 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyNthDayType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyNthDayType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyType.kt index 609113fdf9..37b54a3f33 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyTypeOptions.kt index b566f054f0..39244e8440 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentSchedule.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentSchedule.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentSchedule.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentSchedule.kt index db8a676211..0ad18a506d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/RepaymentSchedule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/RepaymentSchedule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/SavingsApproval.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/SavingsApproval.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/SavingsApproval.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/SavingsApproval.kt index 9373c1f6ca..8e3a96a7f4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/SavingsApproval.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/SavingsApproval.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermFrequencyTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermFrequencyTypeOptions.kt index e34100c0cb..e9ad3e8f6a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermPeriodFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermPeriodFrequencyType.kt index a6bf832c15..be8e56a260 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TermPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TermPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Transaction.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Transaction.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Transaction.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Transaction.kt index e550f13499..dade75c407 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Transaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Transaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TransactionProcessingStrategy.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TransactionProcessingStrategy.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/TransactionProcessingStrategy.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TransactionProcessingStrategy.kt index 247fde772d..8ebb23187a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/TransactionProcessingStrategy.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/TransactionProcessingStrategy.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Type.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Type.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/accounts/loan/Type.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Type.kt index 22eed58a0a..e4bef794bc 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/loan/Type.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/loan/Type.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.loan +package com.mifos.core.objects.account.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeCalculationType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeCalculationType.kt index b9d7cf2046..6227b33969 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeTimeType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeTimeType.kt index a3f8832552..ea3569fe8a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/FieldOfficerOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/FieldOfficerOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/FieldOfficerOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/FieldOfficerOptions.kt index 74ae00a55c..67484cbdd7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/FieldOfficerOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/FieldOfficerOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationDaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationDaysInYearType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationDaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationDaysInYearType.kt index 90f802f6ee..228a815e01 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationDaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationDaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationType.kt index 2adec87fc8..0f6cc1d3ad 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCompoundingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCompoundingPeriodType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCompoundingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCompoundingPeriodType.kt index 9be90b9c2f..7a315c1af1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestCompoundingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestCompoundingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestPostingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestPostingPeriodType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestPostingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestPostingPeriodType.kt index 78dfd0d013..589200185a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/InterestPostingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/InterestPostingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/LockinPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/LockinPeriodFrequencyType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/LockinPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/LockinPeriodFrequencyType.kt index 0525e54871..467ce07f3d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/LockinPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/LockinPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/SavingsAccountTransactionResponse.kt similarity index 84% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/SavingsAccountTransactionResponse.kt index cc6db128c8..74d996b363 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/SavingsAccountTransactionResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/SavingsAccountTransactionResponse.kt @@ -7,9 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import com.google.gson.annotations.Expose +import com.mifos.core.objects.Changes /** * Created by ishankhanna on 12/06/14. @@ -28,5 +29,5 @@ data class SavingsAccountTransactionResponse( var resourceId: Int? = null, @Expose - var changes: com.mifos.core.objects.Changes? = null, + var changes: Changes? = null, ) diff --git a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Timeline.kt b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/Timeline.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/accounts/savings/Timeline.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/account/saving/Timeline.kt index 86f217744e..dd803937b1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/accounts/savings/Timeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/account/saving/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.accounts.savings +package com.mifos.core.objects.account.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerInboxSearchTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerInboxSearchTemplate.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerInboxSearchTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerInboxSearchTemplate.kt index c07a7d873f..4d8b37f5d8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerInboxSearchTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerInboxSearchTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.checkerinboxandtasks +package com.mifos.core.objects.checkerinboxtask import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerTask.kt b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerTask.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerTask.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerTask.kt index 0ac7313048..0a7dedb64a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/CheckerTask.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/CheckerTask.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.checkerinboxandtasks +package com.mifos.core.objects.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleLoansTask.kt b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleLoansTask.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleLoansTask.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleLoansTask.kt index 780dee18c3..3ab237fb08 100644 --- a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleLoansTask.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleLoansTask.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.checkerinboxandtasks +package com.mifos.core.objects.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleReasonCodeValue.kt b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleReasonCodeValue.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleReasonCodeValue.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleReasonCodeValue.kt index a60fb7b60d..25a2199aef 100644 --- a/core/database/src/main/java/com/mifos/core/objects/checkerinboxandtasks/RescheduleReasonCodeValue.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/checkerinboxtask/RescheduleReasonCodeValue.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.checkerinboxandtasks +package com.mifos.core.objects.checkerinboxtask import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ActivatePayload.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ActivatePayload.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/client/ActivatePayload.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/ActivatePayload.kt index de155c068c..b7e57ca3b5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ActivatePayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ActivatePayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Address.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Address.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/client/Address.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/Address.kt index dd9f5c7b04..78f2e689b9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Address.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Address.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ChargeCreationResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargeCreationResponse.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/client/ChargeCreationResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargeCreationResponse.kt index b371b8b9f9..981be9e498 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ChargeCreationResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargeCreationResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ChargesRename.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargesRename.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/client/ChargesRename.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargesRename.kt index b83b49ed85..0bee6a5eff 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ChargesRename.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ChargesRename.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients /** * Created by nellyk on 2/15/2016. diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ClientAddressRequest.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressRequest.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/client/ClientAddressRequest.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressRequest.kt index eff24a8653..dec4d27be6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ClientAddressRequest.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressRequest.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/ClientAddressResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressResponse.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/client/ClientAddressResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressResponse.kt index a557d5d14c..85bf8b433f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/ClientAddressResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/ClientAddressResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Page.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Page.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/client/Page.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/Page.kt index c630de6c71..21c1b3bc86 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Page.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Page.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Permission.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Permission.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/client/Permission.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/Permission.kt index 391398a153..8b06067ad5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Permission.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Permission.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/client/Role.kt b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Role.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/client/Role.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/clients/Role.kt index 23033cdc95..d44b2c5c32 100644 --- a/core/database/src/main/java/com/mifos/core/objects/client/Role.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/clients/Role.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.client +package com.mifos.core.objects.clients /** * Created by ishankhanna on 09/02/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/AttendanceTypeOption.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/AttendanceTypeOption.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/AttendanceTypeOption.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/AttendanceTypeOption.kt index cab88301e9..342558e53d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/AttendanceTypeOption.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/AttendanceTypeOption.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/BulkSavingsDueTransaction.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/BulkSavingsDueTransaction.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/BulkSavingsDueTransaction.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/BulkSavingsDueTransaction.kt index d73b5201a7..3bf68b236d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/BulkSavingsDueTransaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/BulkSavingsDueTransaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionFrequency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionFrequency.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionFrequency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionFrequency.kt index 4cf7a9767f..76c52eed55 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionFrequency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionFrequency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets /** * Created by ishankhanna on 16/07/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionMeetingCalendar.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionMeetingCalendar.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionMeetingCalendar.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionMeetingCalendar.kt index 1f39e4a715..17bd1b30de 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionMeetingCalendar.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionMeetingCalendar.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetRequestPayload.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionSheetRequestPayload.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetRequestPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionSheetRequestPayload.kt index 3e93e43de9..7536d8fd1a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/CollectionSheetRequestPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/CollectionSheetRequestPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/EntityType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/EntityType.kt index d8453b4b6e..e7080cac1e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanAndClientName.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanAndClientName.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanAndClientName.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanAndClientName.kt index 0188f01ad9..4aa58043e8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanAndClientName.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanAndClientName.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanCollectionSheet.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanCollectionSheet.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanCollectionSheet.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanCollectionSheet.kt index 44f5324eb9..66645825ab 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/LoanCollectionSheet.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/LoanCollectionSheet.kt @@ -7,11 +7,11 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcel import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.Currency +import com.mifos.core.objects.account.loan.Currency /** * Created by Tarun on 06-07-2017. diff --git a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsProduct.kt b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/SavingsProduct.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsProduct.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/SavingsProduct.kt index fe0ffabb3a..1d9f0d3ea5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/collectionsheet/SavingsProduct.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/collectionsheets/SavingsProduct.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.collectionsheet +package com.mifos.core.objects.collectionsheets import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/common/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/commonfiles/InterestType.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/common/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/commonfiles/InterestType.kt index 3ee256bf3a..bbd5aefd88 100644 --- a/core/database/src/main/java/com/mifos/core/objects/common/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/commonfiles/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.common +package com.mifos.core.objects.commonfiles import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/Account.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Account.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/Account.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Account.kt index e1b9bf4eec..9d75c4901f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/Account.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Account.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/AttendanceType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/AttendanceType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/db/AttendanceType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/AttendanceType.kt index 68743b36b6..ab40ae31f5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/AttendanceType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/AttendanceType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/Client.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Client.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/db/Client.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Client.kt index 96a216c1f6..2fe7375a00 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/Client.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Client.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/CollectionMeetingCalendar.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionMeetingCalendar.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/db/CollectionMeetingCalendar.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionMeetingCalendar.kt index c1265a1fca..f7d4f847f2 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/CollectionMeetingCalendar.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionMeetingCalendar.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/CollectionSheet.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionSheet.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/CollectionSheet.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionSheet.kt index d1b4d13d2e..cd8b6b6290 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/CollectionSheet.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/CollectionSheet.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import com.google.gson.Gson diff --git a/core/database/src/main/java/com/mifos/core/objects/db/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Currency.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/db/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Currency.kt index dfbaf5967b..6254de4618 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/EntityType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/EntityType.kt index 0953426db9..0fbd0e571c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/Loan.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Loan.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/db/Loan.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Loan.kt index 869729a208..e55823bd1e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/Loan.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Loan.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/MeetingCenter.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingCenter.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/db/MeetingCenter.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingCenter.kt index 5f09910397..b0346e3de7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/MeetingCenter.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingCenter.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/MeetingDate.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingDate.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/MeetingDate.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingDate.kt index 85ce4e2403..77a4b077b1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/MeetingDate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MeetingDate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/MifosGroup.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MifosGroup.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/db/MifosGroup.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MifosGroup.kt index bdf65a6d6d..b0ea098ee1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/MifosGroup.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/MifosGroup.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/OfflineCenter.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/OfflineCenter.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/db/OfflineCenter.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/OfflineCenter.kt index 885259b1d1..687bce2ef7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/OfflineCenter.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/OfflineCenter.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/RepaymentTransaction.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/RepaymentTransaction.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/RepaymentTransaction.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/RepaymentTransaction.kt index ff12d41b6d..903d6479a2 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/RepaymentTransaction.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/RepaymentTransaction.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/db/Status.kt b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Status.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/db/Status.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Status.kt index 4f7eebc80b..66bb0aece8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/db/Status.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/databaseobjects/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.db +package com.mifos.core.objects.databaseobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/mifoserror/Arg.kt b/core/model/src/main/kotlin/com/mifos/core/objects/error/Arg.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/mifoserror/Arg.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/error/Arg.kt index dec3c9376c..c56c40cb8b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/mifoserror/Arg.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/error/Arg.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.mifoserror +package com.mifos.core.objects.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/mifoserror/Errors.kt b/core/model/src/main/kotlin/com/mifos/core/objects/error/Errors.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/mifoserror/Errors.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/error/Errors.kt index e6a5e3448c..0d2530e966 100644 --- a/core/database/src/main/java/com/mifos/core/objects/mifoserror/Errors.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/error/Errors.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.mifoserror +package com.mifos.core.objects.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/mifoserror/MifosError.kt b/core/model/src/main/kotlin/com/mifos/core/objects/error/MifosError.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/mifoserror/MifosError.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/error/MifosError.kt index 9df5eed5c6..e4de607772 100644 --- a/core/database/src/main/java/com/mifos/core/objects/mifoserror/MifosError.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/error/MifosError.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.mifoserror +package com.mifos.core.objects.error import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/group/CenterInfo.kt b/core/model/src/main/kotlin/com/mifos/core/objects/groups/CenterInfo.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/group/CenterInfo.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/groups/CenterInfo.kt index 6b19473490..eb261ae4d0 100644 --- a/core/database/src/main/java/com/mifos/core/objects/group/CenterInfo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/groups/CenterInfo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.group +package com.mifos.core.objects.groups import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/navigation/ClientArgs.kt b/core/model/src/main/kotlin/com/mifos/core/objects/nav/ClientArgs.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/navigation/ClientArgs.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/nav/ClientArgs.kt index aa4efbcbc8..c6521a79c1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/navigation/ClientArgs.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/nav/ClientArgs.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.navigation +package com.mifos.core.objects.nav import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/navigation/DataTableNavigationArg.kt b/core/model/src/main/kotlin/com/mifos/core/objects/nav/DataTableNavigationArg.kt similarity index 90% rename from core/database/src/main/java/com/mifos/core/objects/navigation/DataTableNavigationArg.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/nav/DataTableNavigationArg.kt index c2189d1cb2..40549541d3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/navigation/DataTableNavigationArg.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/nav/DataTableNavigationArg.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.navigation +package com.mifos.core.objects.nav data class DataTableNavigationArg( diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/Document.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Document.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/noncore/Document.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Document.kt index 44bf931c54..6fb241ca2a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/Document.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Document.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/DocumentType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/DocumentType.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/noncore/DocumentType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/DocumentType.kt index 79593e501a..4842f9c12a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/DocumentType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/DocumentType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/Identifier.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Identifier.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/noncore/Identifier.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Identifier.kt index c55b07ff5c..86b7d844d3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/Identifier.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/Identifier.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierCreationResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierCreationResponse.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierCreationResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierCreationResponse.kt index 5ef820da91..39d1dc5403 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierCreationResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierCreationResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierPayload.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierPayload.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierPayload.kt index e94f66d78e..c6411cb72f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierTemplate.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierTemplate.kt index 26561a8e9e..502fdb488d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierType.kt index 58154a7a93..74b1ec1c34 100644 --- a/core/database/src/main/java/com/mifos/core/objects/noncore/IdentifierType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/noncoreobjects/IdentifierType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.noncore +package com.mifos.core.objects.noncoreobjects import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/AccountingRule.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AccountingRule.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/AccountingRule.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/AccountingRule.kt index d699fa4315..6ddc4bbbe7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/AccountingRule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AccountingRule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/AllowAttributeOverrides.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AllowAttributeOverrides.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/organisation/AllowAttributeOverrides.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/AllowAttributeOverrides.kt index 3de43d0595..3ae1ad88a2 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/AllowAttributeOverrides.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AllowAttributeOverrides.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AmortizationType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/AmortizationType.kt index 443da0a4b0..c61b61b2fc 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/ClientClassificationOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientClassificationOptions.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/ClientClassificationOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientClassificationOptions.kt index e49d08d587..37fd99747b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/ClientClassificationOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientClassificationOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/ClientTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientTypeOptions.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/ClientTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientTypeOptions.kt index a5a722dfa0..7bb380ce07 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/ClientTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ClientTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/Currency.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/organisation/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/Currency.kt index caf31ba58b..6c5779455d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInMonthType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInMonthType.kt index 8b459d5ab3..890cf85316 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInYearType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInYearType.kt index 8fdefebd5d..f031d1b77a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/GenderOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/GenderOptions.kt similarity index 90% rename from core/database/src/main/java/com/mifos/core/objects/organisation/GenderOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/GenderOptions.kt index 1fcfb5a1ac..f3d0024b08 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/GenderOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/GenderOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationDaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationDaysInYearType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationDaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationDaysInYearType.kt index d817b60762..d7237f0d3d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationDaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationDaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationPeriodType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationPeriodType.kt index cfd5f99b62..16c9435f7d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationTypeOptions.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationTypeOptions.kt index c62f0f2c6c..167beac18b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCalculationTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCalculationTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCompoundingPeriod.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCompoundingPeriod.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestCompoundingPeriod.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCompoundingPeriod.kt index 7b08e9417a..cfb9ab7424 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestCompoundingPeriod.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestCompoundingPeriod.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestPostingPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestPostingPeriodType.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestPostingPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestPostingPeriodType.kt index d4dc7d7ed2..c7ad38e7c8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestPostingPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestPostingPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nkiboi on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestRateFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestRateFrequencyType.kt index f02fbad950..18aa25a5fa 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestType.kt index 4254dff47d..95f3270f47 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanFund.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanFund.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/LoanFund.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanFund.kt index a53f1c5adc..f9e1a62f09 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanFund.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanFund.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nellyk on 2/21/2016. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanProducts.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanProducts.kt similarity index 99% rename from core/database/src/main/java/com/mifos/core/objects/organisation/LoanProducts.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanProducts.kt index 8198b999d6..0596d299dc 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanProducts.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanProducts.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanPurpose.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanPurpose.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/organisation/LoanPurpose.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanPurpose.kt index 2ccc550859..736b95f9f6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/LoanPurpose.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/LoanPurpose.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nellyk on 2/21/2016. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/ProductSavings.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ProductSavings.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/ProductSavings.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/ProductSavings.kt index ca6adc1fb7..154e61c689 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/ProductSavings.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/ProductSavings.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations /** * Created by nellyk on 12/15/2015. diff --git a/core/database/src/main/java/com/mifos/core/objects/organisation/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/RepaymentFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/organisation/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/organisations/RepaymentFrequencyType.kt index e504e83a7a..9ae424120b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/organisation/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/organisations/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.organisation +package com.mifos.core.objects.organisations import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/response/SaveResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/responses/SaveResponse.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/response/SaveResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/responses/SaveResponse.kt index a5c9ffce77..aa39e14b1e 100644 --- a/core/database/src/main/java/com/mifos/core/objects/response/SaveResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/responses/SaveResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.response +package com.mifos.core.objects.responses import com.google.gson.Gson import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/runreports/ColumnHeader.kt b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/ColumnHeader.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/runreports/ColumnHeader.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/runreport/ColumnHeader.kt index 42dead07c6..90926f717b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/runreports/ColumnHeader.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/ColumnHeader.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.runreports +package com.mifos.core.objects.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/runreports/DataRow.kt b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/DataRow.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/runreports/DataRow.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/runreport/DataRow.kt index 750cb075f9..7b05d316c8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/runreports/DataRow.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/DataRow.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.runreports +package com.mifos.core.objects.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/runreports/FullParameterListResponse.kt b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/FullParameterListResponse.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/runreports/FullParameterListResponse.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/runreport/FullParameterListResponse.kt index 691e6d027a..e5d2893bb7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/runreports/FullParameterListResponse.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/FullParameterListResponse.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.runreports +package com.mifos.core.objects.runreport import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/runreports/client/ClientReportTypeItem.kt b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/client/ClientReportTypeItem.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/runreports/client/ClientReportTypeItem.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/runreport/client/ClientReportTypeItem.kt index bf79df81a7..fb58460ed7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/runreports/client/ClientReportTypeItem.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/runreport/client/ClientReportTypeItem.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.runreports.client +package com.mifos.core.objects.runreport.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/Scorecard.kt b/core/model/src/main/kotlin/com/mifos/core/objects/surveys/Scorecard.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/survey/Scorecard.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/surveys/Scorecard.kt index c821fbdb22..998df1a981 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/Scorecard.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/surveys/Scorecard.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.objects.surveys import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/survey/ScorecardValues.kt b/core/model/src/main/kotlin/com/mifos/core/objects/surveys/ScorecardValues.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/survey/ScorecardValues.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/surveys/ScorecardValues.kt index 89e59bbf47..f80243c8c6 100644 --- a/core/database/src/main/java/com/mifos/core/objects/survey/ScorecardValues.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/surveys/ScorecardValues.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.survey +package com.mifos.core.objects.surveys import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/system/Code.kt b/core/model/src/main/kotlin/com/mifos/core/objects/systems/Code.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/system/Code.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/systems/Code.kt index 24fc69976b..a7032c6b2d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/system/Code.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/systems/Code.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.system +package com.mifos.core.objects.systems /** * Created by ishankhanna on 16/06/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/system/CodeValue.kt b/core/model/src/main/kotlin/com/mifos/core/objects/systems/CodeValue.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/system/CodeValue.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/systems/CodeValue.kt index 18cffaee47..670d244ae5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/system/CodeValue.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/systems/CodeValue.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.system +package com.mifos.core.objects.systems /** * Created by ishankhanna on 16/06/14. diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeAppliesTo.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeAppliesTo.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeAppliesTo.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeAppliesTo.kt index 91e56d5922..c477e4a0b9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeAppliesTo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeAppliesTo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeCalculationType.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeCalculationType.kt index 08784b5a39..2de0efc3a3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeOptions.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeOptions.kt index c50dcaeb54..60302dc96f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargePaymentMode.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargePaymentMode.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargePaymentMode.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargePaymentMode.kt index 0104a8b1b5..7ec2ad8eb5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargePaymentMode.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargePaymentMode.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTemplate.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTemplate.kt index 539a1a62f8..b098ad2462 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTimeType.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTimeType.kt index 7ee7a8110e..faf7918281 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import com.google.gson.annotations.SerializedName diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/Currency.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/Currency.kt index 17995bee63..32ddc84430 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/clients/IncomeOrLiabilityAccount.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/IncomeOrLiabilityAccount.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/templates/clients/IncomeOrLiabilityAccount.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/client/IncomeOrLiabilityAccount.kt index be08efe494..4e2a6e21cc 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/clients/IncomeOrLiabilityAccount.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/client/IncomeOrLiabilityAccount.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.clients +package com.mifos.core.objects.template.client import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AccountingRule.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AccountingRule.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/AccountingRule.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AccountingRule.kt index b3dfc6e907..aac94e0d06 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AccountingRule.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AccountingRule.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AllowAttributeOverrides.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AllowAttributeOverrides.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/AllowAttributeOverrides.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AllowAttributeOverrides.kt index ae1c82478e..22b1973e98 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AllowAttributeOverrides.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AllowAttributeOverrides.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationType.kt index 3e7364cec9..11f1897614 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationTypeOptions.kt index 883376fc6d..c8b4d1b224 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/AmortizationTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/AmortizationTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptions.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptions.kt index d7fdf3a9c0..3eec60651b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptionsType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptionsType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptionsType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptionsType.kt index 7327534732..0db28f6470 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/CalendarOptionsType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/CalendarOptionsType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeAppliesTo.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeAppliesTo.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeAppliesTo.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeAppliesTo.kt index 6ee445f676..dfb38ae3fe 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeAppliesTo.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeAppliesTo.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeCalculationType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeCalculationType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeCalculationType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeCalculationType.kt index 437e589f62..4e3bd0c5d7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeCalculationType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeCalculationType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeOptions.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeOptions.kt index 6d6f311036..22b439f514 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargePaymentMode.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargePaymentMode.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargePaymentMode.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargePaymentMode.kt index d172d72fd4..b217866d9f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargePaymentMode.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargePaymentMode.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeTimeType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeTimeType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeTimeType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeTimeType.kt index f8d4c3c39e..43ba0b9248 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ChargeTimeType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ChargeTimeType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Charges.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Charges.kt similarity index 96% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Charges.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Charges.kt index 988ea6798c..f0d374e3d5 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Charges.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Charges.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Currency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Currency.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Currency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Currency.kt index ed653eee0a..41b482fcc2 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Currency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Currency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInMonthType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInMonthType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInMonthType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInMonthType.kt index 35582df8d8..7cd405d329 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInMonthType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInMonthType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInYearType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInYearType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInYearType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInYearType.kt index 1f59654ab7..fbeffbabb9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/DaysInYearType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/DaysInYearType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/EntityType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/EntityType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/EntityType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/EntityType.kt index 89e0354252..8733cc5b96 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/EntityType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/EntityType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Frequency.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Frequency.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Frequency.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Frequency.kt index d73ec54bb3..f3109fed8f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Frequency.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Frequency.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/FundOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/FundOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/FundOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/FundOptions.kt index cb30bcc4f5..492665dce4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/FundOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/FundOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Group.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Group.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Group.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Group.kt index 0d8243239a..c6c392d798 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Group.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Group.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupLoanTemplate.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupLoanTemplate.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupLoanTemplate.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupLoanTemplate.kt index f1f99b6d23..22b0bd75c8 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupLoanTemplate.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupLoanTemplate.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupTimeline.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupTimeline.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupTimeline.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupTimeline.kt index 19f4df7253..7aa856add7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/GroupTimeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/GroupTimeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodType.kt index 20f53ce622..9063faa821 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodTypeOptions.kt index b43fa862f0..80136264b9 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestCalculationPeriodTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestCalculationPeriodTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyType.kt index e031fb1bd7..2797627eda 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyTypeOptions.kt index 07c5d60140..58b5c6edf1 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRateFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRateFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationCompoundingType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationCompoundingType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationCompoundingType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationCompoundingType.kt index 0629713b49..d09f5bbc0d 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationCompoundingType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationCompoundingType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationData.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationData.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationData.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationData.kt index 9195b6bc0c..a43c15f361 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestRecalculationData.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestRecalculationData.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestType.kt index de64988f24..d206f6295b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestTypeOptions.kt index 6c797cda9f..c5af8f6e48 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/InterestTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/InterestTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanCollateralOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanCollateralOptions.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanCollateralOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanCollateralOptions.kt index 438764f5c6..42778634d4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanCollateralOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanCollateralOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanOfficerOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanOfficerOptions.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanOfficerOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanOfficerOptions.kt index acf410cdb2..11039c14fc 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanOfficerOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanOfficerOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanPurposeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanPurposeOptions.kt similarity index 93% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanPurposeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanPurposeOptions.kt index 6143c15357..d5c7fa575a 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/LoanPurposeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/LoanPurposeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/OverdueCharges.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/OverdueCharges.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/OverdueCharges.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/OverdueCharges.kt index a6f6366918..9b6ccaf463 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/OverdueCharges.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/OverdueCharges.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/PreClosureInterestCalculationStrategy.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/PreClosureInterestCalculationStrategy.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/PreClosureInterestCalculationStrategy.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/PreClosureInterestCalculationStrategy.kt index 0f8a684d6c..b780213374 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/PreClosureInterestCalculationStrategy.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/PreClosureInterestCalculationStrategy.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Product.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Product.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Product.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Product.kt index 6216432c9e..8c4b4930fd 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Product.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Product.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ProductOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ProductOptions.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/ProductOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ProductOptions.kt index 5300401c6c..fb7d39245f 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/ProductOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/ProductOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RecalculationRestFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RecalculationRestFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RecalculationRestFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RecalculationRestFrequencyType.kt index ebf6606e82..30286f20b3 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RecalculationRestFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RecalculationRestFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyDaysOfWeekTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyDaysOfWeekTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt index 27d5fe1f9f..7e296493a4 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyDaysOfWeekTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyDaysOfWeekTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyNthDayTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyNthDayTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt index 19b7aeff69..584cbeb977 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyNthDayTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyNthDayTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyType.kt index 41a7d6c52a..46fbf02226 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyTypeOptions.kt index 9921803d73..a3c879dda0 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepaymentFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepaymentFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepeatsOnNthDayOfMonth.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepeatsOnNthDayOfMonth.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RepeatsOnNthDayOfMonth.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepeatsOnNthDayOfMonth.kt index e85b15a873..982fde0645 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RepeatsOnNthDayOfMonth.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RepeatsOnNthDayOfMonth.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RescheduleStrategyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RescheduleStrategyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/RescheduleStrategyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RescheduleStrategyType.kt index 93a707802c..2af5c6e363 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/RescheduleStrategyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/RescheduleStrategyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Status.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Status.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Status.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Status.kt index 34a8893bd0..2916bf57d0 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Status.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Status.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TaxGroup.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TaxGroup.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/TaxGroup.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TaxGroup.kt index bcdaa4a385..7970fee016 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TaxGroup.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TaxGroup.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TermFrequencyTypeOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermFrequencyTypeOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/TermFrequencyTypeOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermFrequencyTypeOptions.kt index d0cc0155f9..2fdd32475b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TermFrequencyTypeOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermFrequencyTypeOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TermPeriodFrequencyType.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermPeriodFrequencyType.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/TermPeriodFrequencyType.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermPeriodFrequencyType.kt index b4baf4727e..c0343d9e70 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TermPeriodFrequencyType.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TermPeriodFrequencyType.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Timeline.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Timeline.kt similarity index 91% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Timeline.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Timeline.kt index e0b20baf47..b982fc531b 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Timeline.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Timeline.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TransactionProcessingStrategyOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TransactionProcessingStrategyOptions.kt similarity index 92% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/TransactionProcessingStrategyOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TransactionProcessingStrategyOptions.kt index 62130556a2..ad9498b803 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/TransactionProcessingStrategyOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/TransactionProcessingStrategyOptions.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Type.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Type.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/templates/loans/Type.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Type.kt index 5f9f88991b..4837f5f5fd 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/loans/Type.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/loan/Type.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.loans +package com.mifos.core.objects.template.loan import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/savings/AccountOptions.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/saving/AccountOptions.kt similarity index 89% rename from core/database/src/main/java/com/mifos/core/objects/templates/savings/AccountOptions.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/saving/AccountOptions.kt index 7bb3cb3327..264edf333c 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/savings/AccountOptions.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/saving/AccountOptions.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.savings +package com.mifos.core.objects.template.saving import android.os.Parcelable -import com.mifos.core.objects.accounts.loan.InterestType +import com.mifos.core.objects.account.loan.InterestType import kotlinx.parcelize.Parcelize /* diff --git a/core/database/src/main/java/com/mifos/core/objects/templates/savings/TagId.kt b/core/model/src/main/kotlin/com/mifos/core/objects/template/saving/TagId.kt similarity index 90% rename from core/database/src/main/java/com/mifos/core/objects/templates/savings/TagId.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/template/saving/TagId.kt index c06f2a0b27..2058e0cc07 100644 --- a/core/database/src/main/java/com/mifos/core/objects/templates/savings/TagId.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/template/saving/TagId.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.templates.savings +package com.mifos.core.objects.template.saving import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/objects/user/User.kt b/core/model/src/main/kotlin/com/mifos/core/objects/users/User.kt similarity index 94% rename from core/database/src/main/java/com/mifos/core/objects/user/User.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/users/User.kt index b8a3d50056..0352b2bc15 100644 --- a/core/database/src/main/java/com/mifos/core/objects/user/User.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/users/User.kt @@ -7,9 +7,9 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.user +package com.mifos.core.objects.users -import com.mifos.core.objects.client.Role +import com.mifos.core.objects.clients.Role class User { // {"username":"User1","userId":1,"base64EncodedAuthenticationKey":"VXNlcjE6dGVjaDRtZg\u003d diff --git a/core/database/src/main/java/com/mifos/core/objects/user/UserLatLng.kt b/core/model/src/main/kotlin/com/mifos/core/objects/users/UserLatLng.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/objects/user/UserLatLng.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/users/UserLatLng.kt index 91ac96d1fd..702cbf59ef 100644 --- a/core/database/src/main/java/com/mifos/core/objects/user/UserLatLng.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/users/UserLatLng.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.user +package com.mifos.core.objects.users import android.os.Parcel import android.os.Parcelable diff --git a/core/database/src/main/java/com/mifos/core/objects/user/UserLocation.kt b/core/model/src/main/kotlin/com/mifos/core/objects/users/UserLocation.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/objects/user/UserLocation.kt rename to core/model/src/main/kotlin/com/mifos/core/objects/users/UserLocation.kt index 5906df2a47..c63748a0b7 100644 --- a/core/database/src/main/java/com/mifos/core/objects/user/UserLocation.kt +++ b/core/model/src/main/kotlin/com/mifos/core/objects/users/UserLocation.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.objects.user +package com.mifos.core.objects.users import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/data/ChargesPayload.kt b/core/model/src/main/kotlin/com/mifos/core/payloads/ChargesPayload.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/data/ChargesPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/payloads/ChargesPayload.kt index f1960f0e3a..fc9dada280 100644 --- a/core/database/src/main/java/com/mifos/core/data/ChargesPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/payloads/ChargesPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.data +package com.mifos.core.payloads /** * Created by nellyk on 2/15/2016. diff --git a/core/database/src/main/java/com/mifos/core/data/GroupLoanPayload.kt b/core/model/src/main/kotlin/com/mifos/core/payloads/GroupLoanPayload.kt similarity index 98% rename from core/database/src/main/java/com/mifos/core/data/GroupLoanPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/payloads/GroupLoanPayload.kt index 78f64e9296..d5c8fab5a7 100644 --- a/core/database/src/main/java/com/mifos/core/data/GroupLoanPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/payloads/GroupLoanPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.data +package com.mifos.core.payloads import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/database/src/main/java/com/mifos/core/data/SavingsPayload.kt b/core/model/src/main/kotlin/com/mifos/core/payloads/SavingsPayload.kt similarity index 97% rename from core/database/src/main/java/com/mifos/core/data/SavingsPayload.kt rename to core/model/src/main/kotlin/com/mifos/core/payloads/SavingsPayload.kt index 4e20d71623..bc1c0a2b85 100644 --- a/core/database/src/main/java/com/mifos/core/data/SavingsPayload.kt +++ b/core/model/src/main/kotlin/com/mifos/core/payloads/SavingsPayload.kt @@ -7,7 +7,7 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.data +package com.mifos.core.payloads /** * Created by nellyk on 2/10/2016. diff --git a/core/network/src/main/java/com/mifos/core/network/DataManager.kt b/core/network/src/main/java/com/mifos/core/network/DataManager.kt index 06ee62bfbb..a47e0447d6 100644 --- a/core/network/src/main/java/com/mifos/core/network/DataManager.kt +++ b/core/network/src/main/java/com/mifos/core/network/DataManager.kt @@ -9,29 +9,29 @@ */ package com.mifos.core.network -import com.mifos.core.data.ChargesPayload -import com.mifos.core.data.GroupLoanPayload +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.entity.client.Charges +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.entity.group.GroupWithAssociations +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff import com.mifos.core.network.datamanager.DataManagerClient import com.mifos.core.network.model.CollectionSheetPayload import com.mifos.core.network.model.Payload -import com.mifos.core.objects.accounts.loan.LoanApproval -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Loans -import com.mifos.core.objects.client.ChargeCreationResponse -import com.mifos.core.objects.client.Charges -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.db.CollectionSheet -import com.mifos.core.objects.db.OfflineCenter -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.group.GroupWithAssociations -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff -import com.mifos.core.objects.response.SaveResponse -import com.mifos.core.objects.templates.clients.ChargeTemplate -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.account.loan.LoanApproval +import com.mifos.core.objects.clients.ChargeCreationResponse +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.databaseobjects.CollectionSheet +import com.mifos.core.objects.databaseobjects.OfflineCenter +import com.mifos.core.objects.organisations.LoanProducts +import com.mifos.core.objects.responses.SaveResponse +import com.mifos.core.objects.template.client.ChargeTemplate +import com.mifos.core.objects.template.loan.GroupLoanTemplate +import com.mifos.core.payloads.ChargesPayload +import com.mifos.core.payloads.GroupLoanPayload import okhttp3.ResponseBody import rx.Observable import javax.inject.Inject diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt index 6445b05ccb..63daa6cf3d 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCenter.kt @@ -9,18 +9,18 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.data.CenterPayload import com.mifos.core.databasehelper.DatabaseHelperCenter +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.entity.group.Center +import com.mifos.core.entity.group.CenterWithAssociations +import com.mifos.core.entity.organisation.Office import com.mifos.core.network.BaseApiManager import com.mifos.core.network.mappers.centers.GetCentersResponseMapper import com.mifos.core.network.mappers.offices.GetOfficeResponseMapper -import com.mifos.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.client.ActivatePayload -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.objects.organisation.Office -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.responses.SaveResponse import org.openapitools.client.models.PostCentersCenterIdRequest import org.openapitools.client.models.PostCentersCenterIdResponse import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt index 63d0f3ab6d..8954a4173a 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCharge.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperCharge +import com.mifos.core.entity.client.Charges import com.mifos.core.network.BaseApiManager -import com.mifos.core.objects.client.Charges -import com.mifos.core.objects.client.Page +import com.mifos.core.objects.clients.Page import rx.Observable import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt index 413608ee66..19c282628f 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCheckerInbox.kt @@ -11,9 +11,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.network.BaseApiManager 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.checkerinboxandtasks.RescheduleLoansTask +import com.mifos.core.objects.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.objects.checkerinboxtask.CheckerTask +import com.mifos.core.objects.checkerinboxtask.RescheduleLoansTask import rx.Observable import javax.inject.Inject diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt index ed01083305..42df2d25c9 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerClient.kt @@ -10,24 +10,24 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperClient +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientPayload +import com.mifos.core.entity.templates.clients.ClientsTemplate import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.clients.GetClientResponseMapper import com.mifos.core.network.mappers.clients.GetClientsClientIdAccountMapper import com.mifos.core.network.mappers.clients.GetIdentifiersTemplateMapper import com.mifos.core.network.mappers.clients.IdentifierMapper -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.client.ActivatePayload -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientAddressRequest -import com.mifos.core.objects.client.ClientAddressResponse -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.noncore.Identifier -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.templates.clients.ClientsTemplate +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressResponse +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.noncoreobjects.Identifier +import com.mifos.core.objects.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.objects.noncoreobjects.IdentifierPayload +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import okhttp3.MultipartBody import okhttp3.ResponseBody import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt index 06064eb05d..e3e3ccdf76 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerCollectionSheet.kt @@ -9,17 +9,17 @@ */ package com.mifos.core.network.datamanager +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.IndividualCollectionSheet +import com.mifos.core.entity.collectionsheet.ProductiveCollectionSheetPayload +import com.mifos.core.entity.group.CenterWithAssociations import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.network.model.RequestCollectionSheetPayload -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.IndividualCollectionSheet -import com.mifos.core.objects.collectionsheet.ProductiveCollectionSheetPayload -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt index 0548741a64..1c187edcd5 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDataTable.kt @@ -11,11 +11,11 @@ package com.mifos.core.network.datamanager import com.google.gson.JsonArray import com.mifos.core.databasehelper.DatabaseHelperDataTable +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.dataTable.GetDataTablesResponseMapper -import com.mifos.core.objects.noncore.DataTable -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation import org.openapitools.client.models.DeleteDataTablesDatatableAppTableIdDatatableIdResponse import rx.Observable import javax.inject.Inject diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt index 783cb8540c..8a1720229c 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerDocument.kt @@ -11,7 +11,7 @@ package com.mifos.core.network.datamanager import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import okhttp3.MultipartBody import okhttp3.ResponseBody import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt index 40530b482f..c48404cac9 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerGroups.kt @@ -11,16 +11,16 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperClient import com.mifos.core.databasehelper.DatabaseHelperGroups +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.entity.group.GroupWithAssociations import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse import com.mifos.core.network.mappers.groups.GetGroupsResponseMapper -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.client.ActivatePayload -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.responses.SaveResponse import rx.Observable import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt index 6aeed2f338..7dfbc4338a 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerLoan.kt @@ -9,19 +9,19 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.data.LoansPayload import com.mifos.core.databasehelper.DatabaseHelperLoan +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.loans.LoanTemplate +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.LoanDisbursement -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Loans -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.loans.LoanTemplate -import com.mifos.core.objects.templates.loans.LoanTransactionTemplate +import com.mifos.core.network.model.LoansPayload +import com.mifos.core.objects.account.loan.LoanDisbursement +import com.mifos.core.objects.account.loan.LoanRepaymentResponse +import com.mifos.core.objects.organisations.LoanProducts import rx.Observable import javax.inject.Inject import javax.inject.Singleton @@ -208,7 +208,7 @@ class DataManagerLoan @Inject constructor( * * @return List */ - val paymentTypeOption: Observable> + val paymentTypeOption: Observable> get() = mDatabaseHelperLoan.paymentTypeOption /** diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerNote.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerNote.kt index de7e030d97..ccb54a2445 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerNote.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerNote.kt @@ -10,8 +10,8 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperNote +import com.mifos.core.entity.noncore.Note import com.mifos.core.network.BaseApiManager -import com.mifos.core.objects.noncore.Note import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerOffices.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerOffices.kt index 2f11a5929f..9b8067c2b9 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerOffices.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerOffices.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.network.datamanager +import com.mifos.core.entity.organisation.Office import com.mifos.core.network.BaseApiManager import com.mifos.core.network.mappers.offices.GetOfficeResponseMapper -import com.mifos.core.objects.organisation.Office import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt index a657e96f54..e1ef8ef76e 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerRunReport.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.datamanager import com.mifos.core.network.BaseApiManager -import com.mifos.core.objects.group.CenterInfo -import com.mifos.core.objects.runreports.FullParameterListResponse -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.groups.CenterInfo +import com.mifos.core.objects.runreport.FullParameterListResponse +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt index 1c8b682150..72ba9143db 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSavings.kt @@ -9,18 +9,18 @@ */ package com.mifos.core.network.datamanager -import com.mifos.core.data.SavingsPayload import com.mifos.core.databasehelper.DatabaseHelperSavings +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import com.mifos.core.network.BaseApiManager import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.loan.SavingsApproval +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.objects.organisations.ProductSavings +import com.mifos.core.payloads.SavingsPayload import rx.Observable import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerStaff.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerStaff.kt index bbc535b86c..77010e9933 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerStaff.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerStaff.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.network.datamanager +import com.mifos.core.entity.organisation.Staff import com.mifos.core.network.BaseApiManager import com.mifos.core.network.mappers.staffs.StaffMapper -import com.mifos.core.objects.organisation.Staff import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt index 6b09401368..5425380e1c 100644 --- a/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt +++ b/core/network/src/main/java/com/mifos/core/network/datamanager/DataManagerSurveys.kt @@ -10,11 +10,11 @@ package com.mifos.core.network.datamanager import com.mifos.core.databasehelper.DatabaseHelperSurveys +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import com.mifos.core.network.BaseApiManager -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Scorecard -import com.mifos.core.objects.survey.Survey +import com.mifos.core.objects.surveys.Scorecard import rx.Observable import javax.inject.Inject import javax.inject.Singleton diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/centers/CenterMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/centers/CenterMapper.kt index 064c230093..503d783c1e 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/centers/CenterMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/centers/CenterMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.centers -import com.mifos.core.objects.client.Status -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.client.Status +import com.mifos.core.entity.group.Center import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetCentersPageItems import org.openapitools.client.models.GetCentersStatus diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt index c4e2f7ece0..1ad880744a 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/centers/GetCentersResponseMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.centers -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center +import com.mifos.core.objects.clients.Page import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetCentersResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/ClientMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/ClientMapper.kt index 3a8e0d0b92..f103fa02eb 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/ClientMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/ClientMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.Status +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.Status import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientStatus import org.openapitools.client.models.GetClientsPageItemsResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt index 4cd750f8f1..006e979762 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientResponseMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -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 org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt index fc07356625..84bb83eacf 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetClientsClientIdAccountMapper.kt @@ -9,13 +9,13 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.loan.LoanType -import com.mifos.core.objects.accounts.savings.Currency -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.accounts.savings.Status +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.loan.LoanType +import com.mifos.core.entity.accounts.savings.Currency +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.savings.Status import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsClientIdAccountsResponse import org.openapitools.client.models.GetClientsLoanAccounts @@ -74,7 +74,7 @@ object GetClientsClientIdAccountMapper : externalId = it.externalId.toString() productId = it.productId?.toInt() productName = it.productName - status = com.mifos.core.objects.accounts.loan.Status().apply { + status = com.mifos.core.entity.accounts.loan.Status().apply { id = it.status?.id?.toInt() code = it.status?.code value = it.status?.description diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt index 5ff7e932b7..520b075954 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/GetIdentifiersTemplateMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.objects.noncore.DocumentType -import com.mifos.core.objects.noncore.IdentifierTemplate +import com.mifos.core.objects.noncoreobjects.DocumentType +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsAllowedDocumentTypes import org.openapitools.client.models.GetClientsClientIdIdentifiersTemplateResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt index 951b4c3c1a..87d442c4bc 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/clients/IdentifierMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.clients -import com.mifos.core.objects.noncore.DocumentType -import com.mifos.core.objects.noncore.Identifier +import com.mifos.core.objects.noncoreobjects.DocumentType +import com.mifos.core.objects.noncoreobjects.Identifier import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetClientsClientIdIdentifiersResponse import org.openapitools.client.models.GetClientsDocumentType diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/dataTable/GetDataTablesResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/dataTable/GetDataTablesResponseMapper.kt index 0aee13aa29..cff734e1db 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/dataTable/GetDataTablesResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/dataTable/GetDataTablesResponseMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.dataTable -import com.mifos.core.objects.noncore.ColumnHeader -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.ColumnHeader +import com.mifos.core.entity.noncore.DataTable import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetDataTablesResponse import org.openapitools.client.models.ResultsetColumnHeaderData diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt index 9ace5476e6..e9cb348a3e 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GetGroupsResponseMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.groups -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group +import com.mifos.core.objects.clients.Page import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetGroupsResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GroupMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GroupMapper.kt index aec6db5051..f9b0c0d126 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/groups/GroupMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/groups/GroupMapper.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.mappers.groups -import com.mifos.core.objects.client.Status -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.client.Status +import com.mifos.core.entity.group.Group import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetGroupsPageItems import org.openapitools.client.models.GetGroupsStatus diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/offices/GetOfficeResponseMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/offices/GetOfficeResponseMapper.kt index b29863e97d..f088caaf60 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/offices/GetOfficeResponseMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/offices/GetOfficeResponseMapper.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.mappers.offices -import com.mifos.core.objects.organisation.Office +import com.mifos.core.entity.organisation.Office import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.GetOfficesResponse diff --git a/core/network/src/main/java/com/mifos/core/network/mappers/staffs/StaffMapper.kt b/core/network/src/main/java/com/mifos/core/network/mappers/staffs/StaffMapper.kt index d2f7eea726..661d64a3cc 100644 --- a/core/network/src/main/java/com/mifos/core/network/mappers/staffs/StaffMapper.kt +++ b/core/network/src/main/java/com/mifos/core/network/mappers/staffs/StaffMapper.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.mappers.staffs -import com.mifos.core.objects.organisation.Staff +import com.mifos.core.entity.organisation.Staff import org.mifos.core.data.AbstractMapper import org.openapitools.client.models.RetrieveOneResponse diff --git a/core/database/src/main/java/com/mifos/core/data/LoansPayload.kt b/core/network/src/main/java/com/mifos/core/network/model/LoansPayload.kt similarity index 95% rename from core/database/src/main/java/com/mifos/core/data/LoansPayload.kt rename to core/network/src/main/java/com/mifos/core/network/model/LoansPayload.kt index 6a55d993c8..0ee83cd8b5 100644 --- a/core/database/src/main/java/com/mifos/core/data/LoansPayload.kt +++ b/core/network/src/main/java/com/mifos/core/network/model/LoansPayload.kt @@ -7,10 +7,10 @@ * * See https://github.com/openMF/android-client/blob/master/LICENSE.md */ -package com.mifos.core.data +package com.mifos.core.network.model import android.os.Parcelable -import com.mifos.core.objects.noncore.DataTablePayload +import com.mifos.core.entity.noncore.DataTablePayload import kotlinx.parcelize.Parcelize /** diff --git a/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt b/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt index 871a0f785c..1a2050568c 100644 --- a/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt +++ b/core/network/src/main/java/com/mifos/core/network/model/ScorecardPayload.kt @@ -9,7 +9,7 @@ */ package com.mifos.core.network.model -import com.mifos.core.objects.survey.ScorecardValues +import com.mifos.core.objects.surveys.ScorecardValues import java.util.Date /** diff --git a/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt b/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt index a12b4a8fed..6292dc6503 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CenterService.kt @@ -9,19 +9,19 @@ */ package com.mifos.core.network.services -import com.mifos.core.data.CenterPayload +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.entity.group.Center +import com.mifos.core.entity.group.CenterWithAssociations import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.CollectionSheetPayload import com.mifos.core.network.model.Payload -import com.mifos.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.client.ActivatePayload -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.db.CollectionSheet -import com.mifos.core.objects.db.OfflineCenter -import com.mifos.core.objects.group.Center -import com.mifos.core.objects.group.CenterWithAssociations -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.databaseobjects.CollectionSheet +import com.mifos.core.objects.databaseobjects.OfflineCenter +import com.mifos.core.objects.responses.SaveResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt b/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt index 9c8b70dc66..8b74abc910 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/ChargeService.kt @@ -9,12 +9,12 @@ */ package com.mifos.core.network.services -import com.mifos.core.data.ChargesPayload +import com.mifos.core.entity.client.Charges import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.client.ChargeCreationResponse -import com.mifos.core.objects.client.Charges -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.templates.clients.ChargeTemplate +import com.mifos.core.objects.clients.ChargeCreationResponse +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.template.client.ChargeTemplate +import com.mifos.core.payloads.ChargesPayload import okhttp3.ResponseBody import retrofit2.http.Body import retrofit2.http.GET diff --git a/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt b/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt index cd8e408577..1bf935ef7b 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CheckerInboxService.kt @@ -11,9 +11,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint 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.checkerinboxandtasks.RescheduleLoansTask +import com.mifos.core.objects.checkerinboxtask.CheckerInboxSearchTemplate +import com.mifos.core.objects.checkerinboxtask.CheckerTask +import com.mifos.core.objects.checkerinboxtask.RescheduleLoansTask import retrofit2.http.DELETE import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/ClientAccountsService.kt b/core/network/src/main/java/com/mifos/core/network/services/ClientAccountsService.kt index 41007451ef..d769ada968 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/ClientAccountsService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/ClientAccountsService.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.accounts.ClientAccounts import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.accounts.ClientAccounts import retrofit2.http.GET import retrofit2.http.Path import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt b/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt index a76138ffbd..91b2fd8f94 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/ClientService.kt @@ -9,20 +9,20 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.accounts.ClientAccounts +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientPayload +import com.mifos.core.entity.templates.clients.ClientsTemplate import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.ClientAccounts -import com.mifos.core.objects.client.ActivatePayload -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientAddressRequest -import com.mifos.core.objects.client.ClientAddressResponse -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.noncore.Identifier -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.templates.clients.ClientsTemplate +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressResponse +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.noncoreobjects.Identifier +import com.mifos.core.objects.noncoreobjects.IdentifierCreationResponse +import com.mifos.core.objects.noncoreobjects.IdentifierPayload +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import okhttp3.MultipartBody import okhttp3.ResponseBody import retrofit2.http.Body diff --git a/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt b/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt index 3d0d05cdb5..aae9f21b98 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/CollectionSheetService.kt @@ -9,17 +9,17 @@ */ package com.mifos.core.network.services +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.IndividualCollectionSheet +import com.mifos.core.entity.collectionsheet.ProductiveCollectionSheetPayload +import com.mifos.core.entity.group.CenterWithAssociations import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.network.model.RequestCollectionSheetPayload -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.IndividualCollectionSheet -import com.mifos.core.objects.collectionsheet.ProductiveCollectionSheetPayload -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt b/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt index f345ba8a89..114604e8f6 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/DataTableService.kt @@ -10,10 +10,10 @@ package com.mifos.core.network.services import com.google.gson.JsonArray +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.noncore.DataTable -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt b/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt index 2041e8cf85..c00258d923 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/DocumentService.kt @@ -11,7 +11,7 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import okhttp3.MultipartBody import okhttp3.ResponseBody import retrofit2.http.DELETE diff --git a/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt b/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt index 3a8265fd0d..0c1b024cf1 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/GroupService.kt @@ -9,15 +9,15 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupPayload +import com.mifos.core.entity.group.GroupWithAssociations import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.client.ActivatePayload -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupPayload -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.objects.clients.ActivatePayload +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.responses.SaveResponse import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt b/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt index 9363c45ec4..7a2c2e869e 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/LoanService.kt @@ -9,23 +9,23 @@ */ package com.mifos.core.network.services -import com.mifos.core.data.GroupLoanPayload -import com.mifos.core.data.LoansPayload +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.Loans +import com.mifos.core.entity.client.Charges +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.loans.LoanTemplate +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.LoanApproval -import com.mifos.core.objects.accounts.loan.LoanDisbursement -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Loans -import com.mifos.core.objects.client.Charges -import com.mifos.core.objects.client.Page -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.templates.loans.GroupLoanTemplate -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate -import com.mifos.core.objects.templates.loans.LoanTemplate -import com.mifos.core.objects.templates.loans.LoanTransactionTemplate +import com.mifos.core.network.model.LoansPayload +import com.mifos.core.objects.account.loan.LoanApproval +import com.mifos.core.objects.account.loan.LoanDisbursement +import com.mifos.core.objects.account.loan.LoanRepaymentResponse +import com.mifos.core.objects.clients.Page +import com.mifos.core.objects.organisations.LoanProducts +import com.mifos.core.objects.template.loan.GroupLoanTemplate +import com.mifos.core.payloads.GroupLoanPayload import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/NoteService.kt b/core/network/src/main/java/com/mifos/core/network/services/NoteService.kt index 1fe03fa2e0..6842fe8813 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/NoteService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/NoteService.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.noncore.Note import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.noncore.Note import retrofit2.http.GET import retrofit2.http.Path diff --git a/core/network/src/main/java/com/mifos/core/network/services/OfficeService.kt b/core/network/src/main/java/com/mifos/core/network/services/OfficeService.kt index 634234c3b9..e2956fef4d 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/OfficeService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/OfficeService.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.organisation.Office import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.organisation.Office import retrofit2.http.GET /** diff --git a/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt b/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt index 10297303ad..5bc95f36e8 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/RunReportsService.kt @@ -10,9 +10,9 @@ package com.mifos.core.network.services import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.group.CenterInfo -import com.mifos.core.objects.runreports.FullParameterListResponse -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.groups.CenterInfo +import com.mifos.core.objects.runreport.FullParameterListResponse +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query diff --git a/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt b/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt index 9c440f3a73..21f15494f6 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/SavingsAccountService.kt @@ -9,17 +9,17 @@ */ package com.mifos.core.network.services -import com.mifos.core.data.SavingsPayload +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate import com.mifos.core.model.APIEndPoint import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.loan.SavingsApproval +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse +import com.mifos.core.objects.organisations.ProductSavings +import com.mifos.core.payloads.SavingsPayload import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/network/src/main/java/com/mifos/core/network/services/StaffService.kt b/core/network/src/main/java/com/mifos/core/network/services/StaffService.kt index 144e56664d..ea688ba1ab 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/StaffService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/StaffService.kt @@ -9,8 +9,8 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.organisation.Staff import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.organisation.Staff import retrofit2.http.GET import retrofit2.http.Query import rx.Observable diff --git a/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt b/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt index 41395aa0ae..5c37d0ab4a 100644 --- a/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt +++ b/core/network/src/main/java/com/mifos/core/network/services/SurveyService.kt @@ -9,9 +9,9 @@ */ package com.mifos.core.network.services +import com.mifos.core.entity.survey.Survey import com.mifos.core.model.APIEndPoint -import com.mifos.core.objects.survey.Scorecard -import com.mifos.core.objects.survey.Survey +import com.mifos.core.objects.surveys.Scorecard import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/testing/src/main/java/com/mifos/core/testing/repository/TestGroupsListRepository.kt b/core/testing/src/main/java/com/mifos/core/testing/repository/TestGroupsListRepository.kt index bc9e0d3800..e784c3b300 100644 --- a/core/testing/src/main/java/com/mifos/core/testing/repository/TestGroupsListRepository.kt +++ b/core/testing/src/main/java/com/mifos/core/testing/repository/TestGroupsListRepository.kt @@ -10,7 +10,7 @@ package com.mifos.core.testing.repository import com.mifos.core.data.repository.GroupsListRepository -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.emptyFlow diff --git a/core/ui/src/main/java/com/mifos/core/ui/util/GroupListPreviewParameterProvider.kt b/core/ui/src/main/java/com/mifos/core/ui/util/GroupListPreviewParameterProvider.kt index c77dc63f28..dc71e3d5ed 100644 --- a/core/ui/src/main/java/com/mifos/core/ui/util/GroupListPreviewParameterProvider.kt +++ b/core/ui/src/main/java/com/mifos/core/ui/util/GroupListPreviewParameterProvider.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.paging.LoadState import androidx.paging.LoadStates import androidx.paging.PagingData -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import com.mifos.core.testing.repository.sampleGroups import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt index 855dae1bc3..9244b1a208 100644 --- a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt +++ b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateScreen.kt @@ -55,7 +55,7 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.client.ActivatePayload +import com.mifos.core.objects.clients.ActivatePayload import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt index caff661d11..6e28f82bb2 100644 --- a/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt +++ b/feature/activate/src/main/java/com/mifos/feature/activate/ActivateViewModel.kt @@ -17,7 +17,7 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.ActivateCenterUseCase import com.mifos.core.domain.useCases.ActivateClientUseCase import com.mifos.core.domain.useCases.ActivateGroupUseCase -import com.mifos.core.objects.client.ActivatePayload +import com.mifos.core.objects.clients.ActivatePayload import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt index 919e4d0fa9..fec05ebe39 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsScreen.kt @@ -61,8 +61,8 @@ import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -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 com.mifos.feature.center.R @Composable diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt index e5c11d5f60..b8998addf8 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.center.centerDetails -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 /** * Created by Aditya Gupta on 06/08/23. diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt index e6843e44cb..83e555ee7d 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerDetails/CenterDetailsViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetCenterDetailsUseCase -import com.mifos.core.objects.group.CenterInfo +import com.mifos.core.objects.groups.CenterInfo import com.mifos.feature.center.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListScreen.kt index a78f39eb53..4c1a0a9890 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListScreen.kt @@ -45,10 +45,10 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.Status -import com.mifos.core.objects.group.CenterWithAssociations -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.Status +import com.mifos.core.entity.group.CenterWithAssociations +import com.mifos.core.entity.group.Group import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.center.R diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListUiState.kt index 1ad5c786b6..b9fb09d5f6 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.center.centerGroupList -import com.mifos.core.objects.group.CenterWithAssociations +import com.mifos.core.entity.group.CenterWithAssociations /** * Created by Aditya Gupta on 06/08/23. diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListViewModel.kt b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListViewModel.kt index ff89fe39c5..c56d4ad0ae 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListViewModel.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerGroupList/GroupListViewModel.kt @@ -16,8 +16,8 @@ import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetGroupsByCenterUseCase import com.mifos.core.domain.useCases.GetGroupsUseCase -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 com.mifos.feature.center.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListScreen.kt index d6fad7813c..622252e071 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListScreen.kt @@ -79,7 +79,7 @@ import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center import com.mifos.core.ui.components.SelectionModeTopAppBar import com.mifos.feature.center.R import com.mifos.feature.center.syncCentersDialog.SyncCenterDialogScreen diff --git a/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListUiState.kt index 20358bc53e..b23e7bf779 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/centerList/ui/CenterListUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.center.centerList.ui import androidx.paging.PagingData -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center import kotlinx.coroutines.flow.Flow /** diff --git a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterScreen.kt index ed19c3bdf5..53672646c0 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterScreen.kt @@ -53,7 +53,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.core.data.CenterPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -62,7 +61,8 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.organisation.Office +import com.mifos.core.entity.center.CenterPayload +import com.mifos.core.entity.organisation.Office import com.mifos.feature.center.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterUiState.kt index 0ca1c815da..cd6a02c491 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.center.createCenter -import com.mifos.core.objects.organisation.Office +import com.mifos.core.entity.organisation.Office /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterViewModel.kt b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterViewModel.kt index faf986a0a1..a3583d40f5 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterViewModel.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/createCenter/CreateNewCenterViewModel.kt @@ -12,9 +12,9 @@ package com.mifos.feature.center.createCenter import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.domain.useCases.CreateNewCenterUseCase import com.mifos.core.domain.useCases.GetOfficeListUseCase +import com.mifos.core.entity.center.CenterPayload import com.mifos.feature.center.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/center/src/main/java/com/mifos/feature/center/navigation/CenterNavigation.kt b/feature/center/src/main/java/com/mifos/feature/center/navigation/CenterNavigation.kt index e5a2efc194..fd270ef825 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/navigation/CenterNavigation.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/navigation/CenterNavigation.kt @@ -17,7 +17,7 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client import com.mifos.feature.center.centerDetails.CenterDetailsScreen import com.mifos.feature.center.centerGroupList.GroupListScreen import com.mifos.feature.center.centerList.ui.CenterListScreen diff --git a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt index 867242b861..051092a00b 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogScreen.kt @@ -38,7 +38,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.core.designsystem.component.MifosCircularProgress -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center import com.mifos.feature.center.R @Composable diff --git a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogUiState.kt b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogUiState.kt index f961722ced..6931a0d3de 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogUiState.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.center.syncCentersDialog import androidx.compose.ui.graphics.vector.ImageVector -import com.mifos.core.objects.group.Center +import com.mifos.core.entity.group.Center /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogViewModel.kt b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogViewModel.kt index dcc146b1f4..75ef3b8603 100644 --- a/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogViewModel.kt +++ b/feature/center/src/main/java/com/mifos/feature/center/syncCentersDialog/SyncCentersDialogViewModel.kt @@ -16,17 +16,17 @@ import com.mifos.core.common.utils.NetworkUtilsWrapper import com.mifos.core.data.repository.SyncCentersDialogRepository import com.mifos.core.datastore.PrefManager import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.accounts.CenterAccounts -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client -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.group.GroupWithAssociations -import com.mifos.core.objects.zipmodels.LoanAndLoanRepayment -import com.mifos.core.objects.zipmodels.SavingsAccountAndTransactionTemplate +import com.mifos.core.entity.accounts.CenterAccounts +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client +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.entity.group.GroupWithAssociations +import com.mifos.core.entity.zipmodels.LoanAndLoanRepayment +import com.mifos.core.entity.zipmodels.SavingsAccountAndTransactionTemplate import com.mifos.feature.center.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt index 7a43ee5550..5e1c7de9d5 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxScreen.kt @@ -78,7 +78,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.checkerinboxandtasks.CheckerTask +import com.mifos.core.objects.checkerinboxtask.CheckerTask import com.mifos.core.ui.components.SelectionModeTopAppBar import com.mifos.feature.checkerInboxTask.checkerInboxDialog.CheckerInboxTasksFilterDialog import com.mifos.feature.checker_inbox_task.R diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt index 47e0c69d7b..3bb44a93f5 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInbox/CheckerInboxUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.checkerInboxTask.checkerInbox -import com.mifos.core.objects.checkerinboxandtasks.CheckerTask +import com.mifos.core.objects.checkerinboxtask.CheckerTask sealed class CheckerInboxUiState { diff --git a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt index 8f724f2813..2268b915e0 100644 --- a/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt +++ b/feature/checker-inbox-task/src/main/java/com/mifos/feature/checkerInboxTask/checkerInboxDialog/CheckerInboxViewModel.kt @@ -13,7 +13,7 @@ import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.network.datamanager.DataManagerCheckerInbox -import com.mifos.core.objects.checkerinboxandtasks.CheckerInboxSearchTemplate +import com.mifos.core.objects.checkerinboxtask.CheckerInboxSearchTemplate import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt index 5402cb6242..de25824c41 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogScreen.kt @@ -58,7 +58,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.core.data.ChargesPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -67,7 +66,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.templates.clients.ChargeTemplate +import com.mifos.core.objects.template.client.ChargeTemplate +import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.client.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt index d72972fb9a..76e047de18 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientChargeDialog -import com.mifos.core.objects.templates.clients.ChargeTemplate +import com.mifos.core.objects.template.client.ChargeTemplate /** * Created by Aditya Gupta on 13/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt index d800b866d9..5352388a9f 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientChargeDialog/ChargeDialogViewModel.kt @@ -12,10 +12,10 @@ package com.mifos.feature.client.clientChargeDialog import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource -import com.mifos.core.data.ChargesPayload import com.mifos.core.domain.useCases.CreateChargesUseCase import com.mifos.core.domain.useCases.GetAllChargesV2UseCase -import com.mifos.core.objects.templates.clients.ChargeTemplate +import com.mifos.core.objects.template.client.ChargeTemplate +import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargeUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargeUiState.kt index cf6c5e81c0..5e7fd79290 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargeUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargeUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.client.clientCharges 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/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargesScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargesScreen.kt index 4ba1d19449..5e8edb4d2e 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargesScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientCharges/ClientChargesScreen.kt @@ -63,7 +63,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges import com.mifos.feature.client.R import com.mifos.feature.client.clientChargeDialog.ChargeDialogScreen import kotlinx.coroutines.flow.flowOf diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt index 557be30a45..4c45515414 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsScreen.kt @@ -106,9 +106,9 @@ import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccount +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccount import com.mifos.feature.client.R import kotlinx.coroutines.launch import java.io.File diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsViewModel.kt index fb93714d0e..7348fb0c69 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientDetails/ui/ClientDetailsViewModel.kt @@ -20,10 +20,10 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.DeleteClientImageUseCase import com.mifos.core.domain.useCases.GetClientDetailsUseCase import com.mifos.core.domain.useCases.UploadClientImageUseCase +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client import com.mifos.core.network.utils.ImageLoaderUtils -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt index 07b53d27a3..691eea0a2a 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersScreen.kt @@ -61,7 +61,7 @@ import com.mifos.core.designsystem.theme.LightGreen import com.mifos.core.designsystem.theme.White import com.mifos.core.designsystem.theme.identifierTextStyleDark import com.mifos.core.designsystem.theme.identifierTextStyleLight -import com.mifos.core.objects.noncore.Identifier +import com.mifos.core.objects.noncoreobjects.Identifier import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.client.R import com.mifos.feature.client.clientIdentifiersDialog.ClientIdentifiersDialogScreen diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt index 8bbc730aec..abfce9507f 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiers/ClientIdentifiersUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientIdentifiers -import com.mifos.core.objects.noncore.Identifier +import com.mifos.core.objects.noncoreobjects.Identifier /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt index f944faae08..aeadd26c41 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifierDialogUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientIdentifiersDialog -import com.mifos.core.objects.noncore.IdentifierTemplate +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt index 69010c3caf..4581d874a8 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogScreen.kt @@ -55,8 +55,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.noncore.IdentifierPayload -import com.mifos.core.objects.noncore.IdentifierTemplate +import com.mifos.core.objects.noncoreobjects.IdentifierPayload +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt index 1edd01be4d..55f8407b20 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientIdentifiersDialog/ClientIdentifiersDialogViewModel.kt @@ -14,8 +14,8 @@ import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.CreateClientIdentifierUseCase import com.mifos.core.domain.useCases.GetClientIdentifierTemplateUseCase -import com.mifos.core.objects.noncore.IdentifierPayload -import com.mifos.core.objects.noncore.IdentifierTemplate +import com.mifos.core.objects.noncoreobjects.IdentifierPayload +import com.mifos.core.objects.noncoreobjects.IdentifierTemplate import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt index 6c52a78c16..b2589a674d 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListScreen.kt @@ -79,7 +79,7 @@ import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client import com.mifos.feature.client.R import com.mifos.feature.client.syncClientDialog.SyncClientsDialogScreen diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListUiState.kt index f598870db3..35b4c0f4fb 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.client.clientList.presentation import androidx.paging.PagingData -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client import kotlinx.coroutines.flow.Flow /** diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt index 0c31033549..4f797336bd 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientList/presentation/ClientListViewModel.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.data.repository.ClientListRepository import com.mifos.core.datastore.PrefManager -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 dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt index c6e14e1484..fa2c2d89f5 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientPinpoint -import com.mifos.core.objects.client.ClientAddressResponse +import com.mifos.core.objects.clients.ClientAddressResponse /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt index 36cd6c5b40..88ef6a459a 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinPointClientViewModel.kt @@ -17,7 +17,7 @@ import com.mifos.core.domain.useCases.AddClientPinpointLocationUseCase import com.mifos.core.domain.useCases.DeleteClientAddressPinpointUseCase import com.mifos.core.domain.useCases.GetClientPinpointLocationsUseCase import com.mifos.core.domain.useCases.UpdateClientPinpointUseCase -import com.mifos.core.objects.client.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressRequest import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt index 86317eb45b..72c4feea0e 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientPinpoint/PinpointClientScreen.kt @@ -76,8 +76,8 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.client.ClientAddressRequest -import com.mifos.core.objects.client.ClientAddressResponse +import com.mifos.core.objects.clients.ClientAddressRequest +import com.mifos.core.objects.clients.ClientAddressResponse import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListScreen.kt index 8fc28eea85..5acbcc37d9 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListScreen.kt @@ -45,7 +45,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.Survey import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.client.R diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListUiState.kt index 563d4103ac..a695ae6800 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientSurveyList -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.Survey /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListViewModel.kt index ac96da6aca..363bdd420e 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyList/SurveyListViewModel.kt @@ -12,9 +12,9 @@ package com.mifos.feature.client.clientSurveyList import androidx.lifecycle.ViewModel import com.mifos.core.data.repository.SurveyListRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt index 8a4e091001..150980be93 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveyQuestion/SurveyQuestionScreen.kt @@ -66,9 +66,9 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.survey.Scorecard -import com.mifos.core.objects.survey.ScorecardValues -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.Survey +import com.mifos.core.objects.surveys.Scorecard +import com.mifos.core.objects.surveys.ScorecardValues import com.mifos.feature.client.R import com.mifos.feature.client.clientSurveySubmit.SurveySubmitScreen import com.mifos.feature.client.clientSurveySubmit.SurveySubmitUiState diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt index cd5f313557..6c1e3c127d 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitScreen.kt @@ -40,7 +40,7 @@ import androidx.compose.ui.unit.sp import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.survey.Scorecard +import com.mifos.core.objects.surveys.Scorecard import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt index cd065eb1d7..800856acec 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.clientSurveySubmit -import com.mifos.core.objects.survey.Scorecard +import com.mifos.core.objects.surveys.Scorecard /** * Created by Aditya Gupta on 13/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt index 567a64e5f2..af39cb3b53 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/clientSurveySubmit/SurveySubmitViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.SurveySubmitRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.objects.survey.Scorecard +import com.mifos.core.objects.surveys.Scorecard import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientScreen.kt index 8ad9346ae0..f92505028f 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientScreen.kt @@ -104,11 +104,11 @@ import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.noncore.DataTable -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.ClientPayload +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff +import com.mifos.core.entity.templates.clients.ClientsTemplate import com.mifos.feature.client.R import kotlinx.coroutines.launch import java.io.File diff --git a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientUiState.kt index 9681c3c5a3..369ea98c9d 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.client.createNewClient -import com.mifos.core.objects.templates.clients.ClientsTemplate +import com.mifos.core.entity.templates.clients.ClientsTemplate /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt index 25b54c67a0..298d5f6479 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/createNewClient/CreateNewClientViewModel.kt @@ -16,10 +16,10 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.data.repository.CreateNewClientRepository import com.mifos.core.domain.useCases.GetOfficeListUseCase import com.mifos.core.domain.useCases.GetStaffInOfficeForCreateNewClientUseCase -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.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.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/client/src/main/java/com/mifos/feature/client/navigation/ClientNavigation.kt b/feature/client/src/main/java/com/mifos/feature/client/navigation/ClientNavigation.kt index 79929d84cf..56461fda90 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/navigation/ClientNavigation.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/navigation/ClientNavigation.kt @@ -17,10 +17,10 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.noncore.DataTable -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.client.ClientPayload +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.entity.survey.Survey import com.mifos.feature.client.clientCharges.ClientChargesScreen import com.mifos.feature.client.clientDetails.ui.ClientDetailsScreen import com.mifos.feature.client.clientIdentifiers.ClientIdentifiersScreen diff --git a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogScreen.kt b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogScreen.kt index da4af9fd93..47d52660ec 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogScreen.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogScreen.kt @@ -38,7 +38,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.core.designsystem.component.MifosCircularProgress -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client import com.mifos.feature.client.R @Composable diff --git a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogUiState.kt b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogUiState.kt index cc9c2c4a0a..133e3bb8d5 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogUiState.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.client.syncClientDialog import androidx.compose.ui.graphics.vector.ImageVector -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt index 5b0959964b..c3bbc87d5d 100644 --- a/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt +++ b/feature/client/src/main/java/com/mifos/feature/client/syncClientDialog/SyncClientsDialogViewModel.kt @@ -16,11 +16,11 @@ import com.mifos.core.common.utils.NetworkUtilsWrapper import com.mifos.core.data.repository.SyncClientsDialogRepository import com.mifos.core.datastore.PrefManager import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.zipmodels.LoanAndLoanRepayment -import com.mifos.core.objects.zipmodels.SavingsAccountAndTransactionTemplate +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.zipmodels.LoanAndLoanRepayment +import com.mifos.core.entity.zipmodels.SavingsAccountAndTransactionTemplate import com.mifos.feature.client.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt index 4c8471eb12..adb3823234 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetScreen.kt @@ -58,15 +58,15 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -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.Group -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff +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.Group +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import com.mifos.feature.collection_sheet.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt index 7dc77e5b45..08bad202fd 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/generateCollectionSheet/GenerateCollectionSheetViewModel.kt @@ -22,15 +22,15 @@ import com.mifos.core.domain.useCases.GetOfficeListUseCase import com.mifos.core.domain.useCases.GetStaffInOfficeUseCase import com.mifos.core.domain.useCases.SubmitCollectionSheetUseCase import com.mifos.core.domain.useCases.SubmitProductiveSheetUseCase -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.Group -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff +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.Group +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff +import com.mifos.core.objects.collectionsheets.CollectionSheetRequestPayload import com.mifos.feature.collection_sheet.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheet/ui/IndividualCollectionSheetScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheet/ui/IndividualCollectionSheetScreen.kt index f4f087314e..3f616fc02e 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheet/ui/IndividualCollectionSheetScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheet/ui/IndividualCollectionSheetScreen.kt @@ -26,7 +26,7 @@ import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosTabRow import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.utility.TabContent -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.feature.collection_sheet.R import com.mifos.feature.individualCollectionSheet.newIndividualCollectionSheet.ui.NewIndividualCollectionSheetScreen import com.mifos.feature.individualCollectionSheet.savedIndividualCollectionSheet.ui.SavedIndividualCollectionSheetCompose diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt index f9482f0a73..6c9d8a5933 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsScreen.kt @@ -64,12 +64,12 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.LightGray import com.mifos.core.designsystem.theme.White +import com.mifos.core.entity.collectionsheet.ClientCollectionSheet +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.core.model.BulkRepaymentTransactions import com.mifos.core.network.model.IndividualCollectionSheetPayload -import com.mifos.core.objects.accounts.loan.PaymentTypeOptions -import com.mifos.core.objects.collectionsheet.ClientCollectionSheet -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.collectionsheet.LoanAndClientName +import com.mifos.core.objects.account.loan.PaymentTypeOptions +import com.mifos.core.objects.collectionsheets.LoanAndClientName import com.mifos.feature.collection_sheet.R @Composable diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt index b4de79f682..7121353437 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/individualCollectionSheetDetails/IndividualCollectionSheetDetailsViewModel.kt @@ -16,10 +16,10 @@ import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.SaveIndividualCollectionSheetUseCase +import com.mifos.core.entity.collectionsheet.ClientCollectionSheet +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.core.network.model.IndividualCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.ClientCollectionSheet -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.collectionsheet.LoanAndClientName +import com.mifos.core.objects.collectionsheets.LoanAndClientName import com.mifos.feature.collection_sheet.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt index 1761241827..601551fe04 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetNavigation.kt @@ -17,10 +17,10 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.core.network.model.IndividualCollectionSheetPayload -import com.mifos.core.objects.accounts.loan.PaymentTypeOptions -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.collectionsheet.LoanAndClientName +import com.mifos.core.objects.account.loan.PaymentTypeOptions +import com.mifos.core.objects.collectionsheets.LoanAndClientName import com.mifos.feature.individualCollectionSheet.generateCollectionSheet.GenerateCollectionSheetScreen import com.mifos.feature.individualCollectionSheet.individualCollectionSheet.ui.IndividualCollectionSheetScreen import com.mifos.feature.individualCollectionSheet.individualCollectionSheetDetails.IndividualCollectionSheetDetailsScreen diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetScreens.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetScreens.kt index 609bbf8186..815f218e6a 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetScreens.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/navigation/CollectionSheetScreens.kt @@ -11,7 +11,7 @@ package com.mifos.feature.individualCollectionSheet.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet /** * Created by Pronay Sarker on 20/08/2024 (4:11 PM) diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetScreen.kt index e8767ce52d..edae19caeb 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetScreen.kt @@ -62,10 +62,10 @@ import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff import com.mifos.core.network.model.RequestCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff import com.mifos.feature.collection_sheet.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetUiState.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetUiState.kt index 0cf18bed21..bf5bcec916 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetUiState.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetUiState.kt @@ -9,9 +9,9 @@ */ package com.mifos.feature.individualCollectionSheet.newIndividualCollectionSheet.ui -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.organisation.Staff +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet +import com.mifos.core.entity.organisation.Office +import com.mifos.core.entity.organisation.Staff /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetViewModel.kt index efc7561167..3e4e4c4dac 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/newIndividualCollectionSheet/ui/NewIndividualCollectionSheetViewModel.kt @@ -15,8 +15,8 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetIndividualCollectionSheetUseCase import com.mifos.core.domain.useCases.GetOfficeListUseCase import com.mifos.core.domain.useCases.GetStaffInOfficeUseCase +import com.mifos.core.entity.collectionsheet.IndividualCollectionSheet import com.mifos.core.network.model.RequestCollectionSheetPayload -import com.mifos.core.objects.collectionsheet.IndividualCollectionSheet import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt index f3c13a79ef..b1fb32aa9f 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsScreen.kt @@ -53,8 +53,8 @@ import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.model.BulkRepaymentTransactions import com.mifos.core.network.model.IndividualCollectionSheetPayload -import com.mifos.core.objects.accounts.loan.PaymentTypeOptions -import com.mifos.core.objects.collectionsheet.LoanAndClientName +import com.mifos.core.objects.account.loan.PaymentTypeOptions +import com.mifos.core.objects.collectionsheets.LoanAndClientName import com.mifos.feature.collection_sheet.R /** diff --git a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt index 8d10150489..6289828a4c 100644 --- a/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt +++ b/feature/collectionSheet/src/main/java/com/mifos/feature/individualCollectionSheet/paymentDetails/PaymentDetailsViewModel.kt @@ -17,8 +17,8 @@ import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.network.model.IndividualCollectionSheetPayload import com.mifos.core.network.utils.ImageLoaderUtils -import com.mifos.core.objects.accounts.loan.PaymentTypeOptions -import com.mifos.core.objects.collectionsheet.LoanAndClientName +import com.mifos.core.objects.account.loan.PaymentTypeOptions +import com.mifos.core.objects.collectionsheets.LoanAndClientName import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableScreen.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableScreen.kt index 7d631a0888..de7c6e65f6 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableScreen.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableScreen.kt @@ -46,7 +46,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.data_table.R diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableUiState.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableUiState.kt index dcf688bd0a..eab1a685ee 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableUiState.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.dataTable.dataTable -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/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt index 3d432fae07..7a74c9e2ae 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTable/DataTableViewModel.kt @@ -15,7 +15,7 @@ import androidx.lifecycle.viewModelScope import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.DataTableRepository -import com.mifos.core.objects.navigation.DataTableNavigationArg +import com.mifos.core.objects.nav.DataTableNavigationArg import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataScreen.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataScreen.kt index 4563f78ea2..e1119ef3ba 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataScreen.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataScreen.kt @@ -73,7 +73,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.dataTable.dataTableRowDialog.DataTableRowDialogScreen import com.mifos.feature.data_table.R diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataViewModel.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataViewModel.kt index 2337c309de..a851c8ba99 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataViewModel.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableData/DataTableDataViewModel.kt @@ -18,7 +18,7 @@ import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.DeleteDataTableEntryUseCase import com.mifos.core.domain.useCases.GetDataTableInfoUseCase -import com.mifos.core.objects.navigation.DataTableDataNavigationArg +import com.mifos.core.entity.navigation.DataTableDataNavigationArg import com.mifos.feature.data_table.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListNavArgs.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListNavArgs.kt index 1b24d4270c..fb6a8f9ae5 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListNavArgs.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListNavArgs.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.dataTable.dataTableList -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable data class DataTableListNavArgs( diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListScreen.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListScreen.kt index 6df875f310..215f49a60f 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListScreen.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListScreen.kt @@ -51,8 +51,8 @@ import com.mifos.core.designsystem.component.MifosOutlinedTextField import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.noncore.DataTable import com.mifos.feature.data_table.R import java.time.LocalDate import java.time.format.DateTimeFormatter diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListUiState.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListUiState.kt index d5034b1558..72be5f128b 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListUiState.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.dataTable.dataTableList -import com.mifos.core.objects.client.Client +import com.mifos.core.entity.client.Client /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListViewModel.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListViewModel.kt index b0ba91e380..6153caceac 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListViewModel.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableList/DataTableListViewModel.kt @@ -13,15 +13,15 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.data.GroupLoanPayload -import com.mifos.core.data.LoansPayload import com.mifos.core.data.repository.DataTableListRepository import com.mifos.core.datastore.PrefManager -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.objects.noncore.DataTable -import com.mifos.core.objects.noncore.DataTablePayload +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.entity.noncore.DataTable +import com.mifos.core.entity.noncore.DataTablePayload +import com.mifos.core.network.model.LoansPayload +import com.mifos.core.payloads.GroupLoanPayload import com.mifos.feature.data_table.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableRowDialog/DataTableRowDialogScreen.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableRowDialog/DataTableRowDialogScreen.kt index d376eeb787..15ae9a80ea 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableRowDialog/DataTableRowDialogScreen.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/dataTableRowDialog/DataTableRowDialogScreen.kt @@ -47,7 +47,7 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.noncore.DataTable import com.mifos.feature.data_table.R @Composable diff --git a/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt b/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt index 66ca1bcf13..dc9c41aa64 100644 --- a/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt +++ b/feature/data-table/src/main/java/com/mifos/feature/dataTable/navigation/DataTableNavigation.kt @@ -17,10 +17,10 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.navigation.DataTableDataNavigationArg -import com.mifos.core.objects.navigation.DataTableNavigationArg -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.navigation.DataTableDataNavigationArg +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.objects.nav.DataTableNavigationArg import com.mifos.feature.dataTable.dataTable.DataTableScreen import com.mifos.feature.dataTable.dataTableData.DataTableDataScreen import com.mifos.feature.dataTable.dataTableList.DataTableListNavArgs diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt b/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt index b08958dbdd..15f08eaf6c 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentDialog/DocumentDialogScreen.kt @@ -71,7 +71,7 @@ import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.White import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import com.mifos.feature.document.R import java.io.File diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt index df71ea0ba6..2215761506 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListScreen.kt @@ -71,7 +71,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.document.R import com.mifos.feature.document.documentDialog.DocumentDialogScreen diff --git a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt index 1c70d1f04b..0379c65abd 100644 --- a/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt +++ b/feature/document/src/main/java/com/mifos/feature/document/documentList/DocumentListUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.document.documentList -import com.mifos.core.objects.noncore.Document +import com.mifos.core.objects.noncoreobjects.Document /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/groups/src/androidTest/java/com/mifos/feature/groups/GroupListScreenTest.kt b/feature/groups/src/androidTest/java/com/mifos/feature/groups/GroupListScreenTest.kt index 2c4e036604..fa8c9d3a0d 100644 --- a/feature/groups/src/androidTest/java/com/mifos/feature/groups/GroupListScreenTest.kt +++ b/feature/groups/src/androidTest/java/com/mifos/feature/groups/GroupListScreenTest.kt @@ -41,7 +41,7 @@ import com.google.accompanist.swiperefresh.SwipeRefreshState import com.google.accompanist.swiperefresh.rememberSwipeRefreshState import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.domain.useCases.GroupsListPagingDataSource -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import com.mifos.core.testing.repository.TestGroupsListRepository import com.mifos.core.testing.repository.sampleGroups import com.mifos.feature.groups.groupList.GroupsListScreen diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt index 5a71c68ae2..5e6d778c73 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupScreen.kt @@ -71,9 +71,9 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -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 com.mifos.feature.groups.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt index 3b9bbe9f53..3adc218f5c 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.groups.createNewGroup -import com.mifos.core.objects.organisation.Office -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.organisation.Office +import com.mifos.core.objects.responses.SaveResponse /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupViewModel.kt b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupViewModel.kt index 3a25f0e319..3fa77afafb 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupViewModel.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/createNewGroup/CreateNewGroupViewModel.kt @@ -15,7 +15,7 @@ import com.mifos.core.common.utils.Resource import com.mifos.core.datastore.PrefManager import com.mifos.core.domain.useCases.CreateNewGroupUseCase import com.mifos.core.domain.useCases.GetGroupOfficesUseCase -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsScreen.kt b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsScreen.kt index ed143f7db7..a07e82fff7 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsScreen.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsScreen.kt @@ -81,11 +81,11 @@ import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.Group import com.mifos.feature.groups.R @Composable diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsUiState.kt b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsUiState.kt index 1021599f57..caf7135f8a 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsUiState.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.groups.groupDetails -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group /** * Created by Aditya Gupta on 06/08/23. diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsViewModel.kt b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsViewModel.kt index eb22f7467c..1792567897 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsViewModel.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/groupDetails/GroupDetailsViewModel.kt @@ -16,10 +16,10 @@ import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetGroupAssociateClientsUseCase import com.mifos.core.domain.useCases.GetGroupDetailsUseCase -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.Group import com.mifos.feature.groups.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/groupList/GroupsListScreen.kt b/feature/groups/src/main/java/com/mifos/feature/groups/groupList/GroupsListScreen.kt index 13056900b7..912f4963d6 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/groupList/GroupsListScreen.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/groupList/GroupsListScreen.kt @@ -77,7 +77,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group import com.mifos.core.testing.repository.sampleGroups import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.core.ui.components.MifosFAB diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt b/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt index 4b21e97ccb..b636fcca61 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/navigation/GroupNavGraph.kt @@ -17,9 +17,9 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.response.SaveResponse +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.client.Client +import com.mifos.core.objects.responses.SaveResponse import com.mifos.feature.groups.createNewGroup.CreateNewGroupScreen import com.mifos.feature.groups.groupDetails.GroupDetailsScreen import com.mifos.feature.groups.groupList.GroupsListRoute diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogUiState.kt b/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogUiState.kt index 02c9820c8e..c54f6c2d31 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogUiState.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogUiState.kt @@ -10,7 +10,7 @@ package com.mifos.feature.groups.syncGroupDialog import androidx.compose.ui.graphics.vector.ImageVector -import com.mifos.core.objects.group.Group +import com.mifos.core.entity.group.Group /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt b/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt index 535d7b40c9..83ee5f38e1 100644 --- a/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt +++ b/feature/groups/src/main/java/com/mifos/feature/groups/syncGroupDialog/SyncGroupsDialogViewModel.kt @@ -16,14 +16,14 @@ import com.mifos.core.common.utils.NetworkUtilsWrapper import com.mifos.core.data.repository.SyncGroupsDialogRepository import com.mifos.core.datastore.PrefManager import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.accounts.GroupAccounts -import com.mifos.core.objects.accounts.loan.LoanAccount -import com.mifos.core.objects.accounts.savings.SavingsAccount -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.group.Group -import com.mifos.core.objects.group.GroupWithAssociations -import com.mifos.core.objects.zipmodels.LoanAndLoanRepayment -import com.mifos.core.objects.zipmodels.SavingsAccountAndTransactionTemplate +import com.mifos.core.entity.accounts.GroupAccounts +import com.mifos.core.entity.accounts.loan.LoanAccount +import com.mifos.core.entity.accounts.savings.SavingsAccount +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.group.Group +import com.mifos.core.entity.group.GroupWithAssociations +import com.mifos.core.entity.zipmodels.LoanAndLoanRepayment +import com.mifos.core.entity.zipmodels.SavingsAccountAndTransactionTemplate import com.mifos.feature.groups.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt index 128e676fe0..022d58d569 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountScreen.kt @@ -58,7 +58,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.core.data.GroupLoanPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -68,8 +67,9 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.organisations.LoanProducts +import com.mifos.core.objects.template.loan.GroupLoanTemplate +import com.mifos.core.payloads.GroupLoanPayload import com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt index 24380ed5ad..5e9e763848 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.groupLoanAccount -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.template.loan.GroupLoanTemplate /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt index 6263cf2349..5b206b09ae 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/groupLoanAccount/GroupLoanAccountViewModel.kt @@ -14,12 +14,12 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource -import com.mifos.core.data.GroupLoanPayload import com.mifos.core.domain.useCases.CreateGroupLoansAccountUseCase import com.mifos.core.domain.useCases.GetAllLoanUseCase import com.mifos.core.domain.useCases.GetGroupLoansAccountTemplateUseCase -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.templates.loans.GroupLoanTemplate +import com.mifos.core.objects.organisations.LoanProducts +import com.mifos.core.objects.template.loan.GroupLoanTemplate +import com.mifos.core.payloads.GroupLoanPayload import com.mifos.feature.loan.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt index 6884f14c0e..d66e23f334 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountScreen.kt @@ -58,7 +58,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.core.data.LoansPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -68,9 +67,10 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.noncore.DataTable -import com.mifos.core.objects.organisation.LoanProducts -import com.mifos.core.objects.templates.loans.LoanTemplate +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.entity.templates.loans.LoanTemplate +import com.mifos.core.network.model.LoansPayload +import com.mifos.core.objects.organisations.LoanProducts import com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt index a17ca96a07..67a33b13fc 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanAccount -import com.mifos.core.objects.organisation.LoanProducts +import com.mifos.core.objects.organisations.LoanProducts /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountViewModel.kt index d1394ce294..f2306c40d9 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccount/LoanAccountViewModel.kt @@ -14,11 +14,11 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource -import com.mifos.core.data.LoansPayload import com.mifos.core.domain.useCases.CreateLoanAccountUseCase import com.mifos.core.domain.useCases.GetAllLoanUseCase import com.mifos.core.domain.useCases.GetLoansAccountTemplateUseCase -import com.mifos.core.objects.templates.loans.LoanTemplate +import com.mifos.core.entity.templates.loans.LoanTemplate +import com.mifos.core.network.model.LoansPayload import com.mifos.feature.loan.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryScreen.kt index fcc44817dc..edff01b1d8 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryScreen.kt @@ -67,9 +67,9 @@ import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Status -import com.mifos.core.objects.accounts.loan.Summary +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.Status +import com.mifos.core.entity.accounts.loan.Summary import com.mifos.feature.loan.R /** diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryUiState.kt index 067e7aead5..0ac262dddd 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanAccountSummary -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryViewModel.kt index 6350b14498..e28bcf9812 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanAccountSummary/LoanAccountSummaryViewModel.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanAccountSummaryRepository -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt index 3484fca683..58f82b4b92 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalScreen.kt @@ -59,9 +59,9 @@ import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.LoanApproval -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.objects.account.loan.LoanApproval import com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt index b0891abd9c..9a368053bc 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanApproval/LoanAccountApprovalViewModel.kt @@ -13,9 +13,9 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.google.gson.Gson import com.mifos.core.data.repository.LoanAccountApprovalRepository +import com.mifos.core.entity.accounts.loan.LoanApprovalData import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.LoanApproval -import com.mifos.core.objects.accounts.loan.LoanApprovalData +import com.mifos.core.objects.account.loan.LoanApproval import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeScreen.kt index 8964eb2ac6..aea1da1ce5 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeScreen.kt @@ -59,7 +59,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.loan.R import com.mifos.feature.loan.loanChargeDialog.LoanChargeDialogScreen diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeUiState.kt index ccdc2a1f38..5d67d4008f 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanCharge/LoanChargeUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanCharge -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/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogScreen.kt index a2d9501c22..8c1d01e5e8 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogScreen.kt @@ -58,7 +58,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.mifos.core.data.ChargesPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -67,7 +66,8 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges +import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogUiState.kt index 30a10c4493..b50d55ddd3 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanChargeDialog -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogViewModel.kt index d8afc41deb..3d7bb24b2a 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanChargeDialog/LoanChargeDialogViewModel.kt @@ -12,10 +12,10 @@ package com.mifos.feature.loan.loanChargeDialog import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Resource -import com.mifos.core.data.ChargesPayload import com.mifos.core.domain.useCases.CreateLoanChargesUseCase import com.mifos.core.domain.useCases.GetAllChargesV3UseCase -import com.mifos.core.objects.client.Charges +import com.mifos.core.entity.client.Charges +import com.mifos.core.payloads.ChargesPayload import com.mifos.feature.loan.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt index 87236bb919..6b092eacdd 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementScreen.kt @@ -61,9 +61,9 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.loan.LoanDisbursement -import com.mifos.core.objects.templates.loans.LoanTransactionTemplate +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate +import com.mifos.core.objects.account.loan.LoanDisbursement import com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementUiState.kt index 2b1fe3eb54..bf4b3dec15 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.loan.loanDisbursement +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.templates.loans.LoanTransactionTemplate /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt index 3d413ab3b9..99c819ce55 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanDisbursement/LoanAccountDisbursementViewModel.kt @@ -13,10 +13,10 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanAccountDisbursementRepository +import com.mifos.core.entity.templates.loans.LoanTransactionTemplate import com.mifos.core.model.APIEndPoint 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 dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt index d413b6a282..a6a84e4964 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentScreen.kt @@ -69,10 +69,10 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.PaymentTypeOption -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.PaymentTypeOption +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 com.mifos.feature.loan.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt index dfe009e22f..ff53b92514 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.loan.loanRepayment -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.objects.account.loan.LoanRepaymentResponse /** * Created by Aditya Gupta on 10/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt index ed53a40635..28a9235658 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepayment/LoanRepaymentViewModel.kt @@ -15,10 +15,10 @@ import androidx.lifecycle.ViewModel import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanRepaymentRepository -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.templates.loans.LoanRepaymentTemplate +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.templates.loans.LoanRepaymentTemplate +import com.mifos.core.objects.account.loan.LoanRepaymentResponse import com.mifos.feature.loan.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt index e7fbd3632f..ebbc46ff36 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleScreen.kt @@ -45,9 +45,9 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Period -import com.mifos.core.objects.accounts.loan.RepaymentSchedule +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.objects.account.loan.Period +import com.mifos.core.objects.account.loan.RepaymentSchedule import com.mifos.feature.loan.R /** diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleUiState.kt index da3799937e..3a37298e11 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanRepaymentSchedule -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations /** * Created by Aditya Gupta on 12/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleViewModel.kt index 3fbd33d4ba..ae3ae27c53 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanRepaymentSchedule/LoanRepaymentScheduleViewModel.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanRepaymentScheduleRepository -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt index 02e45a2c9c..3cb2461a39 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsScreen.kt @@ -64,9 +64,9 @@ import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.accounts.loan.Transaction -import com.mifos.core.objects.accounts.loan.Type +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.objects.account.loan.Transaction +import com.mifos.core.objects.account.loan.Type import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.loan.R diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsUiState.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsUiState.kt index fc227e1bbf..39dcd8956c 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsUiState.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.loan.loanTransaction -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations /** * Created by Aditya Gupta on 12/08/23. diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsViewModel.kt b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsViewModel.kt index bffe031356..2295228af8 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsViewModel.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/loanTransaction/LoanTransactionsViewModel.kt @@ -13,7 +13,7 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.Constants import com.mifos.core.data.repository.LoanTransactionsRepository -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanWithAssociations import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanNavigation.kt b/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanNavigation.kt index 57076b21da..71791c0b04 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanNavigation.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanNavigation.kt @@ -16,9 +16,9 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.data.LoansPayload -import com.mifos.core.objects.accounts.loan.LoanWithAssociations -import com.mifos.core.objects.noncore.DataTable +import com.mifos.core.entity.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.noncore.DataTable +import com.mifos.core.network.model.LoansPayload import com.mifos.feature.loan.groupLoanAccount.GroupLoanAccountScreen import com.mifos.feature.loan.loanAccount.LoanAccountScreen import com.mifos.feature.loan.loanAccountSummary.LoanAccountSummaryScreen diff --git a/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanScreens.kt b/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanScreens.kt index 8773d45fe5..911b5de456 100644 --- a/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanScreens.kt +++ b/feature/loan/src/main/java/com/mifos/feature/loan/navigation/LoanScreens.kt @@ -11,8 +11,8 @@ package com.mifos.feature.loan.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.accounts.loan.LoanApprovalData -import com.mifos.core.objects.accounts.loan.LoanWithAssociations +import com.mifos.core.entity.accounts.loan.LoanApprovalData +import com.mifos.core.entity.accounts.loan.LoanWithAssociations /** * Created by Pronay Sarker on 16/08/2024 (2:25 AM) diff --git a/feature/note/src/main/java/com/mifos/feature/note/NoteScreen.kt b/feature/note/src/main/java/com/mifos/feature/note/NoteScreen.kt index 88504adcd5..0562bcc9c8 100644 --- a/feature/note/src/main/java/com/mifos/feature/note/NoteScreen.kt +++ b/feature/note/src/main/java/com/mifos/feature/note/NoteScreen.kt @@ -46,7 +46,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.noncore.Note +import com.mifos.core.entity.noncore.Note import com.mifos.core.ui.components.MifosEmptyUi @Composable diff --git a/feature/note/src/main/java/com/mifos/feature/note/NoteUiState.kt b/feature/note/src/main/java/com/mifos/feature/note/NoteUiState.kt index 9d6d2ef76d..03f6f259af 100644 --- a/feature/note/src/main/java/com/mifos/feature/note/NoteUiState.kt +++ b/feature/note/src/main/java/com/mifos/feature/note/NoteUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.note -import com.mifos.core.objects.noncore.Note +import com.mifos.core.entity.noncore.Note /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/dashboard/OfflineDashboardViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/dashboard/OfflineDashboardViewModel.kt index 01bf44fb13..5dd1f97946 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/dashboard/OfflineDashboardViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/dashboard/OfflineDashboardViewModel.kt @@ -11,12 +11,12 @@ package com.mifos.feature.offline.dashboard import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.mifos.core.data.CenterPayload import com.mifos.core.data.repository.OfflineDashboardRepository -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.client.ClientPayload -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +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.entity.group.GroupPayload import com.mifos.feature.offline.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsScreen.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsScreen.kt index a07a3790e1..72be602c85 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsScreen.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsScreen.kt @@ -46,10 +46,10 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.core.common.utils.Network -import com.mifos.core.data.CenterPayload import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.component.MifosSweetError import com.mifos.core.designsystem.icon.MifosIcons +import com.mifos.core.entity.center.CenterPayload import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.offline.R diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsUiState.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsUiState.kt index 9d9565be1b..b4723f445e 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsUiState.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.offline.syncCenterPayloads -import com.mifos.core.data.CenterPayload +import com.mifos.core.entity.center.CenterPayload /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsViewModel.kt index 1c5af1c95e..e0616528b6 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncCenterPayloads/SyncCenterPayloadsViewModel.kt @@ -14,12 +14,12 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.FileUtils.LOG_TAG import com.mifos.core.common.utils.Resource -import com.mifos.core.data.CenterPayload import com.mifos.core.datastore.PrefManager import com.mifos.core.domain.useCases.AllDatabaseCenterPayloadUseCase import com.mifos.core.domain.useCases.CreateCenterUseCase import com.mifos.core.domain.useCases.DeleteAndUpdateCenterPayloadsUseCase import com.mifos.core.domain.useCases.UpdateCenterPayloadUseCase +import com.mifos.core.entity.center.CenterPayload import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsScreen.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsScreen.kt index f871d9f075..85d045017f 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsScreen.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsScreen.kt @@ -54,7 +54,7 @@ import com.mifos.core.common.utils.Network import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.client.ClientPayload +import com.mifos.core.entity.client.ClientPayload import com.mifos.feature.offline.R @Composable diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsUiState.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsUiState.kt index a5c3b7c256..dd890f3758 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsUiState.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.offline.syncClientPayloads -import com.mifos.core.objects.client.ClientPayload +import com.mifos.core.entity.client.ClientPayload /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsViewModel.kt index df6bf95fa3..a1ca045b5c 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncClientPayloads/SyncClientPayloadsViewModel.kt @@ -14,8 +14,8 @@ import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.FileUtils.LOG_TAG import com.mifos.core.data.repository.SyncClientPayloadsRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.objects.client.Client -import com.mifos.core.objects.client.ClientPayload +import com.mifos.core.entity.client.Client +import com.mifos.core.entity.client.ClientPayload import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsScreenRoute.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsScreenRoute.kt index ccbf18eed7..c952f25cfc 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsScreenRoute.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsScreenRoute.kt @@ -49,7 +49,7 @@ import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosErrorContent import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import com.mifos.feature.offline.R @Composable diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsUiState.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsUiState.kt index f0c8ab8fd8..f41bb4aec4 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsUiState.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.offline.syncGroupPayloads -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import com.mifos.feature.offline.R /** diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsViewModel.kt index 7fda1710b4..763c05a652 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncGroupPayloads/SyncGroupPayloadsViewModel.kt @@ -17,7 +17,7 @@ import com.mifos.core.domain.useCases.AllDatabaseGroupPayloadUseCase import com.mifos.core.domain.useCases.CreateGroupUseCase import com.mifos.core.domain.useCases.DeleteAndUpdateGroupPayloadUseCase import com.mifos.core.domain.useCases.UpdateGroupPayloadUseCase -import com.mifos.core.objects.group.GroupPayload +import com.mifos.core.entity.group.GroupPayload import com.mifos.feature.offline.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionScreen.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionScreen.kt index 3ef1481930..108e92db1d 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionScreen.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionScreen.kt @@ -59,8 +59,8 @@ import com.mifos.core.common.utils.Network import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest import com.mifos.feature.offline.R import com.mifos.feature.offline.syncSavingsAccountTransaction.getPaymentTypeName diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionUiState.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionUiState.kt index 431b57915b..476cf97482 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionUiState.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.offline.syncLoanRepaymentTransaction -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest /** * Created by Aditya Gupta on 16/08/23. diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt index 428183a49a..3ecb57e00e 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncLoanRepaymentTransaction/SyncLoanRepaymentTransactionViewModel.kt @@ -12,12 +12,12 @@ package com.mifos.feature.offline.syncLoanRepaymentTransaction import android.util.Log import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.FileUtils.LOG_TAG -import com.mifos.core.data.CenterPayload_Table.errorMessage import com.mifos.core.data.repository.SyncLoanRepaymentTransactionRepository import com.mifos.core.datastore.PrefManager -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest -import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.loan.LoanRepaymentRequest +import com.mifos.core.entity.center.CenterPayload_Table.errorMessage +import com.mifos.core.objects.account.loan.LoanRepaymentResponse import com.mifos.feature.offline.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionScreen.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionScreen.kt index a5502c22e4..1a1c7fb8a3 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionScreen.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionScreen.kt @@ -57,8 +57,8 @@ import com.mifos.core.common.utils.Network import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosScaffold import com.mifos.core.designsystem.icon.MifosIcons -import com.mifos.core.objects.PaymentTypeOption -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.PaymentTypeOption +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.offline.R diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionUiState.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionUiState.kt index 3b86b62468..9ba0565bcd 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionUiState.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.offline.syncSavingsAccountTransaction -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest /** * Created by Aditya Gupta on 16/08/23. @@ -21,7 +21,7 @@ sealed class SyncSavingsAccountTransactionUiState { data class ShowSavingsAccountTransactions( val savingsList: MutableList, - val paymentTypeOptions: List, + val paymentTypeOptions: List, ) : SyncSavingsAccountTransactionUiState() diff --git a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionViewModel.kt b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionViewModel.kt index b44421101d..1e7dbbfbde 100644 --- a/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionViewModel.kt +++ b/feature/offline/src/main/java/com/mifos/feature/offline/syncSavingsAccountTransaction/SyncSavingsAccountTransactionViewModel.kt @@ -18,7 +18,7 @@ import com.mifos.core.domain.useCases.DeleteAndUpdateTransactionsUseCase import com.mifos.core.domain.useCases.PaymentTypeOptionUseCase import com.mifos.core.domain.useCases.ProcessTransactionUseCase import com.mifos.core.domain.useCases.UpdateLoanRepaymentTransactionUseCase -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest import com.mifos.feature.offline.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers @@ -47,7 +47,7 @@ class SyncSavingsAccountTransactionViewModel @Inject constructor( val syncSavingsAccountTransactionUiState: StateFlow get() = _syncSavingsAccountTransactionUiState - private var mPaymentTypeOptions: List = emptyList() + private var mPaymentTypeOptions: List = emptyList() private val _isRefreshing = MutableStateFlow(false) val isRefreshing = _isRefreshing.asStateFlow() diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt index 928add5654..41a4d77176 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingScreen.kt @@ -78,8 +78,8 @@ import com.mifos.core.designsystem.component.PermissionBox import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.user.UserLatLng -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLatLng +import com.mifos.core.objects.users.UserLocation import com.mifos.feature.path.tracking.R @Composable diff --git a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt index a085b68f1d..01dc8b9127 100644 --- a/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt +++ b/feature/path-tracking/src/main/java/com/mifos/feature/pathTracking/PathTrackingUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.pathTracking -import com.mifos.core.objects.user.UserLocation +import com.mifos.core.objects.users.UserLocation /** * Created by Aditya Gupta on 06/08/23. diff --git a/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt b/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt index 5c56fcd181..df79e88e66 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/navigation/ReportNavigation.kt @@ -17,8 +17,8 @@ import androidx.navigation.navArgument import androidx.navigation.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.runreports.FullParameterListResponse -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.FullParameterListResponse +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import com.mifos.feature.report.report.ReportScreen import com.mifos.feature.report.reportDetail.ReportDetailScreen import com.mifos.feature.report.runReport.RunReportScreen diff --git a/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt index 6f745adecd..b15c5237f2 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/report/ReportScreen.kt @@ -47,7 +47,7 @@ import com.mifos.core.designsystem.component.PermissionBox import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import com.mifos.feature.report.R import kotlinx.coroutines.launch diff --git a/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt b/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt index 59ddd102c9..73bded8d3a 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/report/ReportViewModel.kt @@ -14,7 +14,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.runreports.FullParameterListResponse +import com.mifos.core.objects.runreport.FullParameterListResponse import com.mifos.feature.report.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt index e8bf798c85..46aa160920 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailScreen.kt @@ -64,9 +64,9 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.runreports.DataRow -import com.mifos.core.objects.runreports.FullParameterListResponse -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.DataRow +import com.mifos.core.objects.runreport.FullParameterListResponse +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R @Composable diff --git a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt index 5f17fd2c4c..94333199d0 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/reportDetail/ReportDetailViewModel.kt @@ -20,9 +20,9 @@ import com.mifos.core.domain.useCases.GetReportParameterDetailsUseCase import com.mifos.core.domain.useCases.GetRunReportOfficesUseCase import com.mifos.core.domain.useCases.GetRunReportProductUseCase import com.mifos.core.domain.useCases.GetRunReportWithQueryUseCase -import com.mifos.core.objects.runreports.DataRow -import com.mifos.core.objects.runreports.FullParameterListResponse -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.DataRow +import com.mifos.core.objects.runreport.FullParameterListResponse +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt index 89315132c6..2bf0cb3707 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportScreen.kt @@ -66,7 +66,7 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BlueSecondary import com.mifos.core.designsystem.theme.DarkGray import com.mifos.core.designsystem.theme.White -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.client.ClientReportTypeItem import com.mifos.feature.report.R @Composable diff --git a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt index e728b4a44b..ea2f617c03 100644 --- a/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt +++ b/feature/report/src/main/java/com/mifos/feature/report/runReport/RunReportUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.report.runReport -import com.mifos.core.objects.runreports.client.ClientReportTypeItem +import com.mifos.core.objects.runreport.client.ClientReportTypeItem sealed class RunReportUiState { diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsNavigation.kt b/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsNavigation.kt index af3cf36ab1..9986012950 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsNavigation.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsNavigation.kt @@ -16,8 +16,8 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import androidx.navigation.navigation import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations import com.mifos.feature.savings.savingsAccount.SavingsAccountScreen import com.mifos.feature.savings.savingsAccountActivate.SavingsAccountActivateScreen import com.mifos.feature.savings.savingsAccountApproval.SavingsAccountApprovalScreen diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsScreens.kt b/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsScreens.kt index de5e9db822..3a061b51bc 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsScreens.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/navigation/SavingsScreens.kt @@ -11,10 +11,10 @@ package com.mifos.feature.savings.navigation import com.google.gson.Gson import com.mifos.core.common.utils.Constants -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsSummaryData -import com.mifos.core.objects.accounts.savings.SavingsTransactionData +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsSummaryData +import com.mifos.core.entity.accounts.savings.SavingsTransactionData /** * Created by Pronay Sarker on 14/08/2024 (1:11 PM) diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountUiState.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountUiState.kt index a76a0c1653..f3ba6a9bd1 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountUiState.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.savings.savingsAccount -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.zipmodels.SavingProductsAndTemplate +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.zipmodels.SavingProductsAndTemplate /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountViewModel.kt index 98a56fec35..eb16ec9e40 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingAccountViewModel.kt @@ -14,12 +14,12 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource -import com.mifos.core.data.SavingsPayload import com.mifos.core.domain.useCases.CreateSavingsAccountUseCase import com.mifos.core.domain.useCases.GetClientSavingsAccountTemplateByProductUseCase import com.mifos.core.domain.useCases.GetGroupSavingsAccountTemplateByProductUseCase import com.mifos.core.domain.useCases.LoadSavingsAccountsAndTemplateUseCase -import com.mifos.core.objects.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.payloads.SavingsPayload import com.mifos.feature.savings.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt index cc6973c32c..40e41e7de7 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccount/SavingsAccountScreen.kt @@ -63,7 +63,6 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mifos.core.common.utils.Network -import com.mifos.core.data.SavingsPayload import com.mifos.core.designsystem.component.MifosCircularProgress import com.mifos.core.designsystem.component.MifosDatePickerTextField import com.mifos.core.designsystem.component.MifosOutlinedTextField @@ -73,11 +72,12 @@ import com.mifos.core.designsystem.component.MifosTextFieldDropdown import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark -import com.mifos.core.objects.accounts.savings.FieldOfficerOptions -import com.mifos.core.objects.client.Savings -import com.mifos.core.objects.organisation.ProductSavings -import com.mifos.core.objects.templates.savings.SavingProductsTemplate -import com.mifos.core.objects.zipmodels.SavingProductsAndTemplate +import com.mifos.core.entity.client.Savings +import com.mifos.core.entity.templates.savings.SavingProductsTemplate +import com.mifos.core.entity.zipmodels.SavingProductsAndTemplate +import com.mifos.core.objects.account.saving.FieldOfficerOptions +import com.mifos.core.objects.organisations.ProductSavings +import com.mifos.core.payloads.SavingsPayload import com.mifos.feature.savings.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt index ebc00897e5..b0e14687f8 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalScreen.kt @@ -58,7 +58,7 @@ import com.mifos.core.designsystem.icon.MifosIcons import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval +import com.mifos.core.objects.account.loan.SavingsApproval import com.mifos.feature.savings.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt index 9155a61aa0..57a2b22877 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountApproval/SavingsAccountApprovalViewModel.kt @@ -16,7 +16,7 @@ import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.ApproveSavingsApplicationUseCase import com.mifos.core.network.GenericResponse -import com.mifos.core.objects.accounts.loan.SavingsApproval +import com.mifos.core.objects.account.loan.SavingsApproval import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryScreen.kt index fbfc9168ce..0e0fbca94c 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryScreen.kt @@ -68,13 +68,13 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.accounts.savings.Currency -import com.mifos.core.objects.accounts.savings.DepositType -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.accounts.savings.Status -import com.mifos.core.objects.accounts.savings.Summary -import com.mifos.core.objects.accounts.savings.Transaction -import com.mifos.core.objects.accounts.savings.TransactionType +import com.mifos.core.entity.accounts.savings.Currency +import com.mifos.core.entity.accounts.savings.DepositType +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.Status +import com.mifos.core.entity.accounts.savings.Summary +import com.mifos.core.entity.accounts.savings.Transaction +import com.mifos.core.entity.accounts.savings.TransactionType import com.mifos.core.ui.components.MifosEmptyUi import com.mifos.feature.savings.R diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryUiState.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryUiState.kt index 1812979b82..b06865203d 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryUiState.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryUiState.kt @@ -9,7 +9,7 @@ */ package com.mifos.feature.savings.savingsAccountSummary -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations /** * Created by Aditya Gupta on 08/08/23. diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryViewModel.kt index 490a661bd0..0904e67a47 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountSummary/SavingsAccountSummaryViewModel.kt @@ -16,8 +16,8 @@ import com.google.gson.Gson import com.mifos.core.common.utils.Constants import com.mifos.core.common.utils.Resource import com.mifos.core.domain.useCases.GetSavingsAccountUseCase -import com.mifos.core.objects.accounts.savings.SavingsAccountWithAssociations -import com.mifos.core.objects.accounts.savings.SavingsSummaryData +import com.mifos.core.entity.accounts.savings.SavingsAccountWithAssociations +import com.mifos.core.entity.accounts.savings.SavingsSummaryData import com.mifos.feature.savings.R import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt index 8bb54cd9dc..293fcb0047 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionScreen.kt @@ -70,9 +70,9 @@ import com.mifos.core.designsystem.theme.Black import com.mifos.core.designsystem.theme.BluePrimary import com.mifos.core.designsystem.theme.BluePrimaryDark import com.mifos.core.designsystem.theme.DarkGray -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import com.mifos.feature.savings.R import java.text.SimpleDateFormat import java.util.Locale diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt index 4c86a3a5ab..e85c5783e5 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionUiState.kt @@ -9,8 +9,8 @@ */ package com.mifos.feature.savings.savingsAccountTransaction -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse /** * Created by Aditya Gupta on 13/08/23. diff --git a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt index c3aa674658..4cbe92dec3 100644 --- a/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt +++ b/feature/savings/src/main/java/com/mifos/feature/savings/savingsAccountTransaction/SavingsAccountTransactionViewModel.kt @@ -19,10 +19,10 @@ import com.mifos.core.datastore.PrefManager import com.mifos.core.domain.useCases.GetSavingsAccountTransactionTemplateUseCase import com.mifos.core.domain.useCases.GetSavingsAccountTransactionUseCase import com.mifos.core.domain.useCases.ProcessTransactionUseCase -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest -import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse -import com.mifos.core.objects.accounts.savings.SavingsTransactionData -import com.mifos.core.objects.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.entity.accounts.savings.SavingsAccountTransactionRequest +import com.mifos.core.entity.accounts.savings.SavingsTransactionData +import com.mifos.core.entity.templates.savings.SavingsAccountTransactionTemplate +import com.mifos.core.objects.account.saving.SavingsAccountTransactionResponse import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepository.kt b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepository.kt index 2ea363d83f..7f70f05c52 100644 --- a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepository.kt +++ b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepository.kt @@ -9,9 +9,9 @@ */ package com.mifos.feature.settings.syncSurvey -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import rx.Observable interface SyncSurveysDialogRepository { diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepositoryImp.kt b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepositoryImp.kt index 73789b3960..4eb92b6ca4 100644 --- a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepositoryImp.kt +++ b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogRepositoryImp.kt @@ -9,10 +9,10 @@ */ package com.mifos.feature.settings.syncSurvey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import com.mifos.core.network.datamanager.DataManagerSurveys -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey import rx.Observable import javax.inject.Inject diff --git a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogViewModel.kt b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogViewModel.kt index d1fa6a3555..c09abf11a1 100644 --- a/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogViewModel.kt +++ b/feature/settings/src/main/java/com/mifos/feature/settings/syncSurvey/SyncSurveysDialogViewModel.kt @@ -11,9 +11,9 @@ package com.mifos.feature.settings.syncSurvey import androidx.lifecycle.ViewModel import com.mifos.core.common.utils.NetworkUtilsWrapper -import com.mifos.core.objects.survey.QuestionDatas -import com.mifos.core.objects.survey.ResponseDatas -import com.mifos.core.objects.survey.Survey +import com.mifos.core.entity.survey.QuestionDatas +import com.mifos.core.entity.survey.ResponseDatas +import com.mifos.core.entity.survey.Survey import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow