order services by status and name

Author: tamu-sad-iii

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/Status.java

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

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/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);