CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

MIFOSX-108: Extend group search functionality.

Browse Source
This commit is contained in:
Michal Dudzinski
2012-10-11 17:26:51 +02:00
parent b79f0495f3
commit 90f78597d9
5 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/ClientsApiResource.java
+5 -13
View File
@@ -106,24 +106,24 @@ public class ClientsApiResource {
}
if (externalId != null) {
extraCriteria += " and external_id like " + sqlEncodeString(externalId);
extraCriteria += " and external_id like " + ApiParameterHelper.sqlEncodeString(externalId);
}
if (displayName != null) {
extraCriteria += " and concat(ifnull(firstname, ''), if(firstname > '',' ', '') , ifnull(lastname, '')) like "
+ sqlEncodeString(displayName);
+ ApiParameterHelper.sqlEncodeString(displayName);
}
if (firstName != null) {
extraCriteria += " and firstname like " + sqlEncodeString(firstName);
extraCriteria += " and firstname like " + ApiParameterHelper.sqlEncodeString(firstName);
}
if (lastName != null) {
extraCriteria += " and lastname like " + sqlEncodeString(lastName);
extraCriteria += " and lastname like " + ApiParameterHelper.sqlEncodeString(lastName);
}
if (hierarchy != null) {
extraCriteria += " and o.hierarchy like " + sqlEncodeString(hierarchy+"%");
extraCriteria += " and o.hierarchy like " + ApiParameterHelper.sqlEncodeString(hierarchy+"%");
}
if (StringUtils.isNotBlank(extraCriteria)) {
@@ -135,14 +135,6 @@ public class ClientsApiResource {
return extraCriteria;
}
private String sqlEncodeString(String str) {
String singleQuote = "'";
String twoSingleQuotes = "''";
return singleQuote
+ StringUtils.replace(str, singleQuote, twoSingleQuotes, -1)
+ singleQuote;
}
@GET
@Path("{clientId}")
@Consumes({MediaType.APPLICATION_JSON})
mifosng-provider/src/main/java/org/mifosng/platform/api/GroupsApiResource.java
+42 -8
View File
@@ -19,6 +19,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.commons.lang.StringUtils;
import org.mifosng.platform.api.commands.GroupCommand;
import org.mifosng.platform.api.data.ClientLookup;
import org.mifosng.platform.api.data.EntityIdentifier;
@@ -70,7 +71,14 @@ public class GroupsApiResource {
@GET
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
public String retrieveAllGroups(@Context final UriInfo uriInfo){
public String retrieveAllGroups(@Context final UriInfo uriInfo,
@QueryParam("sqlSearch") final String sqlSearch,
@QueryParam("officeId") final Long officeId,
@QueryParam("externalId") final String externalId,
@QueryParam("name") final String name,
@QueryParam("underHierarchy") final String hierarchy){
final String extraCriteria = getGroupExtraCriteria(sqlSearch, officeId, externalId, name, hierarchy);
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
if (responseParameters.isEmpty()) {
@@ -79,7 +87,7 @@ public class GroupsApiResource {
boolean prettyPrint = ApiParameterHelper.prettyPrint(uriInfo.getQueryParameters());
Collection<GroupData> groups = this.groupReadPlatformService.retrieveAllGroups();
Collection<GroupData> groups = this.groupReadPlatformService.retrieveAllGroups(extraCriteria);
return this.apiJsonSerializerService.serializeGroupDataToJson(prettyPrint, responseParameters, groups);
}
@@ -92,7 +100,7 @@ public class GroupsApiResource {
@PathParam("groupId") final Long groupId,
@QueryParam("officeId") final Long officeId) {
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo
.getQueryParameters());
if (responseParameters.isEmpty()) {
responseParameters.addAll(typicalResponseParameters);
@@ -114,9 +122,9 @@ public class GroupsApiResource {
final String extraCriteria;
if (officeId != null){
extraCriteria = getGroupExtraCriteria(officeId);
extraCriteria = getGroupExtraCriteria(null, officeId, null, null, null);
} else {
extraCriteria = getGroupExtraCriteria(group.getOfficeId());
extraCriteria = getGroupExtraCriteria(null, group.getOfficeId(), null, null, null);
}
availableClients = this.clientReadPlatformService.retrieveAllIndividualClientsForLookup(extraCriteria);
@@ -145,7 +153,7 @@ public class GroupsApiResource {
responseParameters.addAll(Arrays.asList("allowedClients", "allowedOffices"));
final String extraCriteria = getGroupExtraCriteria(officeId);
final String extraCriteria = getGroupExtraCriteria(null, officeId, null, null, null);
GroupData groupData = this.groupReadPlatformService.retrieveNewGroupDetails(extraCriteria);
@@ -212,12 +220,38 @@ public class GroupsApiResource {
return this.apiJsonSerializerService.serializeGroupAccountSummaryCollectionDataToJson(prettyPrint, responseParameters, clientAccount);
}
private String getGroupExtraCriteria(Long officeId){
// 'g.' preffix because of ERROR 1052 (23000): Column 'column_name' in where clause is ambiguous
// caused by the same name of columns in m_office and m_group tables
private String getGroupExtraCriteria(String sqlSearch, Long officeId,
String externalId, String name,
String hierarchy){
String extraCriteria = "";
if (sqlSearch != null) {
sqlSearch = sqlSearch.replaceAll(" name ", " g.name ");
sqlSearch = sqlSearch.replaceAll("name ", "g.name ");
extraCriteria = " and (" + sqlSearch + ")";
}
if (officeId != null) {
extraCriteria += " office_id = " + officeId;
extraCriteria += " and office_id = " + officeId;
}
if (externalId != null) {
extraCriteria += " and g.external_id like " + ApiParameterHelper.sqlEncodeString(externalId);
}
if (name != null) {
extraCriteria += " and g.name = " + ApiParameterHelper.sqlEncodeString(name);
}
if (hierarchy != null) {
extraCriteria += " and o.hierarchy like " + ApiParameterHelper.sqlEncodeString(hierarchy + "%");
}
if (StringUtils.isNotBlank(extraCriteria)) {
extraCriteria = extraCriteria.substring(4);
}
logger.info("extraCriteria; " + extraCriteria);
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiParameterHelper.java
+8
View File
@@ -78,4 +78,12 @@ public class ApiParameterHelper {
}
return genericResultSet;
}
public static String sqlEncodeString(String str) {
String singleQuote = "'";
String twoSingleQuotes = "''";
return singleQuote
+ StringUtils.replace(str, singleQuote, twoSingleQuotes, -1)
+ singleQuote;
}
}
mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupReadPlatformService.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.mifosng.platform.api.data.GroupData;
public interface GroupReadPlatformService {
Collection<GroupData> retrieveAllGroups();
Collection<GroupData> retrieveAllGroups(String extraCriteria);
GroupData retrieveGroup(Long groupId);
mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupReadPlatformServiceImpl.java
+5 -1
View File
@@ -44,7 +44,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
}
@Override
public Collection<GroupData> retrieveAllGroups() {
public Collection<GroupData> retrieveAllGroups(final String extraCriteria) {
this.context.authenticatedUser();
@@ -52,6 +52,10 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
String sql = "select " + rm.groupSchema() + " where g.is_deleted=0";
if (StringUtils.isNotBlank(extraCriteria)){
sql += " and (" + extraCriteria + ")";
}
return this.jdbcTemplate.query(sql, rm, new Object[] {});
}