order of notes, notifications, and service

tamu-sad-iii · tamu-sad-iii · commit 70bda2fa9a94 · 2017-08-16T16:19:52.000-05:00
diff --git a/src/main/java/edu/tamu/app/controller/NoteController.java b/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.findAll(filteredPageRequest.getPageRequest()));
+        return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByLastModifiedDesc(filteredPageRequest.getPageRequest()));
     }
 
 }
diff --git a/src/main/java/edu/tamu/app/controller/NotificationController.java b/src/main/java/edu/tamu/app/controller/NotificationController.java
@@ -34,7 +34,7 @@ public class NotificationController {
     @ApiMapping("/all")
     @Auth(role = "ROLE_STAFF")
     public ApiResponse getAllNotifications() {
-        return new ApiResponse(SUCCESS, notificationRepo.findAll());
+        return new ApiResponse(SUCCESS, notificationRepo.findAllByOrderByIdDesc());
     }
 
     @ApiMapping("/{id}")
diff --git a/src/main/java/edu/tamu/app/controller/ServiceController.java b/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.findAll());
+        return new ApiResponse(SUCCESS, serviceRepo.findAllByOrderByIdDesc());
     }
 
     @ApiMapping("/public")
     @Auth(role = "ROLE_ANONYMOUS")
     public ApiResponse getPublicServices() {
-        return new ApiResponse(SUCCESS, serviceRepo.findByIsPublic(true));
+        return new ApiResponse(SUCCESS, serviceRepo.findByIsPublicOrderByIdDesc(true));
     }
 
     @ApiMapping("/{id}")
