From 48da92717baec0d8e86449a317423376e841533d Mon Sep 17 00:00:00 2001
From: Emi Boucly <bouclyma@etu.univ-grenoble-alpes.fr>
Date: Tue, 7 Jan 2025 12:55:10 +0100
Subject: [PATCH] =?UTF-8?q?feat(Event):=202.6.5:=20R=C3=A9ception=20des=20?=
 =?UTF-8?q?posts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat/src/main/java/rtgre/chat/ChatController.java | 10 +++++++---
 chat/src/main/java/rtgre/server/ChatServer.java   |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/chat/src/main/java/rtgre/chat/ChatController.java b/chat/src/main/java/rtgre/chat/ChatController.java
index 5b2cd19..3f72050 100644
--- a/chat/src/main/java/rtgre/chat/ChatController.java
+++ b/chat/src/main/java/rtgre/chat/ChatController.java
@@ -286,7 +286,7 @@ public class ChatController implements Initializable {
         LOGGER.info(event.getType());
         if (event.getType().equals("CONT")) {
             handleContEvent(event.getContent());
-        } else if (event.getType().equals("POST")) {
+        } else if (event.getType().equals(rtgre.modeles.Event.POST)) {
             handlePostEvent(event.getContent());
         } else {
             LOGGER.warning("Unhandled event type: " + event.getType());
@@ -295,11 +295,15 @@ public class ChatController implements Initializable {
     }
 
     private void handlePostEvent(JSONObject content) {
-        if (content.getString("from").equals(contactsListView.getSelectionModel().getSelectedItem()) ||
-            content.getString("to").equals(loginTextField.getText())) {
+        System.out.println(content.getString("to").equals(((Contact) contactsListView.getSelectionModel().getSelectedItem()).getLogin()));
+        if (content.getString("to").equals(((Contact) contactsListView.getSelectionModel().getSelectedItem()).getLogin()) ||
+            content.getString("from").equals(loginTextField.getText())) {
             postVector.add(Post.fromJson(content));
+            System.out.println(postVector);
             postsObservableList.add(Post.fromJson(content));
             postListView.refresh();
+            System.out.println(postsObservableList);
+            System.out.println(postListView);
 
         }
     }
diff --git a/chat/src/main/java/rtgre/server/ChatServer.java b/chat/src/main/java/rtgre/server/ChatServer.java
index adbc87e..a8c4cc2 100644
--- a/chat/src/main/java/rtgre/server/ChatServer.java
+++ b/chat/src/main/java/rtgre/server/ChatServer.java
@@ -52,6 +52,7 @@ public class ChatServer {
         LOGGER.info("Serveur en écoute " + passiveSock);
         clientList = new Vector<>();
         contactMap = new ContactMap();
+        postVector = new PostVector();
         contactMap.loadDefaultContacts();
     }
 
@@ -225,6 +226,7 @@ public class ChatServer {
                             break;
                         }
                     } catch (Exception e) {
+                        LOGGER.severe(e.getMessage());
                         break;
                     }
                 }
@@ -246,6 +248,7 @@ public class ChatServer {
                 return true;
             } else if (event.getType().equals(Event.MESG)) {
                 doMessage(event.getContent());
+                LOGGER.info("Receiving message");
                 return true;
             } else {
                 LOGGER.warning("Unhandled event type: " + event.getType());
@@ -267,6 +270,7 @@ public class ChatServer {
                 sendEventToContact(contactMap.getContact(post.getTo()), postEvent);
 
                 postVector.add(post);
+                LOGGER.info("Fin de doMessage");
             }
         }