Merge pull request #30 from TAMULib/sprint3-post-demo-requests

post demo 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.findAll(filteredPageRequest.getPageRequest()));
+        return new ApiResponse(SUCCESS, noteRepo.findAllByOrderByLastModifiedDesc(filteredPageRequest.getPageRequest()));
     }
 
 }

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}")
@@ -68,7 +68,7 @@ public ApiResponse remove(@ApiValidatedModel Notification notification) {
     @SkipAop
     @RequestMapping("/notification/active")
     public String getActiveNotifications(@RequestParam(value = "location", defaultValue = "ALL") String location) {
-        return buildNotificationHtml(notificationRepo.activeNotificationsByLocation(location));
+        return buildNotificationHtml(notificationRepo.activeNotificationsByLocation(location.toUpperCase()));
     }
 
     private String buildNotificationHtml(List<Notification> notifications) {

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}")

…a/edu/tamu/app/job/ProcessSchedules.java …va/edu/tamu/app/job/UpdateSchedules.javasrc/main/java/edu/tamu/app/job/ProcessSchedules.java renamed to src/main/java/edu/tamu/app/job/UpdateSchedules.java src/main/java/edu/tamu/app/job/ProcessSchedules.java renamed to src/main/java/edu/tamu/app/job/UpdateSchedules.java

@@ -19,9 +19,9 @@
 import edu.tamu.framework.model.ApiResponse;
 
 @Service
-public class ProcessSchedules {
+public class UpdateSchedules {
 
-    private Logger logger = LoggerFactory.getLogger(ProcessSchedules.class);
+    private Logger logger = LoggerFactory.getLogger(UpdateSchedules.class);
 
     @Autowired
     private ScheduleRepo scheduleRepo;
@@ -35,8 +35,16 @@ public class ProcessSchedules {
     @Autowired
     private SimpMessagingTemplate simpMessagingTemplate;
 
-    @Scheduled(cron = "5 0/5 * * * ?")
-    private void checkSchedules() {
+    @Scheduled(cron = "5 0/1 * * * ?")
+    private void updateSchedules() {
+
+        updateEndingSchedules();
+
+        updateStartingSchedules();
+
+    }
+
+    private synchronized void updateEndingSchedules() {
 
         Date date = new Date();
         Long now = date.getTime();
@@ -48,9 +56,19 @@ 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);
         });
 
+    }
+
+    private synchronized void updateStartingSchedules() {
+
+        Date date = new Date();
+        Long now = date.getTime();
+
         logger.info("Checking for starting schedules");
         scheduleRepo.findByScheduledPostingStartLessThanEqualAndScheduledPostingEndGreaterThanEqualAndSchedulerWithinScheduleFalse(now, now).forEach(schedule -> {
             AbstractScheduler scheduler = schedule.getScheduler();

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

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

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

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) {
 
             }

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;
 

src/main/java/edu/tamu/app/model/validation/NotificationValidator.java

@@ -14,7 +14,7 @@ public NotificationValidator() {
         String bodyProperty = "body";
         this.addInputValidator(new InputValidator(InputValidationType.required, "Notifications require a body", bodyProperty, true));
         this.addInputValidator(new InputValidator(InputValidationType.minlength, "Notification body must be at least 3 characters", bodyProperty, 3));
-        this.addInputValidator(new InputValidator(InputValidationType.maxlength, "Notifications must be no more than 140 cahracters", bodyProperty, 140));
+        this.addInputValidator(new InputValidator(InputValidationType.maxlength, "Notifications must be no more than 5000 cahracters", bodyProperty, 5000));
 
         String locationsProperty = "locations";
         this.addInputValidator(new InputValidator(InputValidationType.required, "Notifications must have a display location", locationsProperty, true));