Merge pull request #34 from TAMULib/note-filtering

ability to filter and sort note page requests

Author: jcreel

src/main/java/edu/tamu/app/controller/NoteController.java

@@ -28,7 +28,7 @@ public class NoteController {
     @Autowired
     private NoteRepo noteRepo;
 
-    @ApiMapping("/query")
+    @ApiMapping("/page")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse getAllNotesByService(@ApiData FilteredPageRequest filteredPageRequest) {
         return new ApiResponse(SUCCESS, noteRepo.findAll(filteredPageRequest.getSpecification(), filteredPageRequest.getPageRequest()));
@@ -61,10 +61,4 @@ public ApiResponse remove(@ApiValidatedModel Note note) {
         return new ApiResponse(SUCCESS);
     }
 
-    @ApiMapping("/page")
-    @Auth(role = "ROLE_ANONYMOUS")
-    public ApiResponse page(@ApiData FilteredPageRequest filteredPageRequest) {
-        return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByServiceNameAscLastModifiedDesc(filteredPageRequest.getPageRequest()));
-    }
-
 }

src/main/java/edu/tamu/app/model/repo/NoteRepo.java

@@ -15,8 +15,6 @@ public interface NoteRepo extends JpaRepository<Note, Long>, NoteRepoCustom, Jpa
 
     public Page<Note> findAll(Specification<Note> specification, Pageable pageable);
 
-    public Page<Note> findAllByOrderByServiceNameAscLastModifiedDesc(Pageable pageable);
-
     public List<Note> findAllByServiceId(Long id);
 
     public void delete(Note note);

src/main/java/edu/tamu/app/model/repo/specification/NoteSpecification.java

@@ -22,7 +22,7 @@ public NoteSpecification(Map<String, String[]> filters) {
     @Override
     public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 
-        List<Predicate> activeOrPinnedPredicates = new ArrayList<Predicate>();
+        List<Predicate> activeAndPinnedPredicates = new ArrayList<Predicate>();
         List<Predicate> servicePredicates = new ArrayList<Predicate>();
 
         for (Map.Entry<String, String[]> entry : filters.entrySet()) {
@@ -32,12 +32,12 @@ public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuild
             switch (key) {
             case "active":
                 for (String value : values) {
-                    activeOrPinnedPredicates.add(cb.like(cb.lower(root.get(key).as(String.class)), "%" + value.toLowerCase() + "%"));
+                    activeAndPinnedPredicates.add(cb.like(cb.lower(root.get(key).as(String.class)), "%" + value.toLowerCase() + "%"));
                 }
                 break;
             case "pinned":
                 for (String value : values) {
-                    activeOrPinnedPredicates.add(cb.like(cb.lower(root.get(key).as(String.class)), "%" + value.toLowerCase() + "%"));
+                    activeAndPinnedPredicates.add(cb.like(cb.lower(root.get(key).as(String.class)), "%" + value.toLowerCase() + "%"));
                 }
                 break;
             case "service":
@@ -50,13 +50,13 @@ public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuild
             }
 
         }
-        
+
         query.orderBy(cb.desc(root.get("lastModified")));
 
         Predicate predicate;
 
-        if (activeOrPinnedPredicates.size() > 0) {
-            predicate = cb.and(cb.or(activeOrPinnedPredicates.toArray(new Predicate[activeOrPinnedPredicates.size()])), cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()])));
+        if (activeAndPinnedPredicates.size() > 0) {
+            predicate = cb.and(cb.and(activeAndPinnedPredicates.toArray(new Predicate[activeAndPinnedPredicates.size()])), cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()])));
         } else {
             predicate = cb.and(servicePredicates.toArray(new Predicate[servicePredicates.size()]));
         }

src/main/java/edu/tamu/app/model/request/DirectionSort.java

@@ -0,0 +1,37 @@
+package edu.tamu.app.model.request;
+
+import org.springframework.data.domain.Sort;
+
+public class DirectionSort {
+
+    private String property;
+
+    private Sort.Direction direction;
+
+    public DirectionSort() {
+
+    }
+
+    public DirectionSort(String property, Sort.Direction direction) {
+        this();
+        this.property = property;
+        this.direction = direction;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
+    }
+
+    public Sort.Direction getDirection() {
+        return direction;
+    }
+
+    public void setDirection(Sort.Direction direction) {
+        this.direction = direction;
+    }
+
+}

src/main/java/edu/tamu/app/model/request/FilteredPageRequest.java

@@ -1,5 +1,7 @@
 package edu.tamu.app.model.request;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -17,14 +19,13 @@ public class FilteredPageRequest {
 
     private int pageSize;
 
-    private String direction;
-
-    private List<String> properties;
+    private List<DirectionSort> sort;
 
     private Map<String, String[]> filters;
 
     public FilteredPageRequest() {
-
+        sort = new ArrayList<DirectionSort>();
+        filters = new HashMap<String, String[]>();
     }
 
     @JsonIgnore
@@ -34,7 +35,14 @@ public NoteSpecification<Note> getSpecification() {
 
     @JsonIgnore
     public PageRequest getPageRequest() {
-        return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10, new Sort(Sort.Direction.fromString(direction), properties));
+        List<Sort.Order> orders = new ArrayList<Sort.Order>();
+        if (orders.isEmpty()) {
+            return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10);
+        }
+        sort.forEach(sort -> {
+            orders.add(new Sort.Order(sort.getDirection(), sort.getProperty()));
+        });
+        return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10, new Sort(orders));
     }
 
     public int getPageNumber() {
@@ -53,20 +61,12 @@ public void setPageSize(int pageSize) {
         this.pageSize = pageSize;
     }
 
-    public String getDirection() {
-        return direction;
-    }
-
-    public void setDirection(String direction) {
-        this.direction = direction;
-    }
-
-    public List<String> getProperties() {
-        return properties;
+    public List<DirectionSort> getSort() {
+        return sort;
     }
 
-    public void setProperties(List<String> properties) {
-        this.properties = properties;
+    public void setSort(List<DirectionSort> sort) {
+        this.sort = sort;
     }
 
     public Map<String, String[]> getFilters() {

src/main/resources/application.properties

@@ -54,7 +54,7 @@ app.reporting.address: report@mailinator.com
 # required in framework
 app.model.packages: edu.tamu.app.model
 
-app.authority.admins: 123456789, 990000081, 523008230, 512004707, 613001223
+app.authority.admins: 123456789, 990000081, 523008230, 512004707, 613001223, 402001311
 
 app.ui.host: http://localhost/status-system