Commit för feedback

Author: codebyNorthsteep

src/main/java/com/example/HelloController.java

@@ -48,9 +48,7 @@ private void initialize() {
         updateSendButtonState();
 
         //Lägger till en lyssnare för att uppdatera knappen vid inmatning av text
-        messageInput.textProperty().addListener((observable, oldValue, newValue) -> {
-            updateSendButtonState();
-        });
+        messageInput.textProperty().addListener((observable, oldValue, newValue) -> updateSendButtonState());
 
         //Om användaren trycker på Enter eller klickar med musen -> skicka meddelandet
         messageInput.setOnAction((event) -> sendMessageToModel());
@@ -105,7 +103,7 @@ protected void updateItem(NtfyMessageDto item, boolean empty) {
         chatBox.setItems(model.getMessages());
         //Flyttar Platform.runlater till controller på grund av runtimeexeption när tester körs, även för en mer solid MVC
         model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) changes -> {
-            Platform.runLater(() -> chatBox.refresh());
+            chatBox.refresh();
         });
     }
 
@@ -123,8 +121,11 @@ private void updateSendButtonState() {
         // Kollar om texten, efter att ha tagit bort ledande/efterföljande mellanslag, är tom.
         boolean isTextPresent = !messageInput.getText().trim().isEmpty();
 
+        //Nytt villkor för button för att ej kunna skicka meddelanden till servern om ej connectad
+        boolean isConnected = !disconnectFromServer.isDisabled();
+
         // Sätt disable till TRUE om det INTE finns text.
-        sendButton.setDisable(!isTextPresent);
+        sendButton.setDisable(!isTextPresent || !isConnected);
     }
 
     //Starta prenumeration via model och uppdaterar button
@@ -133,6 +134,7 @@ public void setConnectToServer() {
             model.receiveMessage();
             connectToServer.setDisable(true);
             disconnectFromServer.setDisable(false);
+            updateSendButtonState();
         }
     }
 
@@ -141,5 +143,6 @@ public void setDisconnectFromServer() {
         model.stopSubscription();
         connectToServer.setDisable(false);
         disconnectFromServer.setDisable(true);
+        updateSendButtonState();
     }
 }

src/main/java/com/example/HelloModel.java

@@ -28,13 +28,13 @@ public class HelloModel {
     //Innehåller meddelandet som ska skickas, kopplat till GUI via SimpleStringProperty
     private final StringProperty messageToSend = new SimpleStringProperty();
     //Fält för att kunna styra anslutningen
-    private final Subscription subscription;
+    private Subscription subscription = null;
 
     //Konstruktorn tar emot nätverkskoppling, antingen ett test via spy eller en riktig via impl
     public HelloModel(NtfyConnection connection) {
 
         this.connection = connection;
-        subscription = receiveMessage(); //subscription startar automatiskt när modellen skapas
+        //subscription = receiveMessage(); //subscription startar automatiskt när modellen skapas
     }
 
     //getter från private, används av controller för att koppla til ListView
@@ -65,8 +65,11 @@ public void sendMessage(String message) {
     //Startar en prenumeration på inkommande meddelnaden,
     //Returnerar ett Subscription-objekt så den kan stoppas
     public Subscription receiveMessage() {
+if(subscription != null && subscription.isOpen()) {
+    return this.subscription;
+}
+    return subscription = connection.receive(messages::add);
 
-        return connection.receive(messages::add);
 
     }
 

src/main/java/com/example/NtfyConnectionImpl.java

@@ -1,6 +1,7 @@
 package com.example;
 
 import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
 import tools.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
@@ -71,7 +72,7 @@ public Subscription receive(Consumer<NtfyMessageDto> messageHandler) {
                         .map(s -> mapper.readValue(s, NtfyMessageDto.class))
                         .filter(message -> message.event().equals("message"))
                         .peek(System.out::println)
-                        .forEach(messageHandler));
+                        .forEach(message -> Platform.runLater(()-> messageHandler.accept(message))));
         return new Subscription() {
             @Override
             public void close() {

src/test/java/com/example/HelloModelTest.java

@@ -35,37 +35,44 @@ void sendMessageCallsConnectionWithMessageToSend() {
     }
 
     @Test
-    void receiveMessageFromFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException {
+    void receiveMessageFromFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) throws IOException, InterruptedException {
         //Arrange
         var host = "http://localhost:" + wireMockRuntimeInfo.getHttpPort();
         var con = new NtfyConnectionImpl(host);
+
         String fakeMessage = """
                 {"id":"testID","time":1762935416, "event":"keepalive","topic":"catChat", "message":"Filtreras bort"}
-                {"id":"testID","time":1762935416, "event":"message","topic":"catChat", "message":"User: Hej"}""";
+                {"id":"testID","time":1762935416, "event":"message","topic":"catChat", "message":"User: Hej"}
+                """;
+
 
         //Simulerar en server
         stubFor(get(urlEqualTo("/catChat/json")).willReturn(aResponse()
                         .withStatus(200)
                 .withBody(fakeMessage)));
 
-        Consumer<NtfyMessageDto> fakeReceiver = Mockito.mock(Consumer.class);
-        //con.receive(fakeReceiver);
+//        Consumer<NtfyMessageDto> fakeReceiver = Mockito.mock(Consumer.class);
+//        //con.receive(fakeReceiver);
+//
+//        ArgumentCaptor<NtfyMessageDto> captor = ArgumentCaptor.forClass(NtfyMessageDto.class);
+//        Subscription subscription = con.receive(fakeReceiver);
+
+//        //Act
+
+        var model =new HelloModel(con);
+        model.receiveMessage();
 
-        ArgumentCaptor<NtfyMessageDto> captor = ArgumentCaptor.forClass(NtfyMessageDto.class);
-        Subscription subscription = con.receive(fakeReceiver);
-        //Act
+        Thread.sleep(50);
 
         Awaitility.await()
-                .atMost(Duration.ofSeconds(4)).untilAsserted(() -> {
-                Mockito.verify(fakeReceiver, Mockito.times(1))
-                        .accept(captor.capture());
+                .atMost(Duration.ofSeconds(5)).untilAsserted(() -> {
+                assertThat(model.getMessages()).hasSize(1);
                 });
 
         //Assert
-        String messageReceived = captor.getValue().message();
-        assertThat(messageReceived).isEqualTo("User: Hej");
+        assertThat(model.getMessages().getFirst().message()).isEqualTo("User: Hej");
 
-        subscription.close(); //Stänger anslutningen
+        model.stopSubscription(); //Stänger anslutningen
     }
 
     @Test
@@ -86,6 +93,7 @@ void messageIsAddedToObservableList() {
         var spy = new NtfyConnectionSpy();
         var model = new HelloModel(spy);
 
+        model.receiveMessage();
         var testText = new NtfyMessageDto("id1", 15465823L,"Message", "catChat", "Godmorgon");
         spy.simulateIncomingMessage(testText);