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 bb371c6  fixed filters
bb371c6 is described below

commit bb371c655965a52f141249fb8d0fea648c261144
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Apr 8 15:03:53 2020 +0300

    fixed filters
---
 .../main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 0612a1a..37d1726 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
@@ -23,6 +23,8 @@ import com.epam.dlab.backendapi.domain.BillingReportLine;
 import com.epam.dlab.backendapi.resources.dto.BillingFilter;
 import com.epam.dlab.dto.billing.BillingResourceType;
 import com.google.inject.Inject;
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Filters;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -141,7 +143,7 @@ public class BaseBillingDAO extends BaseDAO implements 
BillingDAO {
                List<Bson> pipeline = new ArrayList<>();
                List<Bson> matchCriteria = matchCriteria(filter);
                if (!matchCriteria.isEmpty()) {
-                       pipeline.addAll(matchCriteria);
+                       
pipeline.add(Aggregates.match(Filters.and(matchCriteria)));
                }
                pipeline.add(groupCriteria());
                return 
StreamSupport.stream(getCollection(BILLING).aggregate(pipeline).spliterator(), 
false)
@@ -192,10 +194,10 @@ public class BaseBillingDAO extends BaseDAO implements 
BillingDAO {
                        searchCriteria.add(regex(DLAB_ID, filter.getDlabId(), 
"i"));
                }
                if (StringUtils.isNotEmpty(filter.getDateStart())) {
-                       searchCriteria.add(gte(FROM, filter.getDateStart()));
+                       searchCriteria.add(gte(USAGE_DATE, 
filter.getDateStart()));
                }
                if (StringUtils.isNotEmpty(filter.getDateEnd())) {
-                       searchCriteria.add(lte(TO, filter.getDateEnd()));
+                       searchCriteria.add(lte(USAGE_DATE, 
filter.getDateEnd()));
                }
                if (CollectionUtils.isNotEmpty(filter.getProjects())) {
                        searchCriteria.add(in(PROJECT, filter.getProjects()));


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

Reply via email to