From cea64364703b9bca6827c5503c0a44d18eba0ef7 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Thu, 4 Dec 2014 18:37:31 +0530 Subject: [PATCH] MIFOSX-1284 Add the ability to sort offices --- .../api/JournalEntriesApiResource.java | 2 +- .../JournalEntryReadPlatformService.java | 2 +- .../JournalEntryReadPlatformServiceImpl.java | 2 +- .../core}/service/SearchParameters.java | 7 ++++++- .../jobs/api/SchedulerJobApiResource.java | 2 +- .../SchedulerJobRunnerReadService.java | 2 +- .../SchedulerJobRunnerReadServiceImpl.java | 2 +- .../office/api/OfficesApiResource.java | 8 ++++++-- .../service/OfficeReadPlatformService.java | 3 ++- .../OfficeReadPlatformServiceImpl.java | 20 ++++++++++++++++--- .../api/AccountTransfersApiResource.java | 2 +- .../api/StandingInstructionApiResource.java | 2 +- ...StandingInstructionHistoryApiResource.java | 2 +- .../account/data/StandingInstructionDTO.java | 2 +- .../AccountTransfersReadPlatformService.java | 2 +- ...countTransfersReadPlatformServiceImpl.java | 2 +- ...ructionHistoryReadPlatformServiceImpl.java | 2 +- ...ingInstructionReadPlatformServiceImpl.java | 2 +- .../client/api/ClientsApiResource.java | 2 +- .../service/ClientReadPlatformService.java | 2 +- .../ClientReadPlatformServiceImpl.java | 2 +- .../group/api/CentersApiResource.java | 2 +- .../group/api/GroupsApiResource.java | 2 +- .../service/CenterReadPlatformService.java | 1 + .../CenterReadPlatformServiceImpl.java | 1 + .../service/GroupReadPlatformService.java | 1 + .../service/GroupReadPlatformServiceImpl.java | 1 + .../loanaccount/api/LoansApiResource.java | 2 +- .../service/LoanReadPlatformService.java | 2 +- .../service/LoanReadPlatformServiceImpl.java | 2 +- ...ountOnHoldFundTransactionsApiResource.java | 2 +- .../api/SavingsAccountsApiResource.java | 2 +- ...tOnHoldTransactionReadPlatformService.java | 2 +- ...oldTransactionReadPlatformServiceImpl.java | 2 +- .../SavingsAccountReadPlatformService.java | 2 +- ...SavingsAccountReadPlatformServiceImpl.java | 2 +- 36 files changed, 63 insertions(+), 35 deletions(-) rename mifosng-provider/src/main/java/org/mifosplatform/{portfolio/group => infrastructure/core}/service/SearchParameters.java (96%) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/api/JournalEntriesApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/api/JournalEntriesApiResource.java index 39bb0c6da..ca9b74c53 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/api/JournalEntriesApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/api/JournalEntriesApiResource.java @@ -35,7 +35,7 @@ import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSeriali import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformService.java index c581ab149..4a7a5e678 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformService.java @@ -10,7 +10,7 @@ import java.util.Date; import org.mifosplatform.accounting.journalentry.data.JournalEntryAssociationParametersData; import org.mifosplatform.accounting.journalentry.data.JournalEntryData; import org.mifosplatform.infrastructure.core.service.Page; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public interface JournalEntryReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java index 7cfaed464..7b00ce5a4 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java @@ -29,7 +29,7 @@ import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.organisation.monetary.data.CurrencyData; import org.mifosplatform.portfolio.account.PortfolioAccountType; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.loanaccount.data.LoanTransactionEnumData; import org.mifosplatform.portfolio.loanproduct.service.LoanEnumerations; import org.mifosplatform.portfolio.note.data.NoteData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/SearchParameters.java similarity index 96% rename from mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java rename to mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/SearchParameters.java index 47cb63cb0..536582d21 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/SearchParameters.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mifosplatform.portfolio.group.service; +package org.mifosplatform.infrastructure.core.service; import org.apache.commons.lang.StringUtils; @@ -55,6 +55,11 @@ public final class SearchParameters { sortOrder, staffId, accountNo); } + public static SearchParameters forOffices(final String orderBy, final String sortOrder) { + return new SearchParameters(null, null, null, null, null, null, null, null, null, orderBy, sortOrder, + null, null); + } + public static SearchParameters forLoans(final String sqlSearch, final String externalId, final Integer offset, final Integer limit, final String orderBy, final String sortOrder, final String accountNo) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/api/SchedulerJobApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/api/SchedulerJobApiResource.java index e35789a83..bd9a80008 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/api/SchedulerJobApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/api/SchedulerJobApiResource.java @@ -36,7 +36,7 @@ import org.mifosplatform.infrastructure.jobs.service.JobRegisterService; import org.mifosplatform.infrastructure.jobs.service.SchedulerJobRunnerReadService; import org.mifosplatform.infrastructure.security.exception.NoAuthorizationException; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadService.java index 89e685ade..a99098449 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadService.java @@ -10,7 +10,7 @@ import java.util.List; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.jobs.data.JobDetailData; import org.mifosplatform.infrastructure.jobs.data.JobDetailHistoryData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public interface SchedulerJobRunnerReadService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java index 4accaf552..e4daba71a 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java @@ -17,7 +17,7 @@ import org.mifosplatform.infrastructure.jobs.data.JobDetailData; import org.mifosplatform.infrastructure.jobs.data.JobDetailHistoryData; import org.mifosplatform.infrastructure.jobs.exception.JobNotFoundException; import org.mifosplatform.infrastructure.jobs.exception.OperationNotAllowedException; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficesApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficesApiResource.java index 77dddceef..b31255c1b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficesApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/api/OfficesApiResource.java @@ -33,6 +33,7 @@ import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSeria import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.service.OfficeReadPlatformService; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -72,11 +73,14 @@ public class OfficesApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) public String retrieveOffices(@Context final UriInfo uriInfo, - @DefaultValue("false") @QueryParam("includeAllOffices") final boolean onlyManualEntries) { + @DefaultValue("false") @QueryParam("includeAllOffices") final boolean onlyManualEntries, + @QueryParam("orderBy") final String orderBy, @QueryParam("sortOrder") final String sortOrder) { this.context.authenticatedUser().validateHasReadPermission(this.resourceNameForPermissions); - final Collection offices = this.readPlatformService.retrieveAllOffices(onlyManualEntries); + final SearchParameters searchParameters = SearchParameters.forOffices(orderBy, sortOrder); + + final Collection offices = this.readPlatformService.retrieveAllOffices(onlyManualEntries, searchParameters); final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters()); return this.toApiJsonSerializer.serialize(settings, offices, this.RESPONSE_DATA_PARAMETERS); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformService.java index c59b34f95..04c836f59 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformService.java @@ -9,10 +9,11 @@ import java.util.Collection; import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.data.OfficeTransactionData; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public interface OfficeReadPlatformService { - Collection retrieveAllOffices(boolean includeAllOffices); + Collection retrieveAllOffices(boolean includeAllOffices, SearchParameters searchParameters); Collection retrieveAllOfficesForDropdown(); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformServiceImpl.java index f5dd0af71..84e92c750 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/organisation/office/service/OfficeReadPlatformServiceImpl.java @@ -20,6 +20,7 @@ import org.mifosplatform.organisation.monetary.service.CurrencyReadPlatformServi import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.data.OfficeTransactionData; import org.mifosplatform.organisation.office.exception.OfficeNotFoundException; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.useradministration.domain.AppUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; @@ -128,7 +129,7 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService @Override @Cacheable(value = "offices", key = "T(org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil).getTenant().getTenantIdentifier().concat(#root.target.context.authenticatedUser().getOffice().getHierarchy()+'of')") - public Collection retrieveAllOffices(final boolean includeAllOffices) { + public Collection retrieveAllOffices(final boolean includeAllOffices, final SearchParameters searchParameters) { final AppUser currentUser = this.context.authenticatedUser(); final String hierarchy = currentUser.getOffice().getHierarchy(); String hierarchySearchString = null; @@ -138,9 +139,22 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService hierarchySearchString = hierarchy + "%"; } final OfficeMapper rm = new OfficeMapper(); - final String sql = "select " + rm.officeSchema() + "where o.hierarchy like ? order by o.hierarchy"; + final StringBuilder sqlBuilder = new StringBuilder(200); + sqlBuilder.append("select "); + sqlBuilder.append(rm.officeSchema()); + sqlBuilder.append(" where o.hierarchy like ? "); - return this.jdbcTemplate.query(sql, rm, new Object[] { hierarchySearchString }); + if (searchParameters.isOrderByRequested()) { + sqlBuilder.append("order by ").append(searchParameters.getOrderBy()); + + if (searchParameters.isSortOrderProvided()) { + sqlBuilder.append(' ').append(searchParameters.getSortOrder()); + } + } else { + sqlBuilder.append("order by o.hierarchy"); + } + + return this.jdbcTemplate.query(sqlBuilder.toString(), rm, new Object[] { hierarchySearchString }); } @Override diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/AccountTransfersApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/AccountTransfersApiResource.java index c4d3d3d95..c69979f33 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/AccountTransfersApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/AccountTransfersApiResource.java @@ -27,7 +27,7 @@ import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.portfolio.account.data.AccountTransferData; import org.mifosplatform.portfolio.account.service.AccountTransfersReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionApiResource.java index bd1811a3e..c2a42a558 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionApiResource.java @@ -38,7 +38,7 @@ import org.mifosplatform.portfolio.account.data.StandingInstructionDTO; import org.mifosplatform.portfolio.account.data.StandingInstructionData; import org.mifosplatform.portfolio.account.service.AccountTransfersReadPlatformService; import org.mifosplatform.portfolio.account.service.StandingInstructionReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java index db71c49ce..b55b63547 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/api/StandingInstructionHistoryApiResource.java @@ -25,7 +25,7 @@ import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext import org.mifosplatform.portfolio.account.data.StandingInstructionDTO; import org.mifosplatform.portfolio.account.data.StandingInstructionHistoryData; import org.mifosplatform.portfolio.account.service.StandingInstructionHistoryReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/data/StandingInstructionDTO.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/data/StandingInstructionDTO.java index 4b5a0a320..749a1444f 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/data/StandingInstructionDTO.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/data/StandingInstructionDTO.java @@ -7,7 +7,7 @@ package org.mifosplatform.portfolio.account.data; import java.util.Date; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public class StandingInstructionDTO { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformService.java index 7c84ecccc..48cc28301 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformService.java @@ -10,7 +10,7 @@ import java.util.Collection; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.portfolio.account.PortfolioAccountType; import org.mifosplatform.portfolio.account.data.AccountTransferData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public interface AccountTransfersReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java index 445ae4180..339814447 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java @@ -31,7 +31,7 @@ import org.mifosplatform.portfolio.account.domain.AccountTransferType; import org.mifosplatform.portfolio.account.exception.AccountTransferNotFoundException; import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java index fa4a72612..d1cade503 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionHistoryReadPlatformServiceImpl.java @@ -27,7 +27,7 @@ import org.mifosplatform.portfolio.account.data.PortfolioAccountData; import org.mifosplatform.portfolio.account.data.StandingInstructionDTO; import org.mifosplatform.portfolio.account.data.StandingInstructionHistoryData; import org.mifosplatform.portfolio.client.data.ClientData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java index 5bb0d6dc2..6819c13a4 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/StandingInstructionReadPlatformServiceImpl.java @@ -46,7 +46,7 @@ import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; import org.mifosplatform.portfolio.common.service.CommonEnumerations; import org.mifosplatform.portfolio.common.service.DropdownReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java index b91043b54..96d95157a 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java @@ -39,7 +39,7 @@ import org.mifosplatform.portfolio.accountdetails.data.AccountSummaryCollectionD import org.mifosplatform.portfolio.accountdetails.service.AccountDetailsReadPlatformService; import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.data.SavingsAccountData; import org.mifosplatform.portfolio.savings.service.SavingsAccountReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformService.java index da9286677..67a3e3e1f 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformService.java @@ -9,7 +9,7 @@ import java.util.Collection; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.portfolio.client.data.ClientData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; public interface ClientReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java index 52fc8315c..59757e4ad 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java @@ -33,7 +33,7 @@ import org.mifosplatform.portfolio.client.domain.ClientEnumerations; import org.mifosplatform.portfolio.client.domain.ClientStatus; import org.mifosplatform.portfolio.client.exception.ClientNotFoundException; import org.mifosplatform.portfolio.group.data.GroupGeneralData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.data.SavingsProductData; import org.mifosplatform.portfolio.savings.service.SavingsProductReadPlatformService; import org.mifosplatform.useradministration.domain.AppUser; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/CentersApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/CentersApiResource.java index cf045f639..b1dfb3ca4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/CentersApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/CentersApiResource.java @@ -53,7 +53,7 @@ import org.mifosplatform.portfolio.group.data.CenterData; import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.data.StaffCenterData; import org.mifosplatform.portfolio.group.service.CenterReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.meeting.data.MeetingData; import org.mifosplatform.portfolio.meeting.service.MeetingReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/GroupsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/GroupsApiResource.java index cf0d032e7..bcbf6d7cf 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/GroupsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/GroupsApiResource.java @@ -56,7 +56,7 @@ import org.mifosplatform.portfolio.group.data.GroupRoleData; import org.mifosplatform.portfolio.group.service.CenterReadPlatformService; import org.mifosplatform.portfolio.group.service.GroupReadPlatformService; import org.mifosplatform.portfolio.group.service.GroupRolesReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.meeting.data.MeetingData; import org.mifosplatform.portfolio.meeting.service.MeetingReadPlatformService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformService.java index 8045772ff..7ca96d2e2 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformService.java @@ -10,6 +10,7 @@ import java.util.Date; import org.mifosplatform.infrastructure.core.data.PaginationParameters; import org.mifosplatform.infrastructure.core.service.Page; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.group.data.CenterData; import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.data.StaffCenterData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java index 0fa2b5ea7..6c3eab031 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java @@ -30,6 +30,7 @@ import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidation import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.service.OfficeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformService.java index 8a8a5e07c..1c92194d4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformService.java @@ -9,6 +9,7 @@ import java.util.Collection; import org.mifosplatform.infrastructure.core.data.PaginationParameters; import org.mifosplatform.infrastructure.core.service.Page; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.group.data.GroupGeneralData; public interface GroupReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java index 005b70e17..6c58067cb 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java @@ -24,6 +24,7 @@ import org.mifosplatform.infrastructure.core.domain.JdbcSupport; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.service.OfficeReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java index 8435e4dab..85dd143fa 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/api/LoansApiResource.java @@ -63,7 +63,7 @@ import org.mifosplatform.portfolio.fund.data.FundData; import org.mifosplatform.portfolio.fund.service.FundReadPlatformService; import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.service.GroupReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.loanaccount.data.DisbursementData; import org.mifosplatform.portfolio.loanaccount.data.LoanAccountData; import org.mifosplatform.portfolio.loanaccount.data.LoanApprovalData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java index 095a63bcb..d741dac42 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformService.java @@ -11,7 +11,7 @@ import org.joda.time.LocalDate; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.organisation.staff.data.StaffData; import org.mifosplatform.portfolio.calendar.data.CalendarData; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.loanaccount.data.DisbursementData; import org.mifosplatform.portfolio.loanaccount.data.LoanAccountData; import org.mifosplatform.portfolio.loanaccount.data.LoanApprovalData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 97dc92d9b..5c5f2f5f3 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -56,7 +56,7 @@ import org.mifosplatform.portfolio.fund.service.FundReadPlatformService; import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.data.GroupRoleData; import org.mifosplatform.portfolio.group.service.GroupReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.loanaccount.data.DisbursementData; import org.mifosplatform.portfolio.loanaccount.data.LoanAccountData; import org.mifosplatform.portfolio.loanaccount.data.LoanApplicationTimelineData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java index 6ca674a78..bb5c4e510 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/DepositAccountOnHoldFundTransactionsApiResource.java @@ -20,7 +20,7 @@ import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSeriali import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.SavingsApiConstants; import org.mifosplatform.portfolio.savings.data.DepositAccountOnHoldTransactionData; import org.mifosplatform.portfolio.savings.service.DepositAccountOnHoldTransactionReadPlatformService; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java index b8a1d1bcc..29cd7a18e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/api/SavingsAccountsApiResource.java @@ -36,7 +36,7 @@ import org.mifosplatform.infrastructure.core.serialization.ApiRequestJsonSeriali import org.mifosplatform.infrastructure.core.serialization.DefaultToApiJsonSerializer; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.DepositAccountType; import org.mifosplatform.portfolio.savings.SavingsApiConstants; import org.mifosplatform.portfolio.savings.data.SavingsAccountChargeData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java index 6605efe06..d1ffedfa6 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformService.java @@ -6,7 +6,7 @@ package org.mifosplatform.portfolio.savings.service; import org.mifosplatform.infrastructure.core.service.Page; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.data.DepositAccountOnHoldTransactionData; public interface DepositAccountOnHoldTransactionReadPlatformService { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java index e93b82897..58aaedfd3 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/DepositAccountOnHoldTransactionReadPlatformServiceImpl.java @@ -17,7 +17,7 @@ import org.mifosplatform.infrastructure.core.domain.JdbcSupport; import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.data.DepositAccountOnHoldTransactionData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformService.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformService.java index e4123550e..97061ccb5 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformService.java @@ -8,7 +8,7 @@ package org.mifosplatform.portfolio.savings.service; import java.util.Collection; import org.mifosplatform.infrastructure.core.service.Page; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.savings.DepositAccountType; import org.mifosplatform.portfolio.savings.data.SavingsAccountData; import org.mifosplatform.portfolio.savings.data.SavingsAccountTransactionData; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java index 7ac4bd03c..a68df0be1 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/service/SavingsAccountReadPlatformServiceImpl.java @@ -32,7 +32,7 @@ import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; import org.mifosplatform.portfolio.group.data.GroupGeneralData; import org.mifosplatform.portfolio.group.service.GroupReadPlatformService; -import org.mifosplatform.portfolio.group.service.SearchParameters; +import org.mifosplatform.infrastructure.core.service.SearchParameters; import org.mifosplatform.portfolio.paymentdetail.data.PaymentDetailData; import org.mifosplatform.portfolio.savings.DepositAccountType; import org.mifosplatform.portfolio.savings.SavingsCompoundingInterestPeriodType;