diff --git a/WEB-INF/src/dao/UserDAO.java b/WEB-INF/src/dao/UserDAO.java index ddc68ae6df42130f12dd0e8bf70151a6e5f7fba1..77e3e880b4e2827e14aab0d64347dfac58000bc3 100644 --- a/WEB-INF/src/dao/UserDAO.java +++ b/WEB-INF/src/dao/UserDAO.java @@ -8,9 +8,8 @@ import java.util.List; import dto.Message; import dto.MyThread; import dto.User; -import jakarta.servlet.http.*; -public class UserDAO extends HttpServlet{ +public class UserDAO { private Connection con; public UserDAO(){ @@ -221,7 +220,7 @@ public class UserDAO extends HttpServlet{ int threadID = rs.getInt(3); String content = rs.getString(4); Date creationDate = rs.getDate(5); - messages.add(new Message(msgID, sender, threadID, content, creationDate)); + messages.add(new Message(msgID, sender, threadID, content, creationDate.toLocalDate())); } } catch (SQLException sqle) { diff --git a/WEB-INF/src/dto/Message.java b/WEB-INF/src/dto/Message.java index b01220356622ab8ee40f3703e86fd4e37ad6623f..2cb1c887b08a23962df0e60a5755e5bb394a4786 100644 --- a/WEB-INF/src/dto/Message.java +++ b/WEB-INF/src/dto/Message.java @@ -1,5 +1,6 @@ package dto; +import java.time.LocalDate; import java.util.Date; public class Message { @@ -7,17 +8,22 @@ public class Message { private int senderId; private int threadId; private String content; - private Date creationDate; + private LocalDate creationDate; // Constructor // - public Message(int msgId, int senderId, int threadId, String content, Date creationDate) { + public Message(int msgId, int senderId, int threadId, String content) { this.msgId = msgId; this.senderId = senderId; this.threadId = threadId; this.content = content; - this.creationDate = creationDate; + this.creationDate = LocalDate.now(); + } + + public Message (int msgId, int senderId, int threadId, String content, LocalDate date) { + this(msgId, senderId, threadId, content); + this.creationDate = date; }