Try to add online chat

src/main/java/site/easystartup/web/chat/config/ChatController.java

@@ -1,28 +0,0 @@
-package site.easystartup.web.chat.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.handler.annotation.SendTo;
-import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.stereotype.Controller;
-import site.easystartup.web.chat.domain.model.ChatMessage;
-import site.easystartup.web.chat.domain.model.ChatNotification;
-
-@Controller
-public class ChatController {
-    @MessageMapping("/chat.sendMessage")
-    @SendTo("/topic/public")
-    public ChatMessage sendMessage(@Payload ChatMessage chatMessage) {
-        return chatMessage;
-    }
-    @MessageMapping("/chat.addUser")
-    @SendTo("/topic/public")
-    public ChatMessage addUser(@Payload ChatMessage chatMessage,
-                               SimpMessageHeaderAccessor headerAccessor) {
-        // Add username in web socket session
-        headerAccessor.getSessionAttributes().put("username", chatMessage.getSender());
-        return chatMessage;
-    }
-}

src/main/java/site/easystartup/web/chat/config/WebSocketConfig.java

@@ -1,22 +1,46 @@
 package site.easystartup.web.chat.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.converter.DefaultContentTypeResolver;
+import org.springframework.messaging.converter.MappingJackson2MessageConverter;
+import org.springframework.messaging.converter.MessageConverter;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.util.MimeTypeUtils;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 
+import java.util.List;
 
 @Configuration
 @EnableWebSocketMessageBroker
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+        config.enableSimpleBroker( "/user");
+        config.setApplicationDestinationPrefixes("/app");
+        config.setUserDestinationPrefix("/user");
+    }
+
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws").withSockJS();
+        registry
+                .addEndpoint("/ws")
+                .setAllowedOrigins("*")
+                .withSockJS();
     }
+
     @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.setApplicationDestinationPrefixes("/app");
-        registry.enableSimpleBroker("/topic");
+    public boolean configureMessageConverters(List<MessageConverter> messageConverters) {
+        DefaultContentTypeResolver resolver = new DefaultContentTypeResolver();
+        resolver.setDefaultMimeType(MimeTypeUtils.APPLICATION_JSON);
+        MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
+        converter.setObjectMapper(new ObjectMapper());
+        converter.setContentTypeResolver(resolver);
+        messageConverters.add(converter);
+        return false;
     }
-}
+}
+

src/main/java/site/easystartup/web/chat/controller/ChatController.java

@@ -0,0 +1,38 @@
+package site.easystartup.web.chat.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import site.easystartup.web.chat.domain.model.ChatMessage;
+import site.easystartup.web.chat.domain.model.ChatNotification;
+import site.easystartup.web.chat.domain.request.ChatMessageRequest;
+import site.easystartup.web.chat.repo.ChatMessageRepo;
+import site.easystartup.web.chat.service.ChatService;
+
+@Controller
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class ChatController {
+    private final SimpMessagingTemplate messagingTemplate;
+    private final ChatService chatService;
+
+    @MessageMapping("/chat")
+    public void processMessage(@Payload ChatMessageRequest chatMessageRequest) {
+        ChatMessage chatMessage = chatService.getByRequest(chatMessageRequest);
+        var room = chatService
+                .getChatRoom(chatMessage.getRecipientName(), chatMessage.getRecipientId());
+        chatMessage.setChatId(room.getChatId());
+
+        ChatMessage saved = chatService.save(chatMessage);
+
+        messagingTemplate.convertAndSendToUser(
+                chatMessage.getRecipientId(),"/queue/messages",
+                new ChatNotification(
+                        saved.getId(),
+                        saved.getSenderId(),
+                        saved.getSenderName()));
+    }
+}

src/main/java/site/easystartup/web/chat/controller/ChatRestController.java

