Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jan 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5aa7a1c
initial refactoring
Darkeye14 Dec 27, 2024
60736c7
MIFOSAC-321
Darkeye14 Dec 27, 2024
e6b9364
applying spotless and detekt MIFOSAC-321
Darkeye14 Dec 27, 2024
7c23978
renaming modelObject package to just Object MIFOSAC-321
Darkeye14 Dec 28, 2024
8b20be8
changing the package names
Darkeye14 Dec 28, 2024
4d59234
Merge branch 'master' into model-refactor-from-db
Darkeye14 Jan 4, 2025
1168f51
renaming dbobjects to entity
Darkeye14 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/pagingSource/CenterListPagingSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ package com.mifos.core.data.pagingSource

import androidx.paging.PagingSource
import androidx.paging.PagingState
import com.mifos.core.modelobjects.clients.Page
Darkeye14 marked this conversation as resolved.
Show resolved Hide resolved
import com.mifos.core.network.datamanager.DataManagerCenter
import com.mifos.core.objects.client.Page
import com.mifos.core.objects.group.Center
import rx.Subscriber
import rx.android.schedulers.AndroidSchedulers
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/pagingSource/ClientChargesPagingSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ package com.mifos.core.data.pagingSource

import androidx.paging.PagingSource
import androidx.paging.PagingState
import com.mifos.core.modelobjects.clients.Page
import com.mifos.core.network.datamanager.DataManagerCharge
import com.mifos.core.objects.client.Charges
import com.mifos.core.objects.client.Page
import kotlinx.coroutines.suspendCancellableCoroutine
import rx.Subscriber
import rx.android.schedulers.AndroidSchedulers
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/pagingSource/ClientListPagingSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ package com.mifos.core.data.pagingSource

import androidx.paging.PagingSource
import androidx.paging.PagingState
import com.mifos.core.modelobjects.clients.Page
import com.mifos.core.network.datamanager.DataManagerClient
import com.mifos.core.objects.client.Client
import com.mifos.core.objects.client.Page
import rx.Subscriber
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/ActivateRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.clients.ActivatePayload
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.client.ActivatePayload
import org.openapitools.client.models.PostCentersCenterIdResponse
import org.openapitools.client.models.PostClientsClientIdResponse
import rx.Observable
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/CenterDetailsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.group.CenterInfo
import com.mifos.core.modelobjects.groups.CenterInfo
import com.mifos.core.objects.group.CenterWithAssociations
import kotlinx.coroutines.flow.Flow

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/CenterListRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package com.mifos.core.data.repository

import androidx.paging.PagingData
import com.mifos.core.objects.client.Page
import com.mifos.core.modelobjects.clients.Page
import com.mifos.core.objects.group.Center
import com.mifos.core.objects.group.CenterWithAssociations
import kotlinx.coroutines.flow.Flow
Expand Down
6 changes: 3 additions & 3 deletions core/data/src/main/java/com/mifos/core/data/repository/ChargeDialogRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.modelobjects.clients.ChargeCreationResponse
import com.mifos.core.modelobjects.template.client.ChargeTemplate
import com.mifos.core.payloads.ChargesPayload

