This is an automated email from the ASF dual-hosted git repository.
arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 216b39ce0 FINERACT-1724: Added default ordering by id for search
queries
216b39ce0 is described below
commit 216b39ce0c96d1d0dd32fad6114f5710363275b7
Author: Arnold Galovics <[email protected]>
AuthorDate: Mon May 15 17:04:27 2023 +0200
FINERACT-1724: Added default ordering by id for search queries
---
.../search/service/SearchReadPlatformServiceImpl.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java
index a15e02fae..cc697e5ca 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/search/service/SearchReadPlatformServiceImpl.java
@@ -81,30 +81,35 @@ public class SearchReadPlatformServiceImpl implements
SearchReadPlatformService
final String union = " union ";
final String clientMatchSql = " (select 'CLIENT' as entityType, c.id
as entityId, c.display_name as entityName, c.external_id as entityExternalId,
c.account_no as entityAccountNo "
+ " , c.office_id as parentId, o.name as parentName,
c.mobile_no as entityMobileNo,c.status_enum as entityStatusEnum, null as
subEntityType, null as parentType "
- + " from m_client c join m_office o on o.id = c.office_id
where o.hierarchy like :hierarchy and (c.account_no like :search or
c.display_name like :search or c.external_id like :search or c.mobile_no like
:search)) ";
+ + " from m_client c join m_office o on o.id = c.office_id
where o.hierarchy like :hierarchy and (c.account_no like :search or
c.display_name like :search or c.external_id like :search or c.mobile_no like
:search)) "
+ + " order by c.id desc";
final String loanMatchSql = " (select 'LOAN' as entityType, l.id as
entityId, pl.name as entityName, l.external_id as entityExternalId,
l.account_no as entityAccountNo "
+ " , coalesce(c.id,g.id) as parentId,
coalesce(c.display_name,g.display_name) as parentName, null as entityMobileNo,
l.loan_status_id as entityStatusEnum, null as subEntityType, CASE WHEN g.id is
null THEN 'client' ELSE 'group' END as parentType "
- + " from m_loan l left join m_client c on l.client_id = c.id
left join m_group g ON l.group_id = g.id left join m_office o on o.id =
c.office_id left join m_product_loan pl on pl.id=l.product_id where
(o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (l.account_no like
:search or l.external_id like :search)) ";
+ + " from m_loan l left join m_client c on l.client_id = c.id
left join m_group g ON l.group_id = g.id left join m_office o on o.id =
c.office_id left join m_product_loan pl on pl.id=l.product_id where
(o.hierarchy IS NULL OR o.hierarchy like :hierarchy) and (l.account_no like
:search or l.external_id like :search)) "
+ + " order by l.id desc";
final String savingMatchSql = " (select 'SAVING' as entityType, s.id
as entityId, sp.name as entityName, s.external_id as entityExternalId,
s.account_no as entityAccountNo "
+ " , coalesce(c.id,g.id) as parentId,
coalesce(c.display_name,g.display_name) as parentName, null as entityMobileNo,
s.status_enum as entityStatusEnum, s.deposit_type_enum as subEntityType, CASE
WHEN g.id is null THEN 'client' ELSE 'group' END as parentType "
+ " from m_savings_account s left join m_client c on
s.client_id = c.id left join m_group g ON s.group_id = g.id left join m_office
o on o.id = c.office_id left join m_savings_product sp on sp.id=s.product_id "
- + " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy)
and (s.account_no like :search or s.external_id like :search)) ";
+ + " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy)
and (s.account_no like :search or s.external_id like :search)) "
+ + " order by s.id desc";
final String shareMatchSql = " (select 'SHARE' as entityType, s.id as
entityId, sp.name as entityName, s.external_id as entityExternalId,
s.account_no as entityAccountNo "
+ " , c.id as parentId, c.display_name as parentName, null as
entityMobileNo, s.status_enum as entityStatusEnum, null as subEntityType,
'client' as parentType "
+ " from m_share_account s left join m_client c on s.client_id
= c.id left join m_office o on o.id = c.office_id left join m_share_product sp
on sp.id=s.product_id "
- + " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy)
and (s.account_no like :search or s.external_id like :search)) ";
+ + " where (o.hierarchy IS NULL OR o.hierarchy like :hierarchy)
and (s.account_no like :search or s.external_id like :search)) "
+ + " order by s.id desc";
final String clientIdentifierMatchSql = " (select 'CLIENTIDENTIFIER'
as entityType, ci.id as entityId, ci.document_key as entityName, "
+ " null as entityExternalId, null as entityAccountNo, c.id as
parentId, c.display_name as parentName,null as entityMobileNo, c.status_enum as
entityStatusEnum, null as subEntityType, null as parentType "
+ " from m_client_identifier ci join m_client c on
ci.client_id=c.id join m_office o on o.id = c.office_id "
- + " where o.hierarchy like :hierarchy and ci.document_key like
:search ) ";
+ + " where o.hierarchy like :hierarchy and ci.document_key like
:search ) " + " order by ci.id desc";
final String groupMatchSql = " (select CASE WHEN g.level_id=1 THEN
'CENTER' ELSE 'GROUP' END as entityType, g.id as entityId, g.display_name as
entityName, g.external_id as entityExternalId, g.account_no as entityAccountNo,
"
+ " g.office_id as parentId, o.name as parentName, null as
entityMobileNo, g.status_enum as entityStatusEnum, null as subEntityType, null
as parentType "
- + " from m_group g join m_office o on o.id = g.office_id where
o.hierarchy like :hierarchy and (g.account_no like :search or g.display_name
like :search or g.external_id like :search or g.id like :search )) ";
+ + " from m_group g join m_office o on o.id = g.office_id where
o.hierarchy like :hierarchy and (g.account_no like :search or g.display_name
like :search or g.external_id like :search or g.id like :search )) "
+ + " order by g.id desc";
final StringBuilder sql = new StringBuilder();
