Remove last_message column from conversations #95

Alovoa · Sep 8, 2021 · 0c66d56 · 0c66d56
1 parent 0ed5b4d
commit 0c66d56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/com/nonononoki/alovoa/entity/user/Conversation.java b/src/main/java/com/nonononoki/alovoa/entity/user/Conversation.java
@@ -5,16 +5,13 @@
 import java.util.List;
 
 import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Convert;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 
-import com.nonononoki.alovoa.component.TextEncryptorConverter;
 import com.nonononoki.alovoa.entity.User;
 import com.nonononoki.alovoa.repo.UserBlockRepository;
 
@@ -45,10 +42,6 @@ public class Conversation {
 
 	private Date lastOpened;
 
-	@Convert(converter = TextEncryptorConverter.class)
-	@Column(columnDefinition = "mediumtext")
-	private String lastMessage;
-
 	public boolean containsUser(User user) {
 		return users.contains(user);
 	}

diff --git a/src/main/java/com/nonononoki/alovoa/model/ConversationDto.java b/src/main/java/com/nonononoki/alovoa/model/ConversationDto.java
@@ -30,11 +30,15 @@ public class ConversationDto {
 	private boolean read;
 
 	public static ConversationDto conversationToDto(Conversation c, User currentUser,
-			TextEncryptorConverter textEncryptor) throws InvalidKeyException, IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, UnsupportedEncodingException {
+			TextEncryptorConverter textEncryptor)
+			throws InvalidKeyException, IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException,
+			NoSuchPaddingException, InvalidAlgorithmParameterException, UnsupportedEncodingException {
 		ConversationDto dto = new ConversationDto();
 		dto.setId(c.getId());
 		dto.setLastUpdated(c.getLastUpdated());
-		dto.setLastMessage(c.getLastMessage());
+		if(c.getMessages() != null && c.getMessages().size() > 0) {
+			dto.setLastMessage(c.getMessages().get(c.getMessages().size() - 1).getContent());
+		}
 		User u = c.getPartner(currentUser);
 		dto.setUserName(u.getFirstName());
 		if (u.getProfilePicture() != null) {

diff --git a/src/main/java/com/nonononoki/alovoa/service/MessageService.java b/src/main/java/com/nonononoki/alovoa/service/MessageService.java
@@ -98,7 +98,6 @@ public void send(Long convoId, String message)
 			c.getMessages().remove(msg);
 		}
 
-		c.setLastMessage(lastMessage);
 		c.setLastUpdated(new Date());
 		conversationRepo.saveAndFlush(c);