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 9b09d6a  Fixed search by dlabId
9b09d6a is described below

commit 9b09d6aee5ba92b33e34145f1ba9168067354e32
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Mar 13 12:57:34 2020 +0200

    Fixed search by dlabId
---
 .../com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
index 1416631..36515ed 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
@@ -251,7 +251,7 @@ public class BillingServiceImplNew implements 
BillingServiceNew {
     }
 
     private Predicate<BillingData> getBillingDataFilter(BillingFilter filter) {
-        return br -> (StringUtils.isEmpty(filter.getDlabId()) || 
filter.getDlabId().equalsIgnoreCase(br.getTag())) &&
+        return br -> (StringUtils.isEmpty(filter.getDlabId()) || 
StringUtils.containsIgnoreCase(br.getTag(), filter.getDlabId())) &&
                 (StringUtils.isEmpty(filter.getDateStart()) || 
LocalDate.parse(filter.getDateStart()).isEqual(br.getUsageDateFrom()) || 
LocalDate.parse(filter.getDateStart()).isBefore(br.getUsageDateFrom())) &&
                 (StringUtils.isEmpty(filter.getDateEnd()) || 
LocalDate.parse(filter.getDateEnd()).isEqual(br.getUsageDateTo()) || 
LocalDate.parse(filter.getDateEnd()).isAfter(br.getUsageDateTo())) &&
                 (CollectionUtils.isEmpty(filter.getProducts()) || 
filter.getProducts().contains(br.getProduct()));


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

Reply via email to