WIP attempting to fix broadcasting bugs

Author: rladdusaw

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

@@ -13,13 +13,15 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 import edu.tamu.app.model.Note;
 import edu.tamu.app.model.repo.NoteRepo;
+import edu.tamu.app.model.repo.ServiceRepo;
 import edu.tamu.app.model.request.FilteredPageRequest;
 import edu.tamu.framework.aspect.annotation.ApiCredentials;
 import edu.tamu.framework.aspect.annotation.ApiData;
@@ -37,6 +39,9 @@ public class NoteController {
 
     @Autowired
     private NoteRepo noteRepo;
+    
+    @Autowired
+    private ServiceRepo serviceRepo;
 
     @Autowired
     private SimpMessagingTemplate simpMessagingTemplate;
@@ -58,7 +63,8 @@ public ApiResponse getNote(@ApiVariable Long id) {
     @ApiValidation(business = { @ApiValidation.Business(value = CREATE), @ApiValidation.Business(value = EXISTS) })
     public ApiResponse create(@ApiValidatedModel Note note, @ApiCredentials Credentials credentials) {
         note = noteRepo.create(note, credentials);
-        simpMessagingTemplate.convertAndSend("/channel/note", new ApiResponse(SUCCESS, noteRepo.findAll()));
+        System.out.println("Note value: " + note);
+//        simpMessagingTemplate.convertAndSend("/channel/service/" + note.getService().getId(), new ApiResponse(SUCCESS, serviceRepo.getOne(note.getService().getId())));
         return new ApiResponse(SUCCESS, note);
     }
 
@@ -70,12 +76,13 @@ public ApiResponse update(@ApiValidatedModel Note note) {
         return new ApiResponse(SUCCESS, note);
     }
 
+    @Transactional
     @ApiMapping("/remove")
     @Auth(role = "ROLE_SERVICE_MANAGER")
     public ApiResponse remove(@ApiValidatedModel Note note) {
         noteRepo.delete(note);
         simpMessagingTemplate.convertAndSend("/channel/note", new ApiResponse(SUCCESS, noteRepo.findAll()));
-        return new ApiResponse(SUCCESS);
+        return new ApiResponse(SUCCESS, serviceRepo.getOne(note.getService().getId()));
     }
 
     @ApiMapping("/page")

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

@@ -1,13 +1,13 @@
 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;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
@@ -56,19 +56,20 @@ public class Service extends BaseEntity {
 
     @Column(nullable = false)
     private Boolean onShortList;
-    
+
     @Lob
     @Column(nullable = true)
     private String description;
 
-    @OneToMany(fetch = EAGER, cascade = { REFRESH, REMOVE }, mappedBy = "service")
+    @OneToMany(fetch = EAGER, cascade = { DETACH, REMOVE, PERSIST, REFRESH }, mappedBy = "service")
+    @Fetch(FetchMode.SELECT)
     @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, scope = Note.class, property = "id")
     @JsonIdentityReference(alwaysAsId = true)
-    private Set<Note> notes;
+    private List<Note> notes;
 
     public Service() {
         setModelValidator(new ServiceValidator());
-        setNotes(new HashSet<Note>());
+        setNotes(new ArrayList<Note>());
         setAliases(new ArrayList<String>());
     }
 
@@ -115,16 +116,20 @@ public void setServiceUrl(String serviceUrl) {
         this.serviceUrl = serviceUrl;
     }
 
-    public Set<Note> getNotes() {
+    public List<Note> getNotes() {
         return notes;
     }
 
-    public void setNotes(Set<Note> notes) {
+    public void setNotes(List<Note> notes) {
         this.notes = notes;
     }
 
     public void addNote(Note note) {
-        this.notes.add(note);
+        System.out.println("addNote size before: " + this.notes.size());
+        if (!this.notes.contains(note)) {
+            this.notes.add(note);
+        }
+        System.out.println("addNote size after: " + this.notes.size());
     }
 
     public void removeNote(Note note) {

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

@@ -32,10 +32,17 @@ public class NoteRepoImpl implements NoteRepoCustom {
     public Note create(Note note, Credentials credentials) {
         note.setAuthor(userRepo.findByUin(credentials.getUin()));
         note = noteRepo.save(note);
-        Service service = note.getService();
+        Service service = serviceRepo.findOne(note.getService().getId());
+        System.out.println(service.getNotes().size());
+        
         service.addNote(note);
-        serviceRepo.saveAndFlush(service);
-        simpMessagingTemplate.convertAndSend("/channel/service/" + note.getService().getId(), new ApiResponse(SUCCESS, note.getService()));
+        
+        service = serviceRepo.save(service);
+        
+        System.out.println(service.getNotes().size());
+        
+        simpMessagingTemplate.convertAndSend("/channel/service/" + note.getService().getId(), new ApiResponse(SUCCESS, service));
+        
         return note;
     }
 }

src/main/resources/config/application.properties

@@ -35,7 +35,7 @@ auth.security.jwt-expiration: 120000
 app.security.secret: verysecretsecret
 
 # Required in framework - CoreCorsFilter
-app.security.allow-access: http://localhost
+app.security.allow-access: http://localhost, http://laddusaw.tamu.edu
 
 # required in framework - CoreControllerAspect
 app.aspect.retry: 3