fix Filter

Author: xlorne

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/query/QueryRequest.java

@@ -77,7 +77,7 @@ public <T> List<Order> getOrder(Root<T> root, CriteriaBuilder criteriaBuilder) {
 
     private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder, Root<T> root, List<String> properties) {
         String key = filter.getKey();
-        if (filter.isOr() || properties.contains(key)) {
+        if (filter.isAddFilters() || filter.isOrFilters() || properties.contains(key)) {
 
             if (filter.isEqual()) {
                 return criteriaBuilder.equal(root.get(key), filter.getValue()[0]);
@@ -165,7 +165,7 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder
                 return in;
             }
 
-            if (filter.isOr()) {
+            if (filter.isOrFilters()) {
                 Filter[] orFilters = (Filter[]) filter.getValue();
                 List<Predicate> orPredicates = new ArrayList<>();
                 for (Filter orFilter : orFilters) {
@@ -176,6 +176,18 @@ private <T> Predicate toPredicate(Filter filter, CriteriaBuilder criteriaBuilder
                 }
                 return criteriaBuilder.or(orPredicates.toArray(new Predicate[0]));
             }
+
+            if (filter.isAddFilters()) {
+                Filter[] orFilters = (Filter[]) filter.getValue();
+                List<Predicate> addPredicates = new ArrayList<>();
+                for (Filter orFilter : orFilters) {
+                    Predicate predicate = toPredicate(orFilter, criteriaBuilder, root, properties);
+                    if (predicate != null) {
+                        addPredicates.add(predicate);
+                    }
+                }
+                return criteriaBuilder.and(addPredicates.toArray(new Predicate[0]));
+            }
         }
         return null;
     }

springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/DemoRepositoryTest.java

@@ -77,7 +77,7 @@ void pageRequest() {
     }
 
     @Test
-    void customSearchOr() {
+    void customSearchOrFilters() {
         demoRepository.deleteAll();
         Demo demo1 = new Demo();
         demo1.setName("123");
@@ -97,6 +97,27 @@ void customSearchOr() {
         assertEquals(2, page.getTotalElements());
     }
 
+    @Test
+    void customSearchAddFilters() {
+        demoRepository.deleteAll();
+        Demo demo1 = new Demo();
+        demo1.setName("123");
+        demoRepository.save(demo1);
+
+        Demo demo2 = new Demo();
+        demo2.setName("456");
+        demoRepository.save(demo2);
+
+        PageRequest request = new PageRequest();
+        request.setCurrent(1);
+        request.setPageSize(10);
+
+//        request.addFilters(Filter.as("id", Relation.IN, 1),Filter.as("id", Relation.IN, 2),Filter.as("id", Relation.IN, 3),Filter.as("id", Relation.IN, 4));
+        request.orFilters(Filter.as("name", Relation.LIKE, "%2%"),Filter.and(Filter.as("id", Relation.IN, 1),Filter.as("id", Relation.IN, 2)));
+        Page<Demo> page = demoRepository.pageRequest(request);
+        assertEquals(2, page.getTotalElements());
+    }
+
 
     @Test
     void dynamicListQuery() {

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/Filter.java

@@ -8,6 +8,9 @@
 @Getter
 public class Filter {
 
+    public static final String FILTER_OR_KEY = "FILTER_OR_KEY";
+    public static final String FILTER_ADD_KEY = "FILTER_ADD_KEY";
+
     private String key;
     private Object[] value;
     private Relation relation;
@@ -22,8 +25,8 @@ public Filter(String key, Object... value) {
         this(key, Relation.EQUAL, value);
     }
 
-    public Filter(Filter... value) {
-        this(null, null, value);
+    public Filter(String key, Filter... value) {
+        this(key, null, value);
     }
 
     public static Filter as(String key, Relation relation, Object... value) {
@@ -34,8 +37,12 @@ public static Filter as(String key, Object... value) {
         return new Filter(key, value);
     }
 
-    public static Filter as(Filter... value) {
-        return new Filter(value);
+    public static Filter and(Filter... value) {
+        return new Filter(FILTER_ADD_KEY, value);
+    }
+
+    public static Filter or(Filter... value) {
+        return new Filter(FILTER_OR_KEY, value);
     }
 
     public boolean isEqual() {
@@ -54,8 +61,12 @@ public boolean isIn() {
         return relation == Relation.IN;
     }
 
-    public boolean isOr() {
-        return value != null && value.length > 0 && value[0] instanceof Filter;
+    public boolean isOrFilters() {
+        return FILTER_OR_KEY.equals(key);
+    }
+
+    public boolean isAddFilters() {
+        return FILTER_ADD_KEY.equals(key);
     }
 
     public boolean isGreaterThan() {

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java

@@ -172,6 +172,11 @@ public PageRequest addFilter(String key, Object... value) {
         return this;
     }
 
+    public PageRequest addFilters(Filter... filters) {
+        requestFilter.addFilters(filters);
+        return this;
+    }
+
     public PageRequest orFilters(Filter... filters) {
         requestFilter.orFilters(filters);
         return this;

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/RequestFilter.java

@@ -1,9 +1,9 @@
 package com.codingapi.springboot.framework.dto.request;
 
 
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 public class RequestFilter {
@@ -21,8 +21,13 @@ public RequestFilter addFilter(String key, Object... value) {
         return this;
     }
 
+    public RequestFilter addFilters(Filter... value) {
+        this.pushFilter(new Filter(Filter.FILTER_ADD_KEY, value));
+        return this;
+    }
+
     public RequestFilter orFilters(Filter... value) {
-        this.pushFilter(new Filter(value));
+        this.pushFilter(new Filter(Filter.FILTER_OR_KEY, value));
         return this;
     }