refacto et corrections à tester

WEB-INF/src/controleurs/Feed.java

 package controleurs;
 
+import dao.MessageDAO;
 import dao.ThreadDAO;
 import dao.UserDAO;
 import dto.Message;
@@ -20,6 +21,7 @@ import java.util.List;
 public class Feed extends HttpServlet {
     UserDAO userDao = new UserDAO();
     ThreadDAO threadDao = new ThreadDAO();
+    MessageDAO messageDao = new MessageDAO();
     User user;
 
     public void service(HttpServletRequest req, HttpServletResponse res)
@@ -31,8 +33,6 @@ public class Feed extends HttpServlet {
 
             user = userDao.getUserByLogs(login, pwd);
 
-            List<Integer> liked_messages = getLikedMessages(req);
-
             List<Message> messages = null;
             try {
                 messages = userDao.getMostRecentMessages(user);
@@ -68,13 +68,21 @@ public class Feed extends HttpServlet {
                     out.println("</form>");
 
 
+                    boolean msgIsLiked = false;
+                    try {
+                        msgIsLiked = messageDao.isMessageLikedByUser(message, user);
+                    }
+                    catch (SQLException sqle) {
+                        sqle.getStackTrace();
+                    }
+
                     out.println("<form action=\"http://localhost:8080/s4a021-web-backend/LikeMessage\" method=\"post\">");
                     out.println("<input name=\"messageid\" type=\"hidden\" value=\"" + message.getMsgId() +"\">");
 
-                    if (liked_messages.contains(message.getMsgId())) {
-                        out.println("<button class=\"liked\" type=\"submit\" value=\"Liked\">Liked</button></form>");
+                    if (msgIsLiked) {
+                        out.println("<button class=\"liked\" type=\"submit\" value=\"Unlike\">Liked</button></form>");
                     } else {
-                        out.println("<button class=\"unliked\" type\"submit\" value=\"Unliked\">Unliked</button></form>");
+                        out.println("<button class=\"unliked\" type\"submit\" value=\"Like\">Unliked</button></form>");
                     }
                     out.println("</div>");
                 }
@@ -99,20 +107,4 @@ public class Feed extends HttpServlet {
         }
     }
 
-    public List<Integer> getLikedMessages(HttpServletRequest req) {
-        List<Integer> liked_messages = new ArrayList<>();
-        if (req.getSession().getAttribute("liked_messages") != null) {
-            liked_messages = (List<Integer>) req.getSession().getAttribute("liked_messages");
-        }
-        else {
-            try {
-                liked_messages = userDao.getLikedMessagesFromUser(user);
-                req.getSession().setAttribute("liked_messages", liked_messages);
-            } catch (SQLException e) {
-                e.getStackTrace();
-            }
-        }
-        return liked_messages;
-    }
-
 }

WEB-INF/src/controleurs/LikeMessage.java

@@ -51,7 +51,7 @@ public class LikeMessage extends HttpServlet {
             }
             else {
                 try {
-                    userDao.unreactToMsg(user, msg); // méthode à créer
+                    userDao.unreactToMsg(user, msg);
                 }
                 catch (SQLException sqle) {
                     sqle.getStackTrace();
@@ -64,5 +64,4 @@ public class LikeMessage extends HttpServlet {
         }
    }
 }
-
-TODO : à décommenter
+// A TESTER
\ No newline at end of file
\ No newline at end of file