dlab-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From of...@apache.org
Subject [incubator-dlab] branch DLAB-1571 updated: [DLAB-1717] fixed filter for shape
Date Thu, 16 Apr 2020 09:23:09 GMT
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 04008ef  [DLAB-1717] fixed filter for shape
04008ef is described below

commit 04008ef4fe526fcf0ca7bdb06c2fb7fb6dad3ca1
Author: Oleh Fuks <olegfuks98@gmail.com>
AuthorDate: Thu Apr 16 12:22:56 2020 +0300

    [DLAB-1717] fixed filter for shape
---
 .../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 47721fe..28a6c64 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
@@ -217,7 +217,7 @@ public class BaseBillingDAO extends BaseDAO implements BillingDAO {
 			searchCriteria.add(in(PRODUCT, filter.getProducts()));
 		}
 		if (CollectionUtils.isNotEmpty(filter.getShapes())) {
-			searchCriteria.add(in(SHAPE, filter.getShapes()));
+			searchCriteria.add(regex(SHAPE, "(" + String.join("|", filter.getShapes()) + ")"));
 		}
 
 		return searchCriteria;


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


Mime
View raw message