Message and Message Database updated based on new init.sql(2).
This commit is contained in:
@@ -173,7 +173,8 @@ public class MessageDatabase {
|
|||||||
rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
|
rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
|
||||||
rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
|
rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
|
||||||
rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
|
rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
|
||||||
rs.getBoolean("is_deleted_globally")
|
rs.getBoolean("is_deleted_globally"),
|
||||||
|
rs.getTimestamp("edited_at").toLocalDateTime()
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -275,7 +276,8 @@ public class MessageDatabase {
|
|||||||
(UUID) rs.getObject("original_message_id"),
|
(UUID) rs.getObject("original_message_id"),
|
||||||
(UUID) rs.getObject("forwarded_by"),
|
(UUID) rs.getObject("forwarded_by"),
|
||||||
(UUID) rs.getObject("forwarded_from"),
|
(UUID) rs.getObject("forwarded_from"),
|
||||||
rs.getBoolean("is_deleted_globally")
|
rs.getBoolean("is_deleted_globally"),
|
||||||
|
rs.getTimestamp("edited_at").toLocalDateTime()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -483,7 +485,8 @@ public class MessageDatabase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean insertSavedMessage(Message message) {
|
public static boolean insertSavedMessage(Message message) {
|
||||||
String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type, status) " +
|
String sql = "INSERT INTO messages (message_id, sender_id, receiver_type, receiver_id, content, message_type, status, reply_to_id, is_edited, original_message_id," +
|
||||||
|
" forwarded_by, forwarded_from, is_deleted_globally) " +
|
||||||
"VALUES (?, ?, ?, ?, ?, ?, ?)";
|
"VALUES (?, ?, ?, ?, ?, ?, ?)";
|
||||||
|
|
||||||
try (Connection conn = ConnectionDb.connect();
|
try (Connection conn = ConnectionDb.connect();
|
||||||
|
|||||||
@@ -20,11 +20,12 @@ public class Message {
|
|||||||
private UUID forwarded_from;
|
private UUID forwarded_from;
|
||||||
private List<FileAttachment> attachments;
|
private List<FileAttachment> attachments;
|
||||||
private boolean is_deleted_globally;
|
private boolean is_deleted_globally;
|
||||||
|
private LocalDateTime edited_at;
|
||||||
|
|
||||||
public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
|
public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
|
||||||
String message_type, LocalDateTime send_at, String status,
|
String message_type, LocalDateTime send_at, String status,
|
||||||
UUID reply_to_id, boolean is_edited, UUID original_message_id,
|
UUID reply_to_id, boolean is_edited, UUID original_message_id,
|
||||||
UUID forwarded_by, UUID forwarded_from,boolean is_deleted_globally) {
|
UUID forwarded_by, UUID forwarded_from,boolean is_deleted_globally, LocalDateTime edited_at) {
|
||||||
this.message_id = message_id;
|
this.message_id = message_id;
|
||||||
this.sender_id = sender_id;
|
this.sender_id = sender_id;
|
||||||
this.receiver_type = receiver_type;
|
this.receiver_type = receiver_type;
|
||||||
@@ -39,6 +40,7 @@ public class Message {
|
|||||||
this.forwarded_by = forwarded_by;
|
this.forwarded_by = forwarded_by;
|
||||||
this.forwarded_from = forwarded_from;
|
this.forwarded_from = forwarded_from;
|
||||||
this.is_deleted_globally = is_deleted_globally;
|
this.is_deleted_globally = is_deleted_globally;
|
||||||
|
this.edited_at = edited_at;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Message(UUID messageId, UUID senderId, UUID receiverId, String receiverType, String content, String messageType, LocalDateTime now) {
|
public Message(UUID messageId, UUID senderId, UUID receiverId, String receiverType, String content, String messageType, LocalDateTime now) {
|
||||||
@@ -166,4 +168,12 @@ public class Message {
|
|||||||
public boolean getIs_deleted_globally() {
|
public boolean getIs_deleted_globally() {
|
||||||
return is_deleted_globally;
|
return is_deleted_globally;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setEdited_at(LocalDateTime edited_at) {
|
||||||
|
this.edited_at = edited_at;
|
||||||
|
}
|
||||||
|
|
||||||
|
public LocalDateTime getEdited_at() {
|
||||||
|
return edited_at;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user