diff --git a/src/main/java/edu/tamu/app/job/ProcessSchedules.java b/src/main/java/edu/tamu/app/job/ProcessSchedules.java
@@ -35,7 +35,7 @@ public class ProcessSchedules {
     @Autowired
     private SimpMessagingTemplate simpMessagingTemplate;
 
-    @Scheduled(cron = "5 0/5 * * * ?")
+    @Scheduled(cron = "5 0/1 * * * ?")
     private void checkSchedules() {
 
         Date date = new Date();
@@ -48,6 +48,9 @@ private void checkSchedules() {
             scheduler.setWithinSchedule(false);
             scheduler = abstractSchedulerRepo.save(scheduler);
             logger.info("Ending schedule for " + scheduler);
+            scheduler.removeSchedule(schedule);
+            scheduler = abstractSchedulerRepo.save(scheduler);
+            scheduleRepo.delete(schedule);
             broadcastUpdate(scheduler);
         });
 
diff --git a/src/main/java/edu/tamu/app/model/repo/NoteRepo.java b/src/main/java/edu/tamu/app/model/repo/NoteRepo.java
@@ -15,9 +15,7 @@ public interface NoteRepo extends JpaRepository<Note, Long>, NoteRepoCustom, Jpa
 
     public Page<Note> findAll(Specification<Note> specification, Pageable pageable);
 
-    public List<Note> findAll(Specification<Note> specification);
-
-    public Page<Note> findAll(Pageable pageable);
+    public Page<Note> findAllByOrderByLastModifiedDesc(Pageable pageable);
 
     public List<Note> findAllByServiceId(Long id);
 
diff --git a/src/main/java/edu/tamu/app/model/repo/NotificationRepo.java b/src/main/java/edu/tamu/app/model/repo/NotificationRepo.java
@@ -10,9 +10,11 @@
 
 public interface NotificationRepo extends JpaRepository<Notification, Long>, NotificationRepoCustom {
 
-    public List<Notification> findByActiveTrue();
+    public List<Notification> findAllByOrderByIdDesc();
 
-    public List<Notification> findByActiveTrueAndLocations(NotificationLocation location);
+    public List<Notification> findByActiveTrueOrderByIdDesc();
+
+    public List<Notification> findByActiveTrueAndLocationsOrderByIdDesc(NotificationLocation location);
 
     public void delete(Notification notification);
 
diff --git a/src/main/java/edu/tamu/app/model/repo/ServiceRepo.java b/src/main/java/edu/tamu/app/model/repo/ServiceRepo.java
@@ -10,9 +10,11 @@
 
 public interface ServiceRepo extends JpaRepository<Service, Long>, ServiceRepoCustom {
 
-    public List<Service> findByIsPublic(Boolean isPublic);
+    public List<Service> findByIsPublicOrderByIdDesc(Boolean isPublic);
 
     public List<Service> findByIsAuto(Boolean isAuto);
+    
+    public List<Service> findAllByOrderByIdDesc();
 
     public Long countByStatus(Status status);
 
diff --git a/src/main/java/edu/tamu/app/model/repo/impl/NotificationRepoImpl.java b/src/main/java/edu/tamu/app/model/repo/impl/NotificationRepoImpl.java
@@ -50,10 +50,10 @@ public void delete(Notification notification) {
     public List<Notification> activeNotificationsByLocation(String location) {
         List<Notification> notifications = new ArrayList<Notification>();
         if (location.equals("ALL")) {
-            notifications = notificationRepo.findByActiveTrue();
+            notifications = notificationRepo.findByActiveTrueOrderByIdDesc();
         } else {
             try {
-                notifications = notificationRepo.findByActiveTrueAndLocations(NotificationLocation.valueOf(location));
+                notifications = notificationRepo.findByActiveTrueAndLocationsOrderByIdDesc(NotificationLocation.valueOf(location));
             } catch (IllegalArgumentException e) {
 
             }
diff --git a/src/main/java/edu/tamu/app/model/repo/specification/NoteSpecification.java b/src/main/java/edu/tamu/app/model/repo/specification/NoteSpecification.java
@@ -50,6 +50,8 @@ public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuild
             }
 
         }
+        
+        query.orderBy(cb.desc(root.get("lastModified")));
 
         Predicate predicate;
 
diff --git a/src/main/java/edu/tamu/app/service/OverallStatusService.java b/src/main/java/edu/tamu/app/service/OverallStatusService.java
@@ -43,7 +43,7 @@ public void updateStatuses() {
             }
         }
 
-        for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublic(true)) {
+        for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublicOrderByIdDesc(true)) {
             if (service.getStatus().equals(Status.DOWN)) {
                 publicServicesAreUp = false;
                 break;
diff --git a/src/test/java/controller/ServiceControllerTest.java b/src/test/java/controller/ServiceControllerTest.java
@@ -82,7 +82,7 @@ public void setUp() {
         when(userRepo.findByUin(any(String.class))).thenReturn(user);
         when(systemMonitorService.getOverallStatus()).thenReturn(new OverallStatus(edu.tamu.app.enums.OverallMessageType.SUCCESS, "Success"));
         when(serviceRepo.findAll()).thenReturn(mockServiceList);
-        when(serviceRepo.findByIsPublic(true)).thenReturn(mockPublicServiceList);
+        when(serviceRepo.findByIsPublicOrderByIdDesc(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);
diff --git a/src/test/java/edu/tamu/app/model/AppUserTest.java b/src/test/java/edu/tamu/app/model/AppUserTest.java
@@ -10,13 +10,15 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import edu.tamu.app.WebServerInit;
 import edu.tamu.app.model.repo.AppUserRepo;
 
 @WebAppConfiguration
+@ActiveProfiles("test")
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { WebServerInit.class })
 public class AppUserTest {
diff --git a/src/test/java/edu/tamu/app/model/NoteTest.java b/src/test/java/edu/tamu/app/model/NoteTest.java
@@ -12,6 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
@@ -24,6 +25,7 @@
 import edu.tamu.framework.model.Credentials;
 
 @WebAppConfiguration
+@ActiveProfiles("test")
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { WebServerInit.class })
 public class NoteTest {
diff --git a/src/test/java/edu/tamu/app/model/NotificationTest.java b/src/test/java/edu/tamu/app/model/NotificationTest.java
@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
@@ -19,6 +20,7 @@
 import edu.tamu.app.model.repo.NotificationRepo;
 
 @WebAppConfiguration
+@ActiveProfiles("test")
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { WebServerInit.class })
 public class NotificationTest {
diff --git a/src/test/java/edu/tamu/app/model/ServiceTest.java b/src/test/java/edu/tamu/app/model/ServiceTest.java
@@ -12,6 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
@@ -22,6 +23,7 @@
 import edu.tamu.app.model.repo.ServiceRepo;
 
 @WebAppConfiguration
+@ActiveProfiles("test")
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { WebServerInit.class })
 public class ServiceTest {
diff --git a/src/test/java/edu/tamu/app/model/impl/ShibTest.java b/src/test/java/edu/tamu/app/model/impl/ShibTest.java
@@ -10,13 +10,15 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import edu.tamu.app.WebServerInit;
 import edu.tamu.framework.model.Credentials;
 
 @WebAppConfiguration
+@ActiveProfiles("test")
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { WebServerInit.class })
 public class ShibTest {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public ApiResponse remove(@ApiValidatedModel Note note) {`
`64`	`64`	`@ApiMapping("/page")`
`65`	`65`	`@Auth(role = "ROLE_ANONYMOUS")`
`66`	`66`	`public ApiResponse page(@ApiData FilteredPageRequest filteredPageRequest) {`
`67`		`- return new ApiResponse(SUCCESS, noteRepo.findAll(filteredPageRequest.getPageRequest()));`
	`67`	`+ return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByLastModifiedDesc(filteredPageRequest.getPageRequest()));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class NotificationController {`
`34`	`34`	`@ApiMapping("/all")`
`35`	`35`	`@Auth(role = "ROLE_STAFF")`
`36`	`36`	`public ApiResponse getAllNotifications() {`
`37`		`- return new ApiResponse(SUCCESS, notificationRepo.findAll());`
	`37`	`+ return new ApiResponse(SUCCESS, notificationRepo.findAllByOrderByIdDesc());`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@ApiMapping("/{id}")`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ public class ServiceController {`
`31`	`31`	`@ApiMapping("/all")`
`32`	`32`	`@Auth(role = "ROLE_ANONYMOUS")`
`33`	`33`	`public ApiResponse getAllServices() {`
`34`		`- return new ApiResponse(SUCCESS, serviceRepo.findAll());`
	`34`	`+ return new ApiResponse(SUCCESS, serviceRepo.findAllByOrderByIdDesc());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@ApiMapping("/public")`
`38`	`38`	`@Auth(role = "ROLE_ANONYMOUS")`
`39`	`39`	`public ApiResponse getPublicServices() {`
`40`		`- return new ApiResponse(SUCCESS, serviceRepo.findByIsPublic(true));`
	`40`	`+ return new ApiResponse(SUCCESS, serviceRepo.findByIsPublicOrderByIdDesc(true));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@ApiMapping("/{id}")`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public Predicate toPredicate(Root<E> root, CriteriaQuery<?> query, CriteriaBuild`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ query.orderBy(cb.desc(root.get("lastModified")));`
`53`	`55`
`54`	`56`	`Predicate predicate;`
`55`	`57`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public void updateStatuses() {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublic(true)) {`
	`46`	`+ for (edu.tamu.app.model.Service service : serviceRepo.findByIsPublicOrderByIdDesc(true)) {`
`47`	`47`	`if (service.getStatus().equals(Status.DOWN)) {`
`48`	`48`	`publicServicesAreUp = false;`
`49`	`49`	`break;`