Merge pull request #25 from TAMULib/sprint3-B03243-schedulability-merge

schedulibility merge

Author: rladdusaw

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

@@ -32,63 +32,63 @@ public class NotificationController {
 
     @Autowired
     private NotificationRepo notificationRepo;
-    
+
     @ApiMapping("/all")
-    @Auth(role="ROLE_STAFF")
+    @Auth(role = "ROLE_STAFF")
     public ApiResponse getAllNotifications() {
         return new ApiResponse(SUCCESS, notificationRepo.findAll());
     }
-    
+
     @ApiMapping("/{id}")
-    @Auth(role="ROLE_STAFF")
+    @Auth(role = "ROLE_STAFF")
     public ApiResponse getNotification(@ApiVariable Long id) {
         return new ApiResponse(SUCCESS, notificationRepo.findOne(id));
     }
-    
+
     @ApiMapping("/create")
-    @Auth(role="ROLE_WEB_MANAGER")
+    @Auth(role = "ROLE_WEB_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
     public ApiResponse create(@ApiValidatedModel Notification notification) {
-        notification = notificationRepo.create(notification.getName(), notification.getBody(), notification.getIsActive(), notification.getLocations());
+        notification = notificationRepo.create(notification);
         return new ApiResponse(SUCCESS, notification);
     }
-    
+
     @ApiMapping("/update")
-    @Auth(role="ROLE_WEB_MANAGER")
+    @Auth(role = "ROLE_WEB_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = UPDATE), @ApiValidation.Business(value = NONEXISTS) })
     public ApiResponse update(@ApiValidatedModel Notification notification) {
         notification = notificationRepo.update(notification);
         return new ApiResponse(SUCCESS, notification);
     }
-    
+
     @ApiMapping("/remove")
-    @Auth(role="ROLE_WEB_MANAGER")
+    @Auth(role = "ROLE_WEB_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = DELETE), @ApiValidation.Business(value = NONEXISTS) })
     public ApiResponse remove(@ApiValidatedModel Notification notification) {
         notificationRepo.delete(notification);
         return new ApiResponse(SUCCESS);
     }
-    
+
     @SkipAop
     @RequestMapping("/notification/active")
     public String getActiveNotifications(@RequestParam(value = "location", defaultValue = "ALL") String locationString) {
         String notificationString = "";
         List<Notification> notificationList;
         if (locationString.equals("ALL")) {
-            notificationList = notificationRepo.findByIsActive(true);
+            notificationList = notificationRepo.findByActive(true);
         } else {
             try {
                 NotificationLocation location = NotificationLocation.valueOf(locationString);
-                notificationList = notificationRepo.findByIsActiveAndLocations(true, location);
+                notificationList = notificationRepo.findByActiveAndLocations(true, location);
             } catch (IllegalArgumentException e) {
                 notificationList = new ArrayList<Notification>();
             }
         }
         for (Notification notification : notificationList) {
             notificationString += "<p>" + notification.getBody() + "</p>";
         }
-        
+
         return notificationString;
     }
-    
+
 }

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

@@ -50,7 +50,7 @@ public ApiResponse getService(@ApiVariable Long id) {
     @Auth(role = "ROLE_SERVICE_MANAGER")
     @ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
     public ApiResponse createService(@ApiValidatedModel Service service, @ApiCredentials Credentials credentials) {
-        service = serviceRepo.create(service.getName(), service.getStatus(), service.getIsAuto(), service.getIsPublic(), service.getOnShortList(), service.getServiceUrl(), service.getDescription());
+        service = serviceRepo.create(service);
         return new ApiResponse(SUCCESS, service);
     }
 

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

@@ -0,0 +1,64 @@
+package edu.tamu.app.model;
+
+import static javax.persistence.FetchType.EAGER;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.OneToMany;
+
+import org.hibernate.annotations.Fetch;
+
+import edu.tamu.framework.model.BaseEntity;
+
+import static javax.persistence.InheritanceType.JOINED;
+import static org.hibernate.annotations.FetchMode.SELECT;
+
+@Entity
+@Inheritance(strategy = JOINED)
+public abstract class AbstractScheduler extends BaseEntity implements Scheduler {
+
+    @OneToMany(fetch = EAGER, cascade = { CascadeType.ALL }, orphanRemoval = true)
+    @Fetch(value = SELECT)
+    private List<Schedule> schedules;
+
+    @Column(nullable = false)
+    private Boolean withinSchedule;
+
+    public AbstractScheduler() {
+        super();
+        setSchedules(new ArrayList<Schedule>());
+        setWithinSchedule(false);
+    }
+
+    public List<Schedule> getSchedules() {
+        return schedules;
+    }
+
+    public void setSchedules(List<Schedule> schedules) {
+        this.schedules = schedules;
+    }
+
+    public void addSchedule(Schedule schedule) {
+        this.schedules.add(schedule);
+    }
+
+    public void removeSchedule(Schedule schedule) {
+        this.schedules.remove(schedule);
+    }
+
+    public Boolean getWithinSchedule() {
+        return withinSchedule;
+    }
+
+    public void setWithinSchedule(Boolean withinSchedule) {
+        this.withinSchedule = withinSchedule;
+    }
+
+    public abstract String getType();
+
+}

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

@@ -1,12 +1,3 @@
-/* 
- * AppUser.java 
- * 
- * Version: 
- *     $Id$ 
- * 
- * Revisions: 
- *     $Log$ 
- */
 package edu.tamu.app.model;
 
 import java.util.ArrayList;
@@ -18,6 +9,8 @@
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
@@ -35,9 +28,9 @@
  */
 @Entity
 public class AppUser extends AbstractCoreUser {
-    
+
     private static final long serialVersionUID = -4974106399870286015L;
-    
+
     @Column(name = "role")
     private AppRole role;
 
@@ -57,8 +50,9 @@ public class AppUser extends AbstractCoreUser {
 
     @Column(nullable = true)
     private String lastName;
-    
+
     @OneToMany(fetch = FetchType.EAGER)
+    @Fetch(FetchMode.SELECT)
     private List<Note> notes;
 
     /**
@@ -97,7 +91,7 @@ public AppUser(String email, String firstName, String lastName, String role) {
         setLastName(lastName);
         setRole(AppRole.valueOf(role));
     }
-    
+
     /**
      * @return the role
      */
@@ -107,7 +101,8 @@ public IRole getRole() {
     }
 
     /**
-     * @param role the role to set
+     * @param role
+     *            the role to set
      */
     @JsonSerialize(as = AppRole.class)
     public void setRole(IRole role) {
@@ -193,9 +188,7 @@ public String getLastName() {
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
-    
-    
-    
+
     public List<Note> getNotes() {
         return notes;
     }
@@ -209,31 +202,31 @@ public void setNotes(List<Note> notes) {
     public boolean isAccountNonExpired() {
         return false;
     }
-    
+
     @Override
     @JsonIgnore
     public boolean isAccountNonLocked() {
         return false;
     }
-    
+
     @Override
     @JsonIgnore
     public boolean isCredentialsNonExpired() {
         return false;
     }
-    
+
     @Override
     @JsonIgnore
     public String getUsername() {
         return getUin();
     }
-    
+
     @Override
     @JsonIgnore
     public boolean isEnabled() {
         return true;
     }
-    
+
     @Override
     @JsonIgnore
     public Collection<? extends GrantedAuthority> getAuthorities() {

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

@@ -5,6 +5,7 @@
 import static javax.persistence.FetchType.EAGER;
 
 import java.util.Calendar;
+import java.util.Map;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,10 +19,9 @@
 
 import edu.tamu.app.enums.NoteType;
 import edu.tamu.app.model.validation.NoteValidator;
-import edu.tamu.framework.model.BaseEntity;
 
 @Entity
-public class Note extends BaseEntity {
+public class Note extends AbstractScheduler {
 
     @Column(nullable = false)
     private String title;
@@ -33,27 +33,26 @@ public class Note extends BaseEntity {
     private String body;
 
     @Column(nullable = false)
-    private boolean pinned;
+    private Boolean pinned;
 
-    @Temporal(TemporalType.DATE)
-    private Calendar scheduledPostingStart;
-
-    @Temporal(TemporalType.DATE)
-    private Calendar scheduledPostingEnd;
+    @Column(nullable = false)
+    private Boolean active;
 
     @Temporal(TemporalType.TIMESTAMP)
     @UpdateTimestamp
     private Calendar lastModified;
 
-    @ManyToOne(fetch = EAGER, cascade = MERGE)
+    @ManyToOne(fetch = EAGER, cascade = MERGE, optional = false)
     private Service service;
 
     @ManyToOne(cascade = REFRESH, optional = false)
     private AppUser author;
 
     public Note() {
-        setPinned(false);
+        super();
         setModelValidator(new NoteValidator());
+        setPinned(false);
+        setActive(false);
         setService(new Service());
     }
 
@@ -106,28 +105,20 @@ public void setBody(String body) {
         this.body = body;
     }
 
-    public boolean isPinned() {
+    public Boolean getPinned() {
         return pinned;
     }
 
-    public void setPinned(boolean pinned) {
+    public void setPinned(Boolean pinned) {
         this.pinned = pinned;
     }
 
-    public Calendar getScheduledPostingStart() {
-        return scheduledPostingStart;
-    }
-
-    public void setScheduledPostingStart(Calendar scheduledPostingStart) {
-        this.scheduledPostingStart = scheduledPostingStart;
-    }
-
-    public Calendar getScheduledPostingEnd() {
-        return scheduledPostingEnd;
+    public Boolean getActive() {
+        return active;
     }
 
-    public void setScheduledPostingEnd(Calendar scheduledPostingEnd) {
-        this.scheduledPostingEnd = scheduledPostingEnd;
+    public void setActive(Boolean active) {
+        this.active = active;
     }
 
     public Calendar getLastModified() {
@@ -145,4 +136,20 @@ public AppUser getAuthor() {
     public void setAuthor(AppUser author) {
         this.author = author;
     }
+
+    @Override
+    public String getType() {
+        return "note";
+    }
+
+    @Override
+    public void scheduleStart(Map<String, String> scheduleData) {
+        setActive(true);
+    }
+
+    @Override
+    public void scheduleEnd(Map<String, String> scheduleData) {
+        setActive(false);
+    }
+
 }