redesigned filtered page request

Author: tamu-sad-iii

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

@@ -4,19 +4,13 @@
 import static edu.tamu.framework.enums.BusinessValidationType.CREATE;
 import static edu.tamu.framework.enums.BusinessValidationType.EXISTS;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import edu.tamu.app.model.Note;
 import edu.tamu.app.model.Service;
@@ -40,6 +34,9 @@ public class NoteController {
     @Autowired
     private NoteRepo noteRepo;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @ApiMapping("/all")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse getAllNotes() {
@@ -82,27 +79,14 @@ public ApiResponse remove(@ApiValidatedModel Note note) {
 
     @ApiMapping("/page")
     @Auth(role = "ROLE_ANONYMOUS")
-    public ApiResponse page(@ApiData JsonNode dataNode) {
-        Direction sortDirection;
-        if (dataNode.get("direction").get("direction").asText().equals("ASC")) {
-            sortDirection = Sort.Direction.ASC;
-        } else {
-            sortDirection = Sort.Direction.DESC;
+    public ApiResponse page(@ApiData FilteredPageRequest filteredPageRequest) {
+        try {
+            System.out.println("\n" + objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(filteredPageRequest) + "\n");
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
         }
-        Map<String, String[]> filters = new HashMap<String, String[]>();
-        filters.put("title", arrayNodeToStringArray((ArrayNode) dataNode.get("filters").get("title")));
-        FilteredPageRequest filteredPageRequest = new FilteredPageRequest(dataNode.get("page").get("number").asInt(), dataNode.get("page").get("size").asInt(), sortDirection, dataNode.get("direction").get("properties").asText(), filters);
-        Page<Note> notes = noteRepo.findAll(filteredPageRequest);
+        Page<Note> notes = noteRepo.findAll(filteredPageRequest.toPageRequest());
         return new ApiResponse(SUCCESS, notes);
     }
 
-    private String[] arrayNodeToStringArray(ArrayNode arrayNode) {
-        String[] array = new String[arrayNode.size()];
-        Iterator<JsonNode> arrayIterator = arrayNode.elements();
-        int i = 0;
-        while (arrayIterator.hasNext()) {
-            array[i++] = arrayIterator.next().asText();
-        }
-        return array;
-    }
 }

src/main/java/edu/tamu/app/model/Note.java

@@ -1,5 +1,6 @@
 package edu.tamu.app.model;
 
+import static javax.persistence.CascadeType.MERGE;
 import static javax.persistence.CascadeType.REFRESH;
 import static javax.persistence.FetchType.EAGER;
 
@@ -41,7 +42,7 @@ public class Note extends BaseEntity {
     @UpdateTimestamp
     private Calendar lastModified;
 
-    @ManyToOne(fetch = EAGER)
+    @ManyToOne(fetch = EAGER, cascade = MERGE)
     private Service service;
 
     @ManyToOne(cascade = REFRESH, optional = false)

src/main/java/edu/tamu/app/model/repo/impl/NoteRepoImpl.java

@@ -34,7 +34,7 @@ public Note create(Note note, Credentials credentials) {
     @Override
     public Note update(Note note) {
         note = noteRepo.save(note);
-        simpMessagingTemplate.convertAndSend("/channel/note/" + note.getId(), new ApiResponse(SUCCESS, note));
+        simpMessagingTemplate.convertAndSend("/channel/note/update", new ApiResponse(SUCCESS, note));
         return note;
     }
 

src/main/java/edu/tamu/app/model/repo/impl/ServiceRepoImpl.java

@@ -38,7 +38,7 @@ public Service create(String name, Status status, Boolean isAuto, Boolean isPubl
     @Override
     public Service update(Service service) {
         service = serviceRepo.save(service);
-        simpMessagingTemplate.convertAndSend("/channel/service/" + service.getId(), new ApiResponse(SUCCESS, service));
+        simpMessagingTemplate.convertAndSend("/channel/service/update", new ApiResponse(SUCCESS, service));
         sendStatusUpdate();
         return service;
     }

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

@@ -1,22 +1,61 @@
 package edu.tamu.app.model.request;
 
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 
-public class FilteredPageRequest extends PageRequest {
+public class FilteredPageRequest {
+
+    private int pageNumber;
+
+    private int pageSize;
+
+    private String direction;
+
+    private List<String> properties;
 
-    private static final long serialVersionUID = -190530029013941566L;
     private Map<String, String[]> filters;
-    
+
     public FilteredPageRequest() {
-        super(0, 2);
+
+    }
+
+    public PageRequest toPageRequest() {
+        return new PageRequest(pageNumber, pageSize, new Sort(Sort.Direction.fromString(direction), properties));
+    }
+
+    public int getPageNumber() {
+        return pageNumber;
+    }
+
+    public void setPageNumber(int pageNumber) {
+        this.pageNumber = pageNumber;
     }
-    
-    public FilteredPageRequest(int page, int size, Sort.Direction direction, String properties, Map<String, String[]> filters) {
-        super(page, size, direction, properties);
-        setFilters(filters);
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    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 void setProperties(List<String> properties) {
+        this.properties = properties;
     }
 
     public Map<String, String[]> getFilters() {
@@ -26,4 +65,5 @@ public Map<String, String[]> getFilters() {
     public void setFilters(Map<String, String[]> filters) {
         this.filters = filters;
     }
+
 }