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

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


The following commit(s) were added to refs/heads/DLAB-1571 by this push:
     new 236000a  [DLAB-1718] fixed bugs with filters
236000a is described below

commit 236000a2496e1315e4c9d4b7779f8ed6dd9ef56d
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Apr 15 12:08:15 2020 +0300

    [DLAB-1718] fixed bugs with filters
---
 .../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java     | 3 +++
 .../java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java | 1 +
 2 files changed, 4 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 b764c3c..47721fe 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
@@ -216,6 +216,9 @@ public class BaseBillingDAO extends BaseDAO implements 
BillingDAO {
                if (CollectionUtils.isNotEmpty(filter.getProducts())) {
                        searchCriteria.add(in(PRODUCT, filter.getProducts()));
                }
+               if (CollectionUtils.isNotEmpty(filter.getShapes())) {
+                       searchCriteria.add(in(SHAPE, filter.getShapes()));
+               }
 
                return searchCriteria;
        }
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
index ce88cb9..bddba04 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImpl.java
@@ -102,6 +102,7 @@ public class BillingServiceImpl implements BillingService {
         List<BillingReportLine> billingReportLines = 
billingDAO.aggregateBillingData(filter)
                 .stream()
                 .peek(this::appendStatuses)
+                .filter(bd -> CollectionUtils.isEmpty(filter.getStatuses()) || 
filter.getStatuses().contains(bd.getStatus()))
                 .collect(Collectors.toList());
         final LocalDate min = 
billingReportLines.stream().min(Comparator.comparing(BillingReportLine::getUsageDateFrom)).map(BillingReportLine::getUsageDateFrom).orElse(null);
         final LocalDate max = 
billingReportLines.stream().max(Comparator.comparing(BillingReportLine::getUsageDateTo)).map(BillingReportLine::getUsageDateTo).orElse(null);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to