make getMessagesBetweenUsers return Message

Gin-n-Tonicc · Apr 21, 2024 · bd6610d · bd6610d
1 parent ec5541e
commit bd6610d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...r/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/controllers/MessageController.java b/...r/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/controllers/MessageController.java
@@ -4,6 +4,7 @@
 import com.ginAndTonic.LudogorieHackEnter2024.filters.JwtAuthenticationFilter;
 import com.ginAndTonic.LudogorieHackEnter2024.model.dto.auth.PublicUserDTO;
 import com.ginAndTonic.LudogorieHackEnter2024.model.dto.common.MessageDTO;
+import com.ginAndTonic.LudogorieHackEnter2024.model.entity.Message;
 import com.ginAndTonic.LudogorieHackEnter2024.model.entity.User;
 import com.ginAndTonic.LudogorieHackEnter2024.repositories.UserRepository;
 import com.ginAndTonic.LudogorieHackEnter2024.services.MessageService;
@@ -25,8 +26,8 @@ public MessageController(MessageService messageService, UserRepository userRepos
     }
 
     @GetMapping("/{receiverId}")
-    public ResponseEntity<List<MessageDTO>> getMessagesBetweenUsers(HttpServletRequest httpServletRequest,
-                                                                    @PathVariable Long receiverId) {
+    public ResponseEntity<List<Message>> getMessagesBetweenUsers(HttpServletRequest httpServletRequest,
+                                                                 @PathVariable Long receiverId) {
         PublicUserDTO loggedUser = (PublicUserDTO) httpServletRequest.getAttribute(JwtAuthenticationFilter.userKey);
 
         User sender = userRepository.findById(loggedUser.getId()).orElseThrow(UserNotFoundException::new);
@@ -36,7 +37,7 @@ public ResponseEntity<List<MessageDTO>> getMessagesBetweenUsers(HttpServletReque
             return ResponseEntity.notFound().build();
         }
 
-        List<MessageDTO> messages = messageService.getMessagesBetweenUsers(sender, receiver);
+        List<Message> messages = messageService.getMessagesBetweenUsers(sender, receiver);
         return ResponseEntity.ok(messages);
     }
 

diff --git a/server/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/MessageService.java b/server/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/MessageService.java
@@ -2,12 +2,13 @@
 
 import com.ginAndTonic.LudogorieHackEnter2024.model.dto.auth.PublicUserDTO;
 import com.ginAndTonic.LudogorieHackEnter2024.model.dto.common.MessageDTO;
+import com.ginAndTonic.LudogorieHackEnter2024.model.entity.Message;
 import com.ginAndTonic.LudogorieHackEnter2024.model.entity.User;
 
 import java.util.List;
 
 public interface MessageService {
-    List<MessageDTO> getMessagesBetweenUsers(User sender, User receiver);
+    List<Message> getMessagesBetweenUsers(User sender, User receiver);
 
     MessageDTO sendMessage(MessageDTO message, PublicUserDTO loggedUser);
 }
diff --git a/...rc/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/impl/MessageServiceImpl.java b/...rc/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/impl/MessageServiceImpl.java
@@ -29,9 +29,8 @@ public MessageServiceImpl(MessagesRepository messagesRepository, UserRepository
     }
 
     @Override
-    public List<MessageDTO> getMessagesBetweenUsers(User sender, User receiver) {
-        List<Message> messages = messagesRepository.findMessagesBetweenUsers(sender, receiver);
-        return messages.stream().map(event -> modelMapper.map(event, MessageDTO.class)).toList();
+    public List<Message> getMessagesBetweenUsers(User sender, User receiver) {
+        return messagesRepository.findMessagesBetweenUsers(sender, receiver);
     }
 
     @Override