Some enhancements, now getCategoryValue function of Usage entity clas…

…s is used in the Endpoint. Issue #2302
RestComm · Oct 21, 2017 · e8398a3 · e8398a3
1 parent 66b6104
commit e8398a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/Usage.java b/restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/Usage.java
@@ -129,7 +129,7 @@ public enum Category {
 
     private final String text;
 
-    private Category(final String text) {
+    Category(final String text) {
       this.text = text;
     }
 

diff --git a/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/UsageEndpoint.java b/restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/UsageEndpoint.java
@@ -97,14 +97,14 @@ protected Response getUsage(final String accountSid, final String subresource, U
 
     String categoryStr = info.getQueryParameters().getFirst("Category");
     if (categoryStr != null) {
-      categoryStr = categoryStr.toUpperCase();
+      categoryStr = categoryStr.toLowerCase();
     }
     String startDateStr = info.getQueryParameters().getFirst("StartDate");
     String endDateStr = info.getQueryParameters().getFirst("EndDate");
     //pass in reqUri without query params
     String reqUri = request.getServletPath() + "/" + info.getPath(false);
 
-    Usage.Category category = categoryStr != null ? Usage.Category.valueOf(categoryStr) : null;
+    Usage.Category category = categoryStr != null ? Usage.Category.getCategoryValue(categoryStr) : null;
     DateTime startDate = new DateTime(0).withTimeAtStartOfDay();
     if (startDateStr != null) {
       try {