/**
* Created by Aditya Gupta on 13/08/23.
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.checkerinboxtask.CheckerInboxSearchTemplate
import com.mifos.core.modelobjects.checkerinboxtask.CheckerTask
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.checkerinboxandtasks.CheckerInboxSearchTemplate
import com.mifos.core.objects.checkerinboxandtasks.CheckerTask

interface CheckerInboxRepository {

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/CheckerInboxTasksRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.modelobjects.checkerinboxtask.CheckerTask
import com.mifos.core.modelobjects.checkerinboxtask.RescheduleLoansTask
import kotlinx.coroutines.flow.Flow

/**
Expand Down
6 changes: 3 additions & 3 deletions core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifierDialogRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.modelobjects.noncoreobjects.IdentifierCreationResponse
import com.mifos.core.modelobjects.noncoreobjects.IdentifierPayload
import com.mifos.core.modelobjects.noncoreobjects.IdentifierTemplate

/**
* Created by Aditya Gupta on 16/08/23.
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/ClientIdentifiersRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.noncore.Identifier
import com.mifos.core.modelobjects.noncoreobjects.Identifier
import org.openapitools.client.models.DeleteClientsClientIdIdentifiersIdentifierIdResponse

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/ClientListRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
package com.mifos.core.data.repository

import androidx.paging.PagingData
import com.mifos.core.modelobjects.clients.Page
import com.mifos.core.objects.client.Client
import com.mifos.core.objects.client.Page
import kotlinx.coroutines.flow.Flow
import rx.Observable

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/CreateNewCenterRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package com.mifos.core.data.repository

import com.mifos.core.data.CenterPayload
import com.mifos.core.objects.response.SaveResponse
import com.mifos.core.modelobjects.responses.SaveResponse
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/CreateNewGroupRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.responses.SaveResponse
import com.mifos.core.objects.group.GroupPayload
import com.mifos.core.objects.organisation.Office
import com.mifos.core.objects.response.SaveResponse
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/DataTableListRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.payloads.GroupLoanPayload
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/DocumentListRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.noncoreobjects.Document
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.noncore.Document
import okhttp3.ResponseBody

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/GenerateCollectionSheetRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.collectionsheets.CollectionSheetRequestPayload
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
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/GroupLoanAccountRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.data.GroupLoanPayload
import com.mifos.core.modelobjects.template.loan.GroupLoanTemplate
import com.mifos.core.objects.accounts.loan.Loans
import com.mifos.core.objects.templates.loans.GroupLoanTemplate
import com.mifos.core.payloads.GroupLoanPayload
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/LoanAccountApprovalRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.loan.LoanApproval
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.accounts.loan.LoanApproval
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/LoanAccountDisbursementRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.loan.LoanDisbursement
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.accounts.loan.LoanDisbursement
import com.mifos.core.objects.templates.loans.LoanTransactionTemplate
import rx.Observable

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/LoanAccountRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
package com.mifos.core.data.repository

import com.mifos.core.data.LoansPayload
import com.mifos.core.modelobjects.organisations.LoanProducts
import com.mifos.core.objects.accounts.loan.Loans
import com.mifos.core.objects.organisation.LoanProducts
import com.mifos.core.objects.templates.loans.LoanTemplate
import rx.Observable

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/LoanChargeDialogRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.modelobjects.clients.ChargeCreationResponse
import com.mifos.core.payloads.ChargesPayload
import okhttp3.ResponseBody

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/LoanRepaymentRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse
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 rx.Observable

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/PathTrackingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.user.UserLocation
import com.mifos.core.modelobjects.users.UserLocation

/**
* Created by Aditya Gupta on 06/08/23.
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/PinPointClientRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.clients.ClientAddressRequest
import com.mifos.core.modelobjects.clients.ClientAddressResponse
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.client.ClientAddressRequest
import com.mifos.core.objects.client.ClientAddressResponse

/**
* Created by Aditya Gupta on 08/08/23.
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/ReportCategoryRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.runreports.client.ClientReportTypeItem
import com.mifos.core.modelobjects.runreport.client.ClientReportTypeItem

/**
* Created by Aditya Gupta on 12/08/23.
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/ReportDetailRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.runreports.FullParameterListResponse
import com.mifos.core.modelobjects.runreport.FullParameterListResponse

/**
* Created by Aditya Gupta on 12/08/23.
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountApprovalRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.loan.SavingsApproval
import com.mifos.core.network.GenericResponse
import com.mifos.core.objects.accounts.loan.SavingsApproval
import rx.Observable

/**
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/mifos/core/data/repository/SavingsAccountRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.data.SavingsPayload
import com.mifos.core.modelobjects.organisations.ProductSavings
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.payloads.SavingsPayload
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion .../data/src/main/java/com/mifos/core/data/repository/SavingsAccountTransactionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse
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 rx.Observable

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/SearchRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.SearchedEntity
import com.mifos.core.modelobjects.SearchedEntity
import kotlinx.coroutines.flow.Flow

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/SurveySubmitRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.objects.survey.Scorecard
import com.mifos.core.modelobjects.surveys.Scorecard
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/SyncCenterPayloadsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package com.mifos.core.data.repository

import com.mifos.core.data.CenterPayload
import com.mifos.core.objects.response.SaveResponse
import com.mifos.core.modelobjects.responses.SaveResponse
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repository/SyncGroupPayloadsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.responses.SaveResponse
import com.mifos.core.objects.group.GroupPayload
import com.mifos.core.objects.response.SaveResponse
import rx.Observable

interface SyncGroupPayloadsRepository {
Expand Down
2 changes: 1 addition & 1 deletion ...ta/src/main/java/com/mifos/core/data/repository/SyncLoanRepaymentTransactionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.loan.LoanRepaymentResponse
import com.mifos.core.objects.accounts.loan.LoanRepaymentRequest
import com.mifos.core.objects.accounts.loan.LoanRepaymentResponse
import rx.Observable

interface SyncLoanRepaymentTransactionRepository {
Expand Down
2 changes: 1 addition & 1 deletion ...a/src/main/java/com/mifos/core/data/repository/SyncSavingsAccountTransactionRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package com.mifos.core.data.repository

import com.mifos.core.modelobjects.account.saving.SavingsAccountTransactionResponse
import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionRequest
import com.mifos.core.objects.accounts.savings.SavingsAccountTransactionResponse
import rx.Observable

/**
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repositoryImp/ActivateRepositoryImp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
package com.mifos.core.data.repositoryImp

import com.mifos.core.data.repository.ActivateRepository
import com.mifos.core.modelobjects.clients.ActivatePayload
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 org.openapitools.client.models.PostCentersCenterIdResponse
import org.openapitools.client.models.PostClientsClientIdResponse
import rx.Observable
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/mifos/core/data/repositoryImp/CenterDetailsRepositoryImp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
package com.mifos.core.data.repositoryImp

import com.mifos.core.data.repository.CenterDetailsRepository
import com.mifos.core.modelobjects.groups.CenterInfo
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 kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
Expand Down
Loading
Loading