Add support for initial predicte and order list

Author: gustavnavar

gridcore/src/main/java/me/agno/gridcore/Grid.java

@@ -52,15 +52,12 @@ public class Grid<T> implements IGrid<T> {
     @Getter
     private Class<T> targetType;
 
+    @Getter
+    @Setter
     private Predicate predicate;
 
-    public Predicate getPredicate() {
-        //call preprocessors before:
-        preProcess();
-        return this.predicate;
-    }
-
     @Getter
+    @Setter
     private List<Order> orderList;
 
     @Getter
@@ -145,18 +142,15 @@ public IGridPager<T> getPager() {
     @Setter
     private String removeDiacritics = null;
 
-    public Grid(EntityManager entityManager, Class<T> targetType, Predicate predicate, List<Order> orderList,
-                LinkedHashMap<String, List<String>> query, IColumnBuilder<T> columnBuilder) {
+    public Grid(EntityManager entityManager, Class<T> targetType, LinkedHashMap<String, List<String>> query,
+                IColumnBuilder<T> columnBuilder) {
 
         this.entityManager = entityManager;
         this.targetType = targetType;
         this.criteriaBuilder = entityManager.getCriteriaBuilder();
         this.criteriaQuery = this.criteriaBuilder.createQuery(this.targetType);
         this.root = this.criteriaQuery.from(this.targetType);
 
-        this.predicate = predicate;
-        this.orderList = orderList;
-
         this.query = query;
 
         //set up sort settings:

gridcore/src/main/java/me/agno/gridcore/IGrid.java

@@ -1,10 +1,7 @@
 package me.agno.gridcore;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.Predicate;
-import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.*;
 import me.agno.gridcore.columns.GridColumnCollection;
 import me.agno.gridcore.filtering.FilterProcessor;
 import me.agno.gridcore.pagination.IGridPager;
@@ -103,4 +100,6 @@ public interface IGrid<T> extends IGridOptions{
     Class<T> getTargetType();
 
     Predicate getPredicate();
+
+    List<Order> getOrderList();
 }

gridcore/src/main/java/me/agno/gridcore/server/GridServer.java

@@ -25,39 +25,34 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+@Getter
 public class GridServer<T> implements IGridServer<T> {
 
-    @Getter
     protected IGrid<T> grid;
 
     public GridServer()
     { }
 
-    public GridServer(EntityManager entityManager, Class<T> targetType, Predicate predicate, List<Order> orderList,
-                      Map<String, String[]> query, Consumer<IGridColumnCollection<T>> columns) {
-        this(entityManager, targetType, predicate, orderList, query, true, "", columns,
-                0, null);
+    public GridServer(EntityManager entityManager, Class<T> targetType, Map<String, String[]> query,
+                      Consumer<IGridColumnCollection<T>> columns) {
+        this(entityManager, targetType, query, columns,0, null);
     }
 
-    public GridServer(EntityManager entityManager, Class<T> targetType, Predicate predicate, List<Order> orderList,
-                      Map<String, String[]> query, boolean renderOnlyRows,
-                      String gridName, Consumer<IGridColumnCollection<T>> columns, int pageSize) {
-        this(entityManager, targetType, predicate, orderList, query, renderOnlyRows, gridName, columns,
-                pageSize, null);
+    public GridServer(EntityManager entityManager, Class<T> targetType,  Map<String, String[]> query,
+                      Consumer<IGridColumnCollection<T>> columns, int pageSize) {
+        this(entityManager, targetType, query, columns, pageSize, null);
     }
 
-    public GridServer(EntityManager entityManager, Class<T> targetType, Predicate predicate, List<Order> orderList,
-                      Map<String, String[]> query, boolean renderOnlyRows,
-                      String gridName, Consumer<IGridColumnCollection<T>> columns, int pageSize,
-                      IColumnBuilder<T> columnBuilder) {
+    public GridServer(EntityManager entityManager, Class<T> targetType, Map<String, String[]> query,
+                      Consumer<IGridColumnCollection<T>> columns, int pageSize, IColumnBuilder<T> columnBuilder) {
 
         var map = query.entrySet()
                 .stream()
                 .collect(Collectors.toMap(Map.Entry::getKey, entry -> Arrays.asList(entry.getValue())));
 
         var linkedHashMap = new LinkedHashMap<>(map);
 
-        this.grid = new Grid<T>(entityManager, targetType, predicate, orderList, linkedHashMap, columnBuilder);
+        this.grid = new Grid<T>(entityManager, targetType, linkedHashMap, columnBuilder);
 
         if(columns != null)
             columns.accept(this.grid.getColumns());
@@ -205,6 +200,16 @@ public IGridServer<T> setRemoveDiacritics(String removeDiacritics) {
         return this;
     }
 
+    public IGridServer<T> setPredicate(Predicate predicate) {
+        ((Grid<T>)this.grid).setPredicate(predicate);
+        return this;
+    }
+
+    public IGridServer<T> setOrder(List<Order> orderList) {
+        ((Grid<T>)this.grid).setOrderList(orderList);
+        return this;
+    }
+
     public ItemsDTO<T> getItemsToDisplay() {
 
         var items = this.grid.getItemsToDisplay();

gridcore/src/main/java/me/agno/gridcore/server/IGridServer.java

@@ -1,11 +1,14 @@
 package me.agno.gridcore.server;
 
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
 import me.agno.gridcore.IGrid;
 import me.agno.gridcore.IGridColumnCollection;
 import me.agno.gridcore.SearchOptions;
 import me.agno.gridcore.sorting.GridSortMode;
 import me.agno.gridcore.utils.ItemsDTO;
 
+import java.util.List;
 import java.util.function.Consumer;
 
 public interface IGridServer<T> {
@@ -51,6 +54,10 @@ public interface IGridServer<T> {
 
     IGridServer<T> setRemoveDiacritics(String methodName);
 
+    IGridServer<T> setPredicate(Predicate predicate);
+
+    IGridServer<T> setOrder(List<Order> orderList);
+
     ItemsDTO<T> getItemsToDisplay();
 
     IGrid<T> getGrid();