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

WIP filtering loans again

Browse Source
This commit is contained in:
John Woodlock
2012-05-27 21:16:25 +10:00
parent 331c8831f9
commit 237d28ba10
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+10 -8
View File
@@ -47,6 +47,11 @@ public class LoansApiResource {
private String filterName = "myFilter";
private String allowedFieldList = "";
private String loanFilterName = "loanFilter";
private String loanAllowedFieldList = "";
private String loanRepaymentFilterName = "loanRepaymentFilter";
private String loanRepaymentDefaultFieldList = "date,total";
private String loanRepaymentAllowedFieldList = "";
@Autowired
private LoanReadPlatformService loanReadPlatformService;
@@ -91,10 +96,9 @@ public class LoansApiResource {
LoanAccountData loanAccount = this.loanReadPlatformService
.retrieveLoanAccountDetails(loanId);
String specificFilterName = "loanFilter";
String selectedFields = "";
return this.jsonFormattingService.convertRequest(loanAccount,
specificFilterName, allowedFieldList, selectedFields,
loanFilterName, loanAllowedFieldList, selectedFields,
uriInfo.getQueryParameters());
}
@@ -285,21 +289,20 @@ public class LoansApiResource {
@QueryParam("type") final String transactionType,
@Context UriInfo uriInfo) {
String specificFilterName = "loanFilter";
String selectedFields = "";
String selectedFields = loanRepaymentDefaultFieldList;
if (StringUtils.isNotBlank(transactionType)
&& transactionType.trim().equalsIgnoreCase("waiver")) {
LoanRepaymentData loanWaiverData = this.loanReadPlatformService
.retrieveNewLoanWaiverDetails(loanId);
return this.jsonFormattingService.convertRequest(loanWaiverData,
specificFilterName, allowedFieldList, selectedFields,
loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
uriInfo.getQueryParameters());
}
LoanRepaymentData loanRepaymentData = this.loanReadPlatformService
.retrieveNewLoanRepaymentDetails(loanId);
return this.jsonFormattingService.convertRequest(loanRepaymentData,
specificFilterName, allowedFieldList, selectedFields,
loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
uriInfo.getQueryParameters());
}
@@ -315,10 +318,9 @@ public class LoansApiResource {
LoanRepaymentData loanRepaymentData = this.loanReadPlatformService
.retrieveLoanRepaymentDetails(loanId, repaymentId);
String specificFilterName = "loanFilter";
String selectedFields = "";
return this.jsonFormattingService.convertRequest(loanRepaymentData,
specificFilterName, allowedFieldList, selectedFields,
loanRepaymentFilterName, loanRepaymentAllowedFieldList, selectedFields,
uriInfo.getQueryParameters());
}
mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiJSONFormattingServiceImpl.java
+3 -19
View File
@@ -144,7 +144,9 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
.serializeAllExcept(loanRepaymentFields));
}
if (filterName.equals("myFilter")) {
if ((filterName.equals("loanRepaymentFilter"))
|| (filterName.equals("myFilter"))
|| (filterName.equals("permissionFilter"))) {
if (filterType.equals("I")) {
return new SimpleFilterProvider().addFilter(filterName,
@@ -186,24 +188,6 @@ public class ApiJSONFormattingServiceImpl implements ApiJSONFormattingService {
.filterOutAllExcept(permissionFields));
}
// ADDED BY KEITH - list permissions didnt seem to be working right.
// added this to avoid adding null filters to object mapper.
if (filterName.equals("permissionFilter")) {
Set<String> permissionFields = new HashSet<String>();
permissionFields.add("id");
permissionFields.add("name");
permissionFields.add("description");
permissionFields.add("code");
permissionFields.add("groupType");
return new SimpleFilterProvider().addFilter(filterName,
SimpleBeanPropertyFilter.filterOutAllExcept(filterFields))
.addFilter(
"permissionFilter",
SimpleBeanPropertyFilter
.filterOutAllExcept(permissionFields));
}
if (filterName.equals("userFilter")) {
Set<String> roleFields = new HashSet<String>();