make sendMessage return Message

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

Hide file tree

Showing 3 changed files with 5 additions and 5 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
@@ -42,10 +42,10 @@ public ResponseEntity<List<Message>> getMessagesBetweenUsers(HttpServletRequest
     }
 
     @PostMapping("/send")
-    public ResponseEntity<MessageDTO> sendMessage(@RequestBody MessageDTO message, HttpServletRequest httpServletRequest) {
+    public ResponseEntity<Message> sendMessage(@RequestBody MessageDTO message, HttpServletRequest httpServletRequest) {
         PublicUserDTO loggedUser = (PublicUserDTO) httpServletRequest.getAttribute(JwtAuthenticationFilter.userKey);
 
-        MessageDTO sentMessage = messageService.sendMessage(message, loggedUser);
+        Message sentMessage = messageService.sendMessage(message, loggedUser);
         return ResponseEntity.ok(sentMessage);
     }
 }

diff --git a/server/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/MessageService.java b/server/src/main/java/com/ginAndTonic/LudogorieHackEnter2024/services/MessageService.java
@@ -10,5 +10,5 @@
 public interface MessageService {
     List<Message> getMessagesBetweenUsers(User sender, User receiver);
 
-    MessageDTO sendMessage(MessageDTO message, PublicUserDTO loggedUser);
+    Message 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
@@ -34,7 +34,7 @@ public List<Message> getMessagesBetweenUsers(User sender, User receiver) {
     }
 
     @Override
-    public MessageDTO sendMessage(MessageDTO message, PublicUserDTO loggedUser) {
+    public Message sendMessage(MessageDTO message, PublicUserDTO loggedUser) {
         User logged = userRepository.findById(loggedUser.getId()).orElseThrow(UserNotFoundException::new);
 
         message.setSenderId(logged.getId());
@@ -43,7 +43,7 @@ public MessageDTO sendMessage(MessageDTO message, PublicUserDTO loggedUser) {
         Message savedMessage = modelMapper.map(message, Message.class);
         messagesRepository.save(savedMessage);
 
-        return message;
+        return savedMessage;
     }
 }