diff --git a/WEB-INF/src/controleurs/Following.java b/WEB-INF/src/controleurs/Following.java index b0980aa9c0a680d1472378b74e726141693fb8c5..2dee0a0429ab112c4666e21f7c76d9eddf04d11c 100644 --- a/WEB-INF/src/controleurs/Following.java +++ b/WEB-INF/src/controleurs/Following.java @@ -11,7 +11,7 @@ import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - +import dao.ThreadDAO; import dao.UserDAO; import dto.MyThread; import dto.User; @@ -23,19 +23,19 @@ public class Following extends HttpServlet { if (req.getSession().getAttribute("user") != null) { PrintWriter out = res.getWriter(); UserDAO userDAO = new UserDAO(); + ThreadDAO threadDao = new ThreadDAO(); String login = (String) req.getSession().getAttribute("login"); User user = (User) req.getSession().getAttribute("user"); if (!userDAO.isDatabased(user)) res.sendRedirect("http://localhost:8080/s4a021-web-backend/index.html"); - List<MyThread> threadsFollowedByUser = null; -// try { -// threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user); -// } -// catch (SQLException sqle) { -// sqle.getStackTrace(); -// } -// TODO : à décommenter + List<Integer> threadsFollowedByUser = null; + try { + threadsFollowedByUser = userDAO.getThreadsFollowedByUser(user); + } + catch (SQLException sqle) { + sqle.getStackTrace(); + } System.out.println(threadsFollowedByUser.size()); @@ -53,17 +53,24 @@ public class Following extends HttpServlet { out.println("<h1>Threads followed</h1>"); if (!threadsFollowedByUser.isEmpty()) { - for (MyThread t : threadsFollowedByUser) { + for (Integer t : threadsFollowedByUser) { + MyThread thread = null; + try { + thread = threadDao.getThreadById(t); + } + catch (SQLException sqle) { + sqle.getStackTrace(); + } LocalDate followDate = null; try { - followDate = userDAO.getFollowDateOfThread(user, t); + followDate = userDAO.getFollowDateOfThread(user, thread); } catch (SQLException sqle) { sqle.getStackTrace(); } out.println("<div class=\"thread\">"); - out.println("<h3 class=\"threadname\">Thread name: " + t.getThreadName() + "</h3>"); + out.println("<h3 class=\"threadname\">Thread name: " + thread.getThreadName() + "</h3>"); out.println("<p class=\"followDate\">Following since: " + followDate + "</p>"); out.println("</div>"); }