feat : 가상친구 메시지 요청, 메시지 히스토리 추가

Author: yuhojae

api/src/main/java/com/mbtips/common/exception/handler/GlobalExceptionHandler.java

@@ -1,9 +1,11 @@
 package com.mbtips.common.exception.handler;
 
 import com.mbtips.common.exception.CustomException;
+import com.mbtips.common.exception.ErrorResponse;
 import com.mbtips.common.exception.enums.CommonException;
 import com.mbtips.common.response.ApiResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -18,9 +20,12 @@
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(CustomException.class)
-    public ResponseEntity<Void> customExceptionHandler(CustomException e) {
+    // 반환타입 void -> ErrorResponse, 클라이언트에서 코드, 메시지를 확인하도록
+    public ResponseEntity<ErrorResponse> customExceptionHandler(CustomException e) {
         log.error("### CustomExceptionHandler : {}", e.getMessage(), e);
-        return ResponseEntity.internalServerError().build();
+//        return ResponseEntity.internalServerError().build();
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                .body(new ErrorResponse(e.getException().getCode(), e.getException().getMessage()));
     }
 
     @ExceptionHandler(IllegalArgumentException.class)
@@ -35,9 +40,6 @@ public ResponseEntity<Void> exceptionHandler(Exception e) {
         return ResponseEntity.internalServerError().build();
     }
 
-    /**
-     * to-do customexception 적용하기
-     */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public ApiResponse<Void> exceptionsHandler(MethodArgumentNotValidException e) {
 

api/src/main/java/com/mbtips/domain/addition/service/AdditionService.java

@@ -5,6 +5,7 @@
 import com.mbtips.common.exception.enums.CommonException;
 import com.mbtips.common.mbtiinfo.MbtiTraits;
 import com.mbtips.common.mbtiinfo.MbtiType;
+import com.mbtips.domain.addtion.exception.AdditionException;
 import com.mbtips.domain.conversation.service.ConversationService;
 import com.mbtips.domain.converstation.Conversation;
 import com.mbtips.domain.message.dto.response.GetMessageResponseDto;
@@ -43,10 +44,10 @@ public String requestConversationTips(Long virtualFriendId) {
     public String requestTemperature(Long conversationId) {
 
         List<GetMessageResponseDto> messages =  messageService.getMessagesOfConversationId(conversationId);
-
+        log.debug("messages.size: {}", messages.size());
         StringBuilder messageBuilder = new StringBuilder();
 
-        if(messages.size() <= 5) throw new CustomException(CommonException.TOO_FEW_CONVERSATIONS);
+        if(messages.size() <= 5) throw new CustomException(AdditionException.TOO_FEW_CONVERSATIONS);
         for(int i = messages.size() - 6; i < messages.size(); i++){
             if(messages.get(i).userId() != null) {
                 messageBuilder.append("사용자 : ");

api/src/main/java/com/mbtips/message/application/manager/MessageManager.java

@@ -13,6 +13,7 @@
 import com.mbtips.domain.converstation.Conversation;
 import com.mbtips.domain.message.Message;
 import com.mbtips.domain.message.dto.request.CreateMessageRequestDto;
+import com.mbtips.domain.message.dto.response.GetMessageResponseDto;
 import com.mbtips.domain.user.User;
 import com.mbtips.domain.virtualfriend.VirtualFriend;
 import com.mbtips.message.application.service.MessageService;
@@ -21,6 +22,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 @Service
@@ -53,6 +55,9 @@ public String sendMessage(User user, CreateMessageRequestDto createMessageReques
         String responseContent = messageRequest(prompt + " " + createMessageRequestDto.messageContent());
         log.debug("responseMessage : {} ", responseContent);
 
+        List<GetMessageResponseDto> messages = messageService.getRecentMessagesOfConversationId(conversation.getConversationId());
+
+
         Message responseMessage = Message.builder()
                 .conversation(conversation)
                 .virtualFriend(conversation.getVirtualFriend())

api/src/main/java/com/mbtips/message/application/service/MessageService.java

@@ -23,4 +23,8 @@ public List<GetMessageResponseDto> getMessagesOfConversationId(Long conversation
     public void saveMessage(Message message) {
         messageRepository.createMessage(message);
     }
+
+    public List<GetMessageResponseDto> getRecentMessagesOfConversationId(Long conversationId) {
+        return messageRepository.findRecentMessagesByConversationId(conversationId);
+    }
 }

core/src/main/java/com/mbtips/common/exception/ErrorResponse.java

@@ -0,0 +1,11 @@
+package com.mbtips.common.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class ErrorResponse {
+    private final int code;
+    private final String message;
+}

core/src/main/java/com/mbtips/common/exception/enums/CommonException.java

@@ -10,7 +10,6 @@ public enum CommonException implements ExceptionInterface {
     LOGIN_EXPIRATION(403, "로그인이 만료되었습니다."),
     INTERNAL_SERVER_ERROR(500, "서버 오류입니다."),
     JSON_PROCESS_ERROR(501, "JSON 변형 도중 오류가 발생했습니다."),
-    TOO_FEW_CONVERSATIONS(40001, "대화의 개수가 부족합니다.(5회 이상)")
     ;
 
     private final int code;

core/src/main/java/com/mbtips/domain/addtion/exception/AdditionException.java

@@ -0,0 +1,20 @@
+package com.mbtips.domain.addtion.exception;
+
+import com.mbtips.common.exception.interfaces.ExceptionInterface;
+import lombok.Getter;
+
+@Getter
+public enum AdditionException implements ExceptionInterface {
+
+    TOO_FEW_CONVERSATIONS(40001, "대화의 개수가 부족합니다.(5회 이상)")
+
+    ;
+
+    private final int code;
+    private final String message;
+
+    AdditionException(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

repository/src/main/java/com/mbtips/message/interfaces/MessageRepository.java

@@ -10,4 +10,6 @@ public interface MessageRepository {
     List<GetMessageResponseDto> findByConversationId(long conversationId);
 
     void createMessage(Message message);
+
+    List<GetMessageResponseDto> findRecentMessagesByConversationId(Long conversationId);
 }

repository/src/main/java/com/mbtips/message/repository/impl/MessageRepositoryImpl.java

@@ -6,6 +6,9 @@
 import com.mbtips.message.interfaces.MessageRepository;
 import com.mbtips.message.repository.jpa.MessageJpaRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,4 +34,10 @@ public void createMessage(Message message) {
         messageJpaRepository.save(messageEntity);
     }
 
+    @Override
+    public List<GetMessageResponseDto> findRecentMessagesByConversationId(Long conversationId) {
+        return messageJpaRepository.findRecentMessagesByConversationId(conversationId, PageRequest.of(0,5));
+    }
+
+
 }

repository/src/main/java/com/mbtips/message/repository/jpa/MessageJpaRepository.java

@@ -3,6 +3,7 @@
 
 import com.mbtips.domain.message.dto.response.GetMessageResponseDto;
 import com.mbtips.message.entity.MessageEntity;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -22,4 +23,11 @@ public interface MessageJpaRepository extends JpaRepository<MessageEntity, Long>
             "where m.conversationEntity.conversationId = :conversationId " +
             "ORDER BY m.sentAt asc")
     List<GetMessageResponseDto> findByConversationId(Long conversationId);
+
+    @Query("SELECT new com.mbtips.domain.message.dto.response.GetMessageResponseDto(" +
+            "m.messageId, m.messageContent, m.sentAt, m.user.userId, m.virtualFriendEntity.virtualFriendId) " +
+            "FROM MessageEntity m " +
+            "WHERE m.conversationEntity.conversationId = :conversationId " +
+            "ORDER BY m.sentAt DESC")
+    List<GetMessageResponseDto> findRecentMessagesByConversationId(Long conversationId, PageRequest of);
 }