@@ -0,0 +1,52 @@
+package site.easystartup.web.chat.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import site.easystartup.web.chat.dto.ChatMessageDto;
+import site.easystartup.web.chat.dto.ChatRoomDto;
+import site.easystartup.web.chat.service.ChatService;
+import site.easystartup.web.exception.NoPermissionException;
+import site.easystartup.web.service.UserService;
+
+import java.security.Principal;
+import java.util.List;
+
+@RestController
+@RequestMapping("/chat")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class ChatRestController {
+    private final ChatService chatService;
+
+    private final ModelMapper modelMapper;
+
+    private final UserService userService;
+
+    @GetMapping("/{chat_id}")
+    public ResponseEntity<List<ChatMessageDto>> chatId(@PathVariable String chat_id,
+                                                       Principal principal) {
+        var chatMessages = chatService.getByChatId(chat_id, principal)
+                .stream().map(message -> modelMapper.map(message, ChatMessageDto.class)).toList();
+        return ResponseEntity.ok().body(chatMessages);
+    }
+
+    @GetMapping("/see")
+    public ResponseEntity<List<ChatMessageDto>> chat(@RequestParam String sender,
+                                                       @RequestParam String recipient,
+                                                       Principal principal) {
+        var chatMessages = chatService.getChatMessages(sender, recipient, principal)
+                .stream().map(message -> modelMapper.map(message, ChatMessageDto.class)).toList();
+        return ResponseEntity.ok().body(chatMessages);
+    }
+
+    @GetMapping("/user/{username}")
+    public ResponseEntity<List<ChatRoomDto>> user(@PathVariable String username,
+                                                  Principal principal) {
+        var chatMessages = chatService.getChats(username, principal)
+                .stream().map(message -> modelMapper.map(message, ChatRoomDto.class)).toList();
+        return ResponseEntity.ok().body(chatMessages);
+    }
+}

src/main/java/site/easystartup/web/chat/domain/exception/ChatRoomNotFoundException.java

@@ -0,0 +1,14 @@
+package site.easystartup.web.chat.domain.exception;
+
+import java.util.function.Supplier;
+
+public class ChatRoomNotFoundException extends RuntimeException implements Supplier<ChatRoomNotFoundException> {
+    public ChatRoomNotFoundException(String message) {
+        super(message);
+    }
+
+    @Override
+    public ChatRoomNotFoundException get() {
+        return this;
+    }
+}

src/main/java/site/easystartup/web/chat/domain/model/ChatMessage.java

@@ -1,15 +1,51 @@
 package site.easystartup.web.chat.domain.model;
 
-import lombok.Data;
+import lombok.*;
+import org.hibernate.Hibernate;
+import site.easystartup.web.forum.domain.model.DiscussionMessage;
 
