Merge pull request #31 from TAMULib/sprint3-staging-post-sprint-requests

Sprint3 staging post sprint requests

Author: rladdusaw

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

@@ -64,7 +64,7 @@ public ApiResponse remove(@ApiValidatedModel Note note) {
     @ApiMapping("/page")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse page(@ApiData FilteredPageRequest filteredPageRequest) {
-        return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByLastModifiedDesc(filteredPageRequest.getPageRequest()));
+        return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByServiceNameAscLastModifiedDesc(filteredPageRequest.getPageRequest()));
     }
 
 }

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

@@ -31,13 +31,13 @@ public class ServiceController {
     @ApiMapping("/all")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse getAllServices() {
-        return new ApiResponse(SUCCESS, serviceRepo.findAllByOrderByIdDesc());
+        return new ApiResponse(SUCCESS, serviceRepo.findAllByOrderByStatusDescNameAsc());
     }
 
     @ApiMapping("/public")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse getPublicServices() {
-        return new ApiResponse(SUCCESS, serviceRepo.findByIsPublicOrderByIdDesc(true));
+        return new ApiResponse(SUCCESS, serviceRepo.findByIsPublicOrderByStatusDescNameAsc(true));
     }
 
     @ApiMapping("/{id}")

src/main/java/edu/tamu/app/enums/NotificationLocation.java

@@ -2,6 +2,6 @@
 
 public enum NotificationLocation {
 
-    MAIN, CUSHING, MSL, WCL, PSEL, QATAR;
+    MAIN, EVANS, CUSHING, MSL, WCL, PSEL, QATAR;
 
 }

src/main/java/edu/tamu/app/enums/Status.java

@@ -2,6 +2,6 @@
 
 public enum Status {
 
-    UP, DOWN, MAINTENANCE;
+    UP, MAINTENANCE, DOWN;
 
 }

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

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

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

@@ -10,11 +10,11 @@
 
 public interface ServiceRepo extends JpaRepository<Service, Long>, ServiceRepoCustom {
 
-    public List<Service> findByIsPublicOrderByIdDesc(Boolean isPublic);
+    public List<Service> findByIsPublicOrderByStatusDescNameAsc(Boolean isPublic);
 
     public List<Service> findByIsAuto(Boolean isAuto);
 
-    public List<Service> findAllByOrderByIdDesc();
+    public List<Service> findAllByOrderByStatusDescNameAsc();
 
     public Long countByStatus(Status status);
 

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

@@ -34,7 +34,7 @@ public NoteSpecification<Note> getSpecification() {
 
     @JsonIgnore
     public PageRequest getPageRequest() {
-        return new PageRequest(pageNumber - 1, pageSize, new Sort(Sort.Direction.fromString(direction), properties));
+        return new PageRequest(pageNumber > 0 ? pageNumber - 1 : 0, pageSize > 0 ? pageSize : 10, new Sort(Sort.Direction.fromString(direction), properties));
     }
 
     public int getPageNumber() {

src/main/java/edu/tamu/app/service/OverallStatusService.java

@@ -43,7 +43,7 @@ public void updateStatuses() {
             }
         }
 
-        for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublicOrderByIdDesc(true)) {
+        for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublicOrderByStatusDescNameAsc(true)) {
             if (service.getStatus().equals(Status.DOWN)) {
                 publicServicesAreUp = false;
                 break;

src/test/java/controller/ServiceControllerTest.java

@@ -81,8 +81,8 @@ public void setUp() {
         when(credentials.getUin()).thenReturn("123456789");
         when(userRepo.findByUin(any(String.class))).thenReturn(user);
         when(systemMonitorService.getOverallStatus()).thenReturn(new OverallStatus(edu.tamu.app.enums.OverallMessageType.SUCCESS, "Success"));
-        when(serviceRepo.findAllByOrderByIdDesc()).thenReturn(mockServiceList);
-        when(serviceRepo.findByIsPublicOrderByIdDesc(true)).thenReturn(mockPublicServiceList);
+        when(serviceRepo.findAllByOrderByStatusDescNameAsc()).thenReturn(mockServiceList);
+        when(serviceRepo.findByIsPublicOrderByStatusDescNameAsc(true)).thenReturn(mockPublicServiceList);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
         when(serviceRepo.create(any(Service.class))).thenReturn(TEST_SERVICE1);
         when(serviceRepo.update(any(Service.class))).thenReturn(TEST_MODIFIED_SERVICE1);