Merge pull request #18 from ndelvos78/sortLoanProductsByEnabled
Allow loan products to be sorted by Enabled column without error.
diff --git a/service/src/main/java/io/mifos/portfolio/service/internal/service/ProductService.java b/service/src/main/java/io/mifos/portfolio/service/internal/service/ProductService.java
index 4942da1..dc10541 100644
--- a/service/src/main/java/io/mifos/portfolio/service/internal/service/ProductService.java
+++ b/service/src/main/java/io/mifos/portfolio/service/internal/service/ProductService.java
@@ -94,7 +94,7 @@
if (sortColumn == null)
return "lastModifiedOn";
- if (!sortColumn.equals("name") && !sortColumn.equals("identifier") && !sortColumn.equals("lastModifiedOn"))
+ if (!sortColumn.equals("name") && !sortColumn.equals("identifier") && !sortColumn.equals("lastModifiedOn") && !sortColumn.equals("enabled"))
throw new IllegalStateException("Illegal input for Sort Column should've been blocked in Rest Controller.");
return sortColumn;
diff --git a/service/src/main/java/io/mifos/portfolio/service/rest/ProductRestController.java b/service/src/main/java/io/mifos/portfolio/service/rest/ProductRestController.java
index 27cad2f..f900153 100644
--- a/service/src/main/java/io/mifos/portfolio/service/rest/ProductRestController.java
+++ b/service/src/main/java/io/mifos/portfolio/service/rest/ProductRestController.java
@@ -54,7 +54,7 @@
@RestController //
@RequestMapping("/products") //
public class ProductRestController {
- private final static Set<String> VALID_SORT_COLUMNS = new HashSet<>(Arrays.asList("lastModifiedOn", "identifier", "name"));
+ private final static Set<String> VALID_SORT_COLUMNS = new HashSet<>(Arrays.asList("lastModifiedOn", "identifier", "name", "enabled"));
private final CommandGateway commandGateway;
private final CaseService caseService;
