minor fixes

Author: Garret29

server/src/main/java/pl/piotrowski/remotetexteditor/controller/DocumentsController.java

@@ -2,18 +2,19 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import pl.piotrowski.remotetexteditor.model.Document;
 import pl.piotrowski.remotetexteditor.application.DocumentsService;
+import pl.piotrowski.remotetexteditor.model.Document;
 import pl.piotrowski.remotetexteditor.service.exceptions.DocumentAlreadyExistsException;
 import pl.piotrowski.remotetexteditor.service.exceptions.DocumentNotFoundException;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.concurrent.CompletableFuture;
 
 
 @Controller
@@ -31,16 +32,21 @@ public DocumentsController(DocumentsService documentsService) {
     @Override
     @MessageMapping("/update/{name}")
     @SendTo("/topic/updates/{name}")
-    public String updateDocumentsContent(@PathVariable String name, @RequestBody String content
+    public String updateDocumentsContent(@DestinationVariable String name, @Payload(required = false) String content
 //            , @RequestParam(defaultValue = "0") int position, @RequestParam(defaultValue = "true") boolean isReplacing
     ) {
-        CompletableFuture<Document> completableFuture = CompletableFuture.supplyAsync(()-> {
-            try {
-                return documentsService.updateDocumentsContent(name, content);
-            } catch (DocumentNotFoundException e) {
-                throw new RuntimeException("Error");
-            }
-        });
+        Document document;
+
+        if (content==null){
+            content="";
+        }
+
+        try {
+            document = documentsService.updateDocumentsContent(name, content);
+        } catch (DocumentNotFoundException e) {
+            e.printStackTrace();
+        }
+
 
         return content;
     }
@@ -60,7 +66,7 @@ public ResponseEntity<Document> getDocument(@PathVariable String name) {
     @PostMapping
     public ResponseEntity<Document> createDocument(@RequestBody Document document) {
         try {
-           document = documentsService.addDocument(document);
+            document = documentsService.addDocument(document);
         } catch (DocumentAlreadyExistsException e) {
             e.printStackTrace();
         }

webclient/src/main/web/src/app/document/document.component.ts

@@ -112,7 +112,17 @@ export class DocumentComponent implements OnInit {
 
   documentChanged() {
     console.log("changed");
+    const initialContent = this.currentDocument.content;
     this.documentService.connectToWs(this.currentDocument);
+    this.documentService.getDocument(this.currentDocument.name).subscribe(
+      (document: Document)=>{
+        console.log(initialContent);
+        console.log(this.currentDocument.content);
+        if(initialContent==this.currentDocument.content){
+          this.currentDocument.content=document.content
+        }
+      }
+    );
     this.startUpdating();
   }
 }

webclient/src/main/web/src/app/services/document.service.ts

@@ -32,6 +32,10 @@ export class DocumentService implements OnInit{
     return this.http.get<Document[]>(this.webConfig.restUrl);
   }
 
+  getDocument(name: String): Observable<Document>{
+    return this.http.get<Document>(this.webConfig.restUrl+"/"+name)
+  }
+
   addNewDocument(document: Document): Observable<Document> {
     return this.http.post<Document>(this.webConfig.restUrl, document);
   }
@@ -57,7 +61,9 @@ export class DocumentService implements OnInit{
   }
 
   connectToWs(document: Document) {
+    console.log("check 0");
     if (this.websocket){
+      console.log("check 1");
       this.websocket.complete()
     }
     this.websocket = this.websocketService.getConnection(document);

webclient/src/main/web/src/app/services/web-socket.service.ts

@@ -26,13 +26,6 @@ export class WebSocketService {
     const ws = new SockJS(this.webConfig.wsUrl);
     const observable = Rx.Observable.create((obs) => {
 
-      if(this.stomp){
-        this.stomp.disconnect(()=>{
-          console.log("disconnecting...")
-        })
-      }
-
-
       this.stomp = Stomp.over(ws);
       this.stomp.connect({}, (frame) => {
         console.log(frame);
@@ -47,6 +40,7 @@ export class WebSocketService {
         this.stomp.send(this.webConfig.messageUrl + "/" + document.name, {}, data)
       },
       complete: ()=>{
+        console.log("check2");
           this.stomp.disconnect(()=>{
             console.log("disconnecting...");
             ws.close();