Merge pull request #148 from dd-jiyun/main

메세지 전체 삭제 기능
SKHU-TITTO · Mar 7, 2024 · c1d0a46 · c1d0a46
2 parents 3514d06 + e7ed0fc
commit c1d0a46
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/...Backend/src/main/java/com/example/titto_backend/message/controller/MessageController.java b/...Backend/src/main/java/com/example/titto_backend/message/controller/MessageController.java
@@ -119,5 +119,23 @@ public String deleteMessage(
         messageService.deleteMessage(messageId, userDetails.getUsername());
         return "메시지 삭제 성공";
     }
+
+    // TODO : 전체 메세지 삭제 (sender인 유저가 receiver유저와 한 대화내용을 삭제 / 지운사람한테만 지워짐.)
+    @PutMapping("/delete-all/{seletedUserId}")
+    @Operation(
+            summary = "전체 메시지 삭제",
+            description = "선택한 유저와의 전체 메시지를 삭제합니다.",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "요청 성공"),
+                    @ApiResponse(responseCode = "400", description = "잘못된 요청"),
+                    @ApiResponse(responseCode = "500", description = "관리자 문의")
+            })
+    public String deleteAllMessage(
+            @PathVariable Long seletedUserId,
+            @AuthenticationPrincipal UserDetails userDetails) {
+        messageService.deleteAllMessages(userDetails.getUsername(), seletedUserId);
+        return "메시지 전체 삭제 성공";
+    }
+
 }
 
diff --git a/Titto_Backend/src/main/java/com/example/titto_backend/message/service/MessageService.java b/Titto_Backend/src/main/java/com/example/titto_backend/message/service/MessageService.java
@@ -56,7 +56,10 @@ public List<Response> getBothMessages(String email, Long selectedUserId) {
     public List<MessageDTO.Preview> getAllMessagePreview(String email) {
         User user = userRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-
+        if (user.getReceivedMessages().stream().anyMatch(Message::isDeleted)) {
+            return convertMessagesToPreviewDTO(
+                    user.getReceivedMessages().stream().filter(message -> !message.isDeleted()).toList());
+        }
         List<Message> messages = messageRepository.findAllByReceiver(user);
         return convertMessagesToPreviewDTO(messages);
     }
@@ -79,7 +82,10 @@ public List<MessageDTO.Response> getMessagesByReceiver(String email) {
     public List<Response> getMessagesBySender(String email) {
         User sender = userRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
-
+        if (sender.getSentMessages().stream().anyMatch(Message::isDeleted)) {
+            return convertMessagesToDTO(
+                    sender.getSentMessages().stream().filter(message -> !message.isDeleted()).toList());
+        }
         List<Message> messages = messageRepository.findAllBySender(sender);
         return convertMessagesToDTO(messages);
     }
@@ -106,6 +112,22 @@ public void deleteMessage(Long messageId, String email) {
         }
     }
 
+    // 메세지 전체 삭제
+    @Transactional
+    public void deleteAllMessages(String email, Long selectedUserId) {
+        User user = userRepository.findByEmail(email)
+                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+        User selectedUser = userRepository.findById(selectedUserId)
+                .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+        List<Message> messages = messageRepository.findAllBySenderAndReceiverOrReceiverAndSender(user, selectedUser,
+                user, selectedUser);
+        for (Message message : messages) {
+            message.setDeleted(true);
+        }
+    }
+
     private List<MessageDTO.Response> convertMessagesToDTO(List<Message> messages) {
         return messages.stream()
                 .map(MessageDTO.Response::new)