-@Data
-public class ChatMessage {
-    private MessageType type;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+import java.util.Objects;
+
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
+@Entity
+public class ChatMessage implements Comparable<ChatMessage> {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+    private String chatId;
+    private String senderId;
+    private String recipientId;
+    private String senderName;
+    private String recipientName;
     private String content;
-    private String sender;
-    public enum MessageType {
-        CHAT,
-        JOIN,
-        LEAVE
+    private Date timestamp;
+    private MessageStatus status;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        ChatMessage that = (ChatMessage) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+
+    @Override
+    public int compareTo(ChatMessage o) {
+        if (getTimestamp() == null || o.getTimestamp() == null)
+            return 0;
+        return getTimestamp().compareTo(o.getTimestamp());
     }
 }

src/main/java/site/easystartup/web/chat/domain/model/ChatNotification.java

@@ -1,11 +1,10 @@
 package site.easystartup.web.chat.domain.model;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 
-@Data
 @AllArgsConstructor
 public class ChatNotification {
-    private String id;
+    private long id;
+    private String senderId;
     private String senderName;
 }

src/main/java/site/easystartup/web/chat/domain/model/ChatRoom.java

@@ -1,11 +1,46 @@
 package site.easystartup.web.chat.domain.model;
 
-import lombok.Data;
+import lombok.*;
+import org.hibernate.Hibernate;
 
-@Data
-public class ChatRoom {
-    private String id;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+import java.util.Objects;
+
+@Getter
+@Setter
+@ToString
+@RequiredArgsConstructor
+@Entity
+public class ChatRoom implements Comparable<ChatRoom> {
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
     private String chatId;
-    private String senderId;
-    private String recipientId;
+    private String sender;
+    private String recipient;
+    private Date last_update;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        ChatRoom chatRoom = (ChatRoom) o;
+        return Objects.equals(id, chatRoom.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+
+    @Override
+    public int compareTo(ChatRoom o) {
+        if (getLast_update() == null || o.getLast_update() == null)
+            return 0;
+        return getLast_update().compareTo(o.getLast_update());
+    }
 }

src/main/java/site/easystartup/web/chat/domain/request/ChatMessageRequest.java

@@ -0,0 +1,27 @@
+package site.easystartup.web.chat.domain.request;
+
+import lombok.Data;
+import site.easystartup.web.chat.domain.model.MessageStatus;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Date;
+
+@Data
+public class ChatMessageRequest {
+    private long id;
+    private String chatId;
+    @NotNull
+    private String senderId;
+    @NotNull
+    private String recipientId;
+    @NotNull
+    private String senderName;
+    @NotNull
+    private String recipientName;
+    @NotNull
+    @Size(min = 1, max = 255, message = "Text should be no less 1 and no more 255 signs")
+    private String content;
+    private Date timestamp;
+    private MessageStatus status;
+}

src/main/java/site/easystartup/web/chat/dto/ChatMessageDto.java

@@ -0,0 +1,28 @@
+package site.easystartup.web.chat.dto;
+
+import lombok.Data;
+import site.easystartup.web.chat.domain.model.MessageStatus;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ChatMessageDto implements Serializable {
+    private long id;
+    private String chatId;
+    @NotNull
+    private String senderId;
+    @NotNull
+    private String recipientId;
+    @NotNull
+    private String senderName;
+    @NotNull
+    private String recipientName;
+    @NotNull
+    @Size(min = 1, max = 255, message = "Text should be no less 1 and no more 255 signs")
+    private String content;
+    private Date timestamp;
+    private MessageStatus status;
+}

src/main/java/site/easystartup/web/chat/dto/ChatRoomDto.java

@@ -0,0 +1,11 @@
+package site.easystartup.web.chat.dto;
+
+import lombok.Data;
+
+@Data
+public class ChatRoomDto {
+    private long id;
+    private String chatId;
+    private String sender;
+    private String recipient;
+}

src/main/java/site/easystartup/web/chat/event/WebSocketEventListener.java

@@ -1,35 +0,0 @@
-package site.easystartup.web.chat.event;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.EventListener;
-import org.springframework.messaging.simp.SimpMessageSendingOperations;
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
-import org.springframework.stereotype.Component;
-import org.springframework.web.socket.messaging.SessionConnectedEvent;
-import org.springframework.web.socket.messaging.SessionDisconnectEvent;
-import site.easystartup.web.chat.domain.model.ChatMessage;
-
-@Component
-public class WebSocketEventListener {
-    private static final Logger logger = LoggerFactory.getLogger(WebSocketEventListener.class);
-    @Autowired
-    private SimpMessageSendingOperations messagingTemplate;
-    @EventListener
-    public void handleWebSocketConnectListener(SessionConnectedEvent event) {
-        logger.info("Received a new web socket connection");
-    }
-    @EventListener
-    public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
-        StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(event.getMessage());
-        String username = (String) headerAccessor.getSessionAttributes().get("username");
-        if(username != null) {
-            logger.info("User Disconnected : " + username);
-            ChatMessage chatMessage = new ChatMessage();
-            chatMessage.setType(ChatMessage.MessageType.LEAVE);
-            chatMessage.setSender(username);
-            messagingTemplate.convertAndSend("/topic/public", chatMessage);
-        }
-    }
-}

src/main/java/site/easystartup/web/chat/repo/ChatMessageRepo.java

@@ -0,0 +1,8 @@
+package site.easystartup.web.chat.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
+import site.easystartup.web.chat.domain.model.ChatMessage;
+
+public interface ChatMessageRepo extends JpaRepository<ChatMessage, Long> {
+}

src/main/java/site/easystartup/web/chat/repo/ChatRoomRepo.java

@@ -0,0 +1,8 @@
+package site.easystartup.web.chat.repo;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
+import site.easystartup.web.chat.domain.model.ChatRoom;
+
+public interface ChatRoomRepo extends JpaRepository<ChatRoom, Long> {
+}

src/main/java/site/easystartup/web/chat/service/ChatService.java

@@ -0,0 +1,101 @@
+package site.easystartup.web.chat.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import site.easystartup.web.chat.domain.exception.ChatRoomNotFoundException;
+import site.easystartup.web.chat.domain.model.ChatMessage;
+import site.easystartup.web.chat.domain.model.ChatRoom;
+import site.easystartup.web.chat.domain.request.ChatMessageRequest;
+import site.easystartup.web.chat.dto.ChatRoomDto;
+import site.easystartup.web.chat.repo.ChatMessageRepo;
+import site.easystartup.web.chat.repo.ChatRoomRepo;
+import site.easystartup.web.exception.NoPermissionException;
+import site.easystartup.web.service.UserService;
+
+import java.security.Principal;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Component
+@Scope("singleton")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+public class ChatService {
+    private final ChatMessageRepo chatMessageRepo;
+    private final ChatRoomRepo chatRoomRepo;
+    private final UserService userService;
+
+    public ChatRoom getChatRoom(String sender, String recipient) {
+        return chatRoomRepo.findAll().stream()
+                .filter(chatRoom -> chatRoom.getSender().equals(sender)
+                && chatRoom.getRecipient().equals(recipient)).findAny()
+                .orElse(createChatRoom(sender, recipient));
+    }
+
+    public List<ChatMessage> getChatMessages(String sender, String recipient, Principal principal) {
+        if(!getChatRoom(sender, recipient).getSender().equals(principal.getName())
+                || !(userService.getUserByPrincipal(principal)).isAdmin())
+            throw new NoPermissionException(
+                    String.format("User %s dont have perms to see chat %s / %s", sender, recipient));
+
+        List<ChatMessage> result = new java.util.ArrayList<>(chatMessageRepo.findAll().stream().filter(
+                chatMessage -> chatMessage.getSenderName().equals(sender) && chatMessage.getSenderName().equals(recipient)
+        ).toList());
+        result.sort(ChatMessage::compareTo);
+        return result;
+    }
+
+    public List<ChatRoom> getChats(String sender, Principal principal) {
+        if(!principal.getName().equals(sender)
+                || !(userService.getUserByPrincipal(principal)).isAdmin())
+            throw new NoPermissionException(
+                    String.format("User %s dont have perms to see chats %s", sender));
+
+        List<ChatRoom> result = new java.util.ArrayList<>(chatRoomRepo.findAll().stream().filter(
+                chatRoom -> chatRoom.getSender().equals(sender)
+        ).toList());
+        result.sort(ChatRoom::compareTo);
+        return result;
+    }
+
+    public ChatRoom getChatRoom(String chat_id) {
+        return chatRoomRepo.findAll().stream()
+                .filter(chatRoom -> chatRoom.getChatId().equals(chat_id)).findAny()
+                .orElseThrow(new ChatRoomNotFoundException("Chat with id " + chat_id + " dont exists!"));
+    }
+
+    public ChatMessage getByRequest(ChatMessageRequest chatMessageRequest) {
+        ChatMessage result = new ChatMessage();
+        result.setContent(chatMessageRequest.getContent());
+        result.setRecipientId(chatMessageRequest.getRecipientId());
+        result.setRecipientName(chatMessageRequest.getRecipientName());
+        result.setSenderId(chatMessageRequest.getSenderId());
+        result.setSenderName(chatMessageRequest.getSenderName());
+        result.setContent(chatMessageRequest.getContent());
+        result.setTimestamp(chatMessageRequest.getTimestamp() != null ? chatMessageRequest.getTimestamp() : new Date());
+        return result;
+    }
+
+    public ChatMessage save(ChatMessage chatMessage) {
+        return chatMessageRepo.save(chatMessage);
+    }
+
+    public List<ChatMessage> getByChatId(String chat_id, Principal principal) {
+        if(!getChatRoom(chat_id).getSender().equals(principal.getName())
+                || !(userService.getUserByPrincipal(principal)).isAdmin())
+            throw new NoPermissionException(
+                    String.format("User %s dont have perms to see chat %s", principal.getName(), chat_id));
+
+        return chatMessageRepo.findAll().stream().filter(chatMessage -> chatMessage.getChatId().equals(chat_id)).toList();
+    }
+
+    public ChatRoom createChatRoom(String sender, String recipient) {
+        ChatRoom chatRoom = new ChatRoom();
+        chatRoom.setSender(sender);
+        chatRoom.setRecipient(recipient);
+        chatRoom.setChatId(UUID.randomUUID().toString());
+        return chatRoomRepo.save(chatRoom);
+    }
+}

src/main/java/site/easystartup/web/forum/controller/ForumController.java

@@ -139,7 +139,7 @@ public class ForumController {
         return ResponseEntity.ok().body(modelMapper.map(messageUpdated, DiscussionMessageDto.class));
     }
 
-    @DeleteMapping("/forum/message/{message_id}/delete")
+    @DeleteMapping("/message/{message_id}/delete")
     public ResponseEntity<Object> messageDelete(@PathVariable long message_id, Principal principal) {
         DiscussionMessage message = forumService.getDiscussionMessageById(message_id);
         User user = userService.getUserByPrincipal(principal);

src/main/java/site/easystartup/web/forum/domain/model/DiscussionMessage.java

@@ -13,7 +13,7 @@ import java.util.Objects;
 @ToString
 @RequiredArgsConstructor
 @Entity
-public class DiscussionMessage {
+public class DiscussionMessage implements Comparable<DiscussionMessage>{
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
@@ -40,4 +40,12 @@ public class DiscussionMessage {
     public int hashCode() {
         return getClass().hashCode();
     }
+
+    @Override
+    public int compareTo(DiscussionMessage o) {
+        if (getDate() == null || o.getDate() == null)
+            return 0;
+        return getDate().compareTo(o.getDate());
+    }
+
 }

src/main/java/site/easystartup/web/forum/dto/DiscussionDto.java

@@ -5,11 +5,12 @@ import site.easystartup.web.forum.domain.model.DiscussionStatus;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
 @Data
-public class DiscussionDto {
+public class DiscussionDto implements Serializable {
     private long id;
     @Size(min = 3, max = 100, message = "Title should be no less 3 and no more 100 signs")
     @NotNull

src/main/java/site/easystartup/web/forum/dto/DiscussionMessageDto.java

@@ -4,10 +4,11 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class DiscussionMessageDto {
+public class DiscussionMessageDto implements Serializable {
     private long id;
     @Size(min = 3, max = 1024, message = "Text should be no less 3 and no more 1024 signs")
     @NotNull

src/main/java/site/easystartup/web/forum/dto/TopicDto.java

@@ -4,10 +4,11 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class TopicDto {
+public class TopicDto implements Serializable {
     private long id;
     @Size(min = 3, max = 100, message = "Title should be no less 3 and no more 100 signs")
     @NotNull

src/main/java/site/easystartup/web/forum/repo/DiscussionMessageRepo.java

@@ -1,7 +1,8 @@
 package site.easystartup.web.forum.repo;
 
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 import site.easystartup.web.forum.domain.model.DiscussionMessage;
 
-public interface DiscussionMessageRepo extends CrudRepository<DiscussionMessage, Long> {
+public interface DiscussionMessageRepo extends JpaRepository<DiscussionMessage, Long> {
 }

src/main/java/site/easystartup/web/forum/repo/DiscussionRepo.java

@@ -1,7 +1,8 @@
 package site.easystartup.web.forum.repo;
 
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 import site.easystartup.web.forum.domain.model.Discussion;
 
-public interface DiscussionRepo extends CrudRepository<Discussion, Long> {
+public interface DiscussionRepo extends JpaRepository<Discussion, Long> {
 }

src/main/java/site/easystartup/web/forum/repo/TopicRepo.java

@@ -1,7 +1,8 @@
 package site.easystartup.web.forum.repo;
 
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.CrudRepository;
 import site.easystartup.web.forum.domain.model.Topic;
 
-public interface TopicRepo extends CrudRepository<Topic, Long> {
+public interface TopicRepo extends JpaRepository<Topic, Long> {
 }

src/main/java/site/easystartup/web/forum/service/ForumService.java

@@ -45,8 +45,10 @@ public class ForumService {
     }
 
     public List<DiscussionMessage> getMessagesByDiscussionId(long discussionId) {
-        return Lists.newArrayList(discussionMessageRepo.findAll()).stream()
-                .filter(m -> m.getDiscussion_id() == discussionId).toList();
+        List<DiscussionMessage> result = new ArrayList<DiscussionMessage>(Lists.newArrayList(discussionMessageRepo.findAll()).stream()
+                .filter(m -> m.getDiscussion_id() == discussionId).toList());
+        result.sort(DiscussionMessage::compareTo);
+        return result;
     }
 
     public Discussion getDiscussionById(long discussion_id) {
@@ -55,14 +57,18 @@ public class ForumService {
     }
 
     public List<Discussion> getDiscussionsByAuthor(Principal principal) {
-        return Lists.newArrayList(discussionRepo.findAll()).stream()
-                .filter(d -> d.getAuthor().equals(principal.getName())).toList();
+        List<Discussion> result = new ArrayList<>(Lists.newArrayList(discussionRepo.findAll()).stream()
+                .filter(d -> d.getAuthor().equals(principal.getName())).toList());
+        result.sort(Discussion::compareTo);
+        return result;
     }
 
     public List<Discussion> getDiscussionsByMember(Principal principal) {
-         return Lists.newArrayList(discussionRepo.findAll()).stream()
+        List<Discussion> result = new ArrayList<>(Lists.newArrayList(discussionRepo.findAll()).stream()
                 .filter(d -> getMessagesByDiscussionId(d.getId()).stream()
-                        .anyMatch(m -> m.getSender().equals(principal.getName()))).toList();
+                        .anyMatch(m -> m.getSender().equals(principal.getName()))).toList());
+        result.sort(Discussion::compareTo);
+        return result;
     }
 
     public List<Discussion> getPinnedDiscussionsByTopicId(long topic_id) {
@@ -72,10 +78,10 @@ public class ForumService {
     }
 
     public List<Discussion> getSortedDiscussionsByTopicId(long topic_id) {
-        List<Discussion> result = Lists.newArrayList(discussionRepo.findAll()).stream()
+        List<Discussion> result = new ArrayList<>(Lists.newArrayList(discussionRepo.findAll()).stream()
                 .filter(d -> !d.isPinned())
-                .filter(d -> d.getTopic() == topic_id).toList();
-        Collections.sort(result, Discussion::compareTo);
+                .filter(d -> d.getTopic() == topic_id).toList());
+        result.sort(Discussion::compareTo);
         return result;
     }