From 4ae5a1635c6039498f7bf51bce9d78f8d33c1825 Mon Sep 17 00:00:00 2001
From: Charlie Darques <charlie.darques.etu@univ-lille.fr>
Date: Sat, 15 Mar 2025 19:07:47 +0100
Subject: [PATCH] =?UTF-8?q?refacto=20et=20corrections=20=C3=A0=20tester?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WEB-INF/src/controleurs/Feed.java | 34 +++++++++---------------
WEB-INF/src/controleurs/LikeMessage.java | 5 ++--
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java
index c36d206..b86d367 100644
--- a/WEB-INF/src/controleurs/Feed.java
+++ b/WEB-INF/src/controleurs/Feed.java
@@ -1,5 +1,6 @@
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;
- }
-
}
diff --git a/WEB-INF/src/controleurs/LikeMessage.java b/WEB-INF/src/controleurs/LikeMessage.java
index dc46a7d..bf26557 100644
--- a/WEB-INF/src/controleurs/LikeMessage.java
+++ b/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
\ No newline at end of file
+// A TESTER
\ No newline at end of file
--
GitLab