[incubator-dlab] 02/02: DLAB-000 added possibility to filter by project on billing report page

[bhliva]

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit effc3f8538ae8bf7a4ea55653d612bfa52156eaf
Author: bhliva <bohdan_hl...@epam.com>
AuthorDate: Mon Sep 16 14:07:04 2019 +0300

    DLAB-000 added possibility to filter by project on billing report page
---
 .../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java     | 3 +++
 .../java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java     | 3 +++
 2 files changed, 6 insertions(+)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
index 2eeb966..77d05e5 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java
@@ -322,6 +322,9 @@ public abstract class BaseBillingDAO<T extends 
BillingFilter> extends BaseDAO im
                if (filter.getDateEnd() != null && 
!filter.getDateEnd().isEmpty()) {
                        searchCriteria.add(lte(FIELD_USAGE_DATE, 
filter.getDateEnd()));
                }
+               if (filter.getProjects() != null && 
!filter.getProjects().isEmpty()){
+                       searchCriteria.add(in(PROJECT, filter.getProjects()));
+               }
 
                searchCriteria.addAll(cloudMatchCriteria((T) filter));
                return searchCriteria;
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java
index 9b8ac08..60d9c1a 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java
@@ -41,5 +41,8 @@ public abstract class BillingFilter {
        @JsonProperty("status")
        protected List<UserInstanceStatus> statuses = Collections.emptyList();
 
+       @JsonProperty("project")
+       protected List<String> projects;
+
        public abstract List<String> getShapes();
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org