From cbb9cea5fe5a4d5ac1d1505cc0dd9377d876f961 Mon Sep 17 00:00:00 2001
From: Charlie Darques <charlie.darques.etu@univ-lille.fr>
Date: Fri, 14 Mar 2025 11:10:47 +0100
Subject: [PATCH] corrections
---
WEB-INF/src/controleurs/Discover.java | 5 ++++-
WEB-INF/src/controleurs/Feed.java | 2 +-
WEB-INF/src/controleurs/Following.java | 2 +-
WEB-INF/src/controleurs/NewThread.java | 2 +-
WEB-INF/src/dao/UserDAO.java | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/WEB-INF/src/controleurs/Discover.java b/WEB-INF/src/controleurs/Discover.java
index 31645e0..f1dab7e 100644
--- a/WEB-INF/src/controleurs/Discover.java
+++ b/WEB-INF/src/controleurs/Discover.java
@@ -47,10 +47,13 @@ public class Discover extends HttpServlet {
} catch (SQLException e) {
throw new RuntimeException(e);
}
+ User sender = userDao.getUserById(message.getSenderId());
+ String senderName = sender.getUserName();
+
out.println("<div class=\"message\">");
out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>");
out.println("<p class=\"msgContent\">" + message.getContent() + "</p>");
- out.println("<p class=\"sender\">by " + userDao.getUserById(message.getSenderId()).getUserName() + "</p>");
+ out.println("<p class=\"sender\">by " + senderName + "</p>");
out.println("<form class=\"followThread\" action=\"http://localhost:8080/s4a021-web-backend/FollowThread\" method=\"post\">");
out.println("<input name=\"threadid\" type=\"hidden\" value=\"" + msgThread.getId() +"\">");
diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java
index d100f4a..922cd3b 100644
--- a/WEB-INF/src/controleurs/Feed.java
+++ b/WEB-INF/src/controleurs/Feed.java
@@ -81,7 +81,7 @@ public class Feed extends HttpServlet {
}
out.println("<div class=\"discover\">");
- out.println("<a href=\"\">Discover new threads</a>");
+ out.println("<a href=\"http://localhost:8080/s4a021-web-backend/Discover\">Discover new threads</a>");
out.println("<a href=\"http://localhost:8080/s4a021-web-backend/NewThread\">Create a new thread</a>");
out.println("</div>");
diff --git a/WEB-INF/src/controleurs/Following.java b/WEB-INF/src/controleurs/Following.java
index d98f435..740dfc1 100644
--- a/WEB-INF/src/controleurs/Following.java
+++ b/WEB-INF/src/controleurs/Following.java
@@ -62,7 +62,7 @@ public class Following extends HttpServlet {
out.println("<div class=\"thread\">");
out.println("<h3 class=\"threadname\">Thread name: " + t.getThreadName() + "</h3>");
- out.println("<h4 class=\"followDate\">Following since: " + followDate + "</h4>");
+ out.println("<p class=\"followDate\">Following since: " + followDate + "</p>");
out.println("</div>");
}
}
diff --git a/WEB-INF/src/controleurs/NewThread.java b/WEB-INF/src/controleurs/NewThread.java
index a2a8647..d5d9102 100644
--- a/WEB-INF/src/controleurs/NewThread.java
+++ b/WEB-INF/src/controleurs/NewThread.java
@@ -63,7 +63,7 @@ public class NewThread extends HttpServlet {
out.println("<h3>Create a new thread</h3>");
out.println("<form action=\"http://localhost:8080/s4a021-web-backend/NewThread\" method=\"post\">");
out.println("<input name=\"threadname\" type=\"text\" placeholder=\"Name of new thread\">");
- out.println("<textarea name=\"first_message\" type=\"text\" rows=\"2\" cols=\"30\" placeholder=\"Post the first message of your new thread!\">");
+ out.println("<textarea name=\"first_message\" type=\"text\" rows=\"2\" cols=\"30\" placeholder=\"Post the first message of your new thread!\"></textarea>");
out.println("<button type=\"submit\">Create</button>");
out.println("</form>");
diff --git a/WEB-INF/src/dao/UserDAO.java b/WEB-INF/src/dao/UserDAO.java
index 5a31cad..1aa0fce 100644
--- a/WEB-INF/src/dao/UserDAO.java
+++ b/WEB-INF/src/dao/UserDAO.java
@@ -100,7 +100,7 @@ public class UserDAO {
User user = new User(0,null,null);
try{
- PreparedStatement stmt = this.con.prepareStatement("SELECT * FROM userAccount WHERE id=?");
+ PreparedStatement stmt = this.con.prepareStatement("SELECT * FROM userAccount WHERE userid=?");
stmt.setInt(1, id);
ResultSet rs = stmt.executeQuery();
--
GitLab