diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java index 185c66c0fc4cc1c18ec09f126dbcc3d660a3c600..33b46203cd315dff213e74f0b5152d0ae1229420 100644 --- a/WEB-INF/src/controleurs/Feed.java +++ b/WEB-INF/src/controleurs/Feed.java @@ -2,6 +2,8 @@ package controleurs; import dao.ThreadDAO; import dao.UserDAO; +import dto.Message; +import dto.MyThread; import dto.User; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; @@ -25,9 +27,9 @@ public class Feed extends HttpServlet { User user = userDao.getUserByLogs(login, req.getParameter("password")); if (user != null) { - List<Thread> threadsFollowed = null; + List<Message> messages = null; try { - threadsFollowed = userDao.getThreadsByUser(user); + messages = userDao.getMostRecentMessages(user); } catch (SQLException e) { throw new RuntimeException(e); } @@ -37,6 +39,18 @@ public class Feed extends HttpServlet { out.println("<h1>Welcome " + login + "</h1>"); out.println(""); + for (Message message : messages) { + MyThread msgThread = null; + try { + msgThread = threadDao.getThreadById(message.getThreadId()); + } catch (SQLException e) { + throw new RuntimeException(e); + } + out.println("div class=\"message\">"); + out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>"); + out.println("<p class=\"msgContent\">" + message.getContent() + "</p>"); + out.println("</div>"); + } out.println("</body>"); out.println("<footer>");