Merge pull request #9 from TAMULib/sprint1-onetomany-services

Converted service/note relation from ManyToMany to OneToMany

Author: jcreel

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

@@ -5,24 +5,17 @@
 import static javax.persistence.FetchType.EAGER;
 
 import java.util.Calendar;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.Size;
 
 import org.hibernate.annotations.UpdateTimestamp;
 
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonIdentityReference;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
 import edu.tamu.app.enums.NoteType;
 import edu.tamu.app.model.validation.NoteValidator;
 import edu.tamu.framework.model.BaseEntity;
@@ -34,10 +27,8 @@ public class Note extends BaseEntity {
     @Column(nullable = false)
     private String title;
 
-    @ManyToMany(fetch = EAGER, cascade = { REFRESH, MERGE })
-    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, scope = Service.class, property = "id")
-    @JsonIdentityReference(alwaysAsId = true)
-    private Set<Service> services;
+    @ManyToOne(fetch = EAGER, cascade = MERGE)
+    private Service service;
 
     private NoteType noteType;
 
@@ -59,7 +50,7 @@ public class Note extends BaseEntity {
 
     public Note() {
         setModelValidator(new NoteValidator());
-        setServices(new HashSet<Service>());
+        setService(new Service());
     }
 
     public Note(String title, AppUser author) {
@@ -74,9 +65,9 @@ public Note(String title, AppUser author, NoteType noteType, String body) {
         setBody(body);
     }
 
-    public Note(String title, AppUser author, NoteType noteType, String body, Set<Service> services) {
+    public Note(String title, AppUser author, NoteType noteType, String body, Service service) {
         this(title, author, noteType, body);
-        setServices(services);
+        setService(service);
     }
 
     public String getTitle() {
@@ -87,16 +78,12 @@ public void setTitle(String title) {
         this.title = title;
     }
 
-    public Set<Service> getServices() {
-        return services;
-    }
-
-    public void setServices(Set<Service> services) {
-        this.services = services;
+    public Service getService() {
+        return service;
     }
 
-    public void removeService(Service service) {
-        this.services.remove(service);
+    public void setService(Service service) {
+        this.service = service;
     }
 
     public NoteType getNoteType() {

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

@@ -1,7 +1,5 @@
 package edu.tamu.app.model;
 
-import static javax.persistence.CascadeType.DETACH;
-import static javax.persistence.CascadeType.PERSIST;
 import static javax.persistence.CascadeType.REFRESH;
 import static javax.persistence.CascadeType.REMOVE;
 import static javax.persistence.FetchType.EAGER;
@@ -14,12 +12,16 @@
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.validation.constraints.Size;
 
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 import edu.tamu.app.enums.Status;
 import edu.tamu.app.model.validation.ServiceValidator;
 import edu.tamu.framework.model.BaseEntity;
@@ -54,7 +56,9 @@ public class Service extends BaseEntity {
     @Column(nullable = false)
     private Boolean onShortList;
 
-    @ManyToMany(fetch = EAGER, cascade = { REFRESH, DETACH, PERSIST, REMOVE })
+    @OneToMany(fetch = EAGER, cascade = { REFRESH, REMOVE }, mappedBy = "service")
+    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, scope = Note.class, property = "id")
+    @JsonIdentityReference(alwaysAsId = true)
     private Set<Note> notes;
 
     public Service() {

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

@@ -6,7 +6,7 @@
 import edu.tamu.app.model.repo.custom.NoteRepoCustom;
 
 public interface NoteRepo extends JpaRepository<Note, Long>, NoteRepoCustom {
-
-    public void delete(Note note);
+    
+//    public void delete(Note note);
 
 }

src/main/java/edu/tamu/app/model/repo/custom/NoteRepoCustom.java

@@ -6,7 +6,7 @@
 public interface NoteRepoCustom {
 
     public Note create(Note note, Credentials credentials);
-
-    public void delete(Note note);
+    
+//    public void delete(Note note);
 
 }

src/main/java/edu/tamu/app/model/repo/impl/NoteRepoImpl.java

@@ -32,22 +32,10 @@ public class NoteRepoImpl implements NoteRepoCustom {
     public Note create(Note note, Credentials credentials) {
         note.setAuthor(userRepo.findByUin(credentials.getUin()));
         note = noteRepo.save(note);
-        for (Service service : note.getServices()) {
-            service.addNote(note);
-            service = serviceRepo.save(service);
-            simpMessagingTemplate.convertAndSend("/channel/service/" + service.getId(), new ApiResponse(SUCCESS, service));
-        }
+        Service service = note.getService();
+        service.addNote(note);
+        serviceRepo.saveAndFlush(service);
+        simpMessagingTemplate.convertAndSend("/channel/service/" + note.getService().getId(), new ApiResponse(SUCCESS, note.getService()));
         return note;
     }
-
-    @Override
-    public void delete(Note note) {
-        for (Service service : note.getServices()) {
-            service.removeNote(note);
-            service = serviceRepo.save(service);
-            simpMessagingTemplate.convertAndSend("/channel/service/" + service.getId(), new ApiResponse(SUCCESS, service));
-        }        
-        noteRepo.delete(note.getId());
-    }
-
 }

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

@@ -11,8 +11,8 @@ public NoteValidator() {
         this.addInputValidator(new InputValidator(InputValidationType.required, "Notes require a title", titleProperty, true));
         this.addInputValidator(new InputValidator(InputValidationType.minlength, "Note title must be at least 3 characters", titleProperty, 3));
 
-        String servicesProperty = "services";
-        this.addInputValidator(new InputValidator(InputValidationType.required, "Notes require at least one Service", servicesProperty, true));
+        String serviceProperty = "service";
+        this.addInputValidator(new InputValidator(InputValidationType.required, "Notes require a Service", serviceProperty, true));
 
         String noteTypeProperty = "noteType";
         this.addInputValidator(new InputValidator(InputValidationType.required, "Notes require a type", noteTypeProperty, true));