You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/03/13 10:57:52 UTC
[incubator-dlab] branch DLAB-1571 updated: Fixed search by dlabId
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 <ol...@gmail.com>
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: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org