Merge branch 'develop' into feat/issue-23

yuhojae · yuhojae · commit b7d11f850d92 · 2025-04-15T16:07:43.000+09:00
diff --git a/api/src/main/java/com/mbtips/common/exception/handler/GlobalExceptionHandler.java b/api/src/main/java/com/mbtips/common/exception/handler/GlobalExceptionHandler.java
@@ -50,8 +50,6 @@ public ApiResponse<Void> exceptionsHandler(MethodArgumentNotValidException e) {
         return ApiResponse.fail(CommonException.INVALID_REQUEST_ERROR);
     }
 
-    /**
-     * VirtualFriendNotFoundException 구현 변경
-     */
+
 
 }
diff --git a/api/src/main/java/com/mbtips/domain/addition/service/AdditionService.java b/api/src/main/java/com/mbtips/domain/addition/service/AdditionService.java
@@ -1,6 +1,8 @@
 package com.mbtips.domain.addition.service;
 
 import com.mbtips.clova.dto.Message;
+import com.mbtips.common.exception.CustomException;
+import com.mbtips.common.exception.enums.CommonException;
 import com.mbtips.common.mbtiinfo.MbtiTraits;
 import com.mbtips.common.mbtiinfo.MbtiType;
 import com.mbtips.domain.conversation.service.ConversationService;
@@ -39,17 +41,25 @@ public String requestConversationTips(Long virtualFriendId) {
     }
 
     public String requestTemperature(Long conversationId) {
-        Conversation conversation = conversationService.findById(conversationId);
+
         List<GetMessageResponseDto> messages =  messageService.getMessagesOfConversationId(conversationId);
 
-        String[] messageList = {
-                "사용자: 안녕하세요, 오늘 기분이 어떠세요?",
-                "AI: 안녕하세요, 오늘 기분이 활기차고 즐거워요.",
-                "사용자: 오늘 특별한 계획이 있으세요?",
-                "AI: 네, 친구와 함께 신나는 시간을 보낼 예정입니다."
-        };
-        String requestConversation = String.join(", ", messageList);
-        String prompt = requestConversation + "현재까지의 대화 온도 측정해서 0~100 사이의 숫자로만 대답해줘 냉정하게 판단해주고, 숫자로만 대답해.";
+        StringBuilder messageBuilder = new StringBuilder();
+
+        if(messages.size() <= 5) throw new CustomException(CommonException.TOO_FEW_CONVERSATIONS);
+        for(int i = messages.size() - 6; i < messages.size(); i++){
+            if(messages.get(i).userId() != null) {
+                messageBuilder.append("사용자 : ");
+                messageBuilder.append(messages.get(i).messageContent());
+            }
+            if(messages.get(i).virtualFriendId() != null) {
+                messageBuilder.append("가상 친구 : ");
+                messageBuilder.append(messages.get(i).messageContent());
+            }
+            if(i != messages.size() -1 ) messageBuilder.append(", ");
+        }
+        log.debug("대화 내역 : {}", messageBuilder.toString());
+        String prompt = messageBuilder + "현재까지의 대화 온도 측정해서 0~100 사이의 숫자로만 대답해줘 냉정하게 판단해주고, 숫자로만 대답해.";
         log.debug("prompt : {}", prompt);
         String temperatureResponse = messageManager.messageRequest(prompt);
         String result = temperatureResponse.replaceAll("[^0-9]", "");
diff --git a/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendService.java b/api/src/main/java/com/mbtips/domain/virtualfriend/VirtualFriendService.java
@@ -78,18 +78,6 @@ public void deleteVirtualFriend(Long virtualFriendId, User user) {
 
     }
 
-    public String makePrompt(Long conversationId) {
-        Conversation conversation = conversationRepository.findById(conversationId);
-        VirtualFriend virtualFriend = conversation.getVirtualFriend();
-        // 대화방 기록
-        // 가상친구 특성
-        String mbti = virtualFriend.getMbti();
-        MbtiType mbtiType = MbtiType.valueOf(mbti);
-        String result = MbtiTraits.getTrait(mbtiType);
-        // 가상친구 관심사
-        result += ". 이제 대화를 시작해보자!";
-        return result;
-    }
 
     public VirtualFriendInfoResponse findFriendInfoById(Long virtualFriendId) {
         VirtualFriend virtualFriend = virtualFriendRepository.findById(virtualFriendId);
diff --git a/api/src/main/java/com/mbtips/message/application/manager/MessageManager.java b/api/src/main/java/com/mbtips/message/application/manager/MessageManager.java
@@ -5,21 +5,22 @@
 import com.mbtips.clova.client.ClovaApiFeignClient;
 import com.mbtips.clova.dto.ChatRequest;
 import com.mbtips.clova.dto.ClovaApiResponse;
+import com.mbtips.common.mbtiinfo.MbtiTraits;
+import com.mbtips.common.mbtiinfo.MbtiType;
 import com.mbtips.common.provider.ClovaApiKeyProvider;
+import com.mbtips.conversation.interfaces.ConversationRepository;
 import com.mbtips.domain.conversation.service.ConversationService;
 import com.mbtips.domain.converstation.Conversation;
 import com.mbtips.domain.message.Message;
 import com.mbtips.domain.message.dto.request.CreateMessageRequestDto;
 import com.mbtips.domain.user.User;
-import com.mbtips.fastfriend.entity.FastFriend;
+import com.mbtips.domain.virtualfriend.VirtualFriend;
 import com.mbtips.message.application.service.MessageService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.UUID;
 
 @Service
@@ -31,21 +32,49 @@ public class MessageManager {
     private final ConversationService conversationService;
     private final ClovaApiFeignClient clovaApiFeignClient;
     private final ClovaApiKeyProvider clovaApiKeyProvider;
+    private final ConversationRepository conversationRepository;
     private final ObjectMapper objectMapper;
 
-    public void sendMessage(User user, CreateMessageRequestDto createMessageRequestDto) {
+    public String sendMessage(User user, CreateMessageRequestDto createMessageRequestDto) {
         Conversation conversation = conversationService.findById(createMessageRequestDto.conversationId());
 
 
         Message requestMessage = Message.builder()
                 .user(user)
                 .conversation(conversation)
-                .virtualFriend(conversation.getVirtualFriend())
+//                .virtualFriend(conversation.getVirtualFriend())
                 .messageContent(createMessageRequestDto.messageContent())
                 .build();
 
         messageService.saveMessage(requestMessage);
 
+        String prompt = makePrompt(createMessageRequestDto.conversationId());
+        log.debug("prompt : {} ", prompt);
+        String responseContent = messageRequest(prompt + " " + createMessageRequestDto.messageContent());
+        log.debug("responseMessage : {} ", responseContent);
+
+        Message responseMessage = Message.builder()
+                .conversation(conversation)
+                .virtualFriend(conversation.getVirtualFriend())
+                .messageContent(responseContent)
+                .build();
+
+        messageService.saveMessage(responseMessage);
+        return responseContent;
+    }
+
+    private String makePrompt(Long conversationId) {
+        Conversation conversation = conversationRepository.findById(conversationId);
+        VirtualFriend virtualFriend = conversation.getVirtualFriend();
+        // 대화방 기록
+        // 가상친구 특성
+        String mbti = virtualFriend.getMbti();
+        MbtiType mbtiType = MbtiType.valueOf(mbti);
+        String result = MbtiTraits.getTrait(mbtiType);
+        // 가상친구 관심사
+        result += ". 이제 대화를 시작해보자!";
+        return result;
+
     }
 
     public String messageRequest(String content){
diff --git a/api/src/main/java/com/mbtips/message/controller/MessageController.java b/api/src/main/java/com/mbtips/message/controller/MessageController.java
@@ -34,11 +34,7 @@ public ApiResponse<List<GetMessageResponseDto>> getMessagesOfConversationId(@Pat
 
     @PostMapping
     public ApiResponse<String> createMessage(@RequestBody CreateMessageRequestDto createMessageRequestDto, @LoginUser User user){
-        messageManager.sendMessage(user, createMessageRequestDto);
-        String content = createMessageRequestDto.messageContent();
-        String prompt = virtualFriendService.makePrompt(createMessageRequestDto.conversationId());
-        log.debug("prompt : {}", prompt);
-        String clovaResponse = messageManager.messageRequest(content);
+        String clovaResponse = messageManager.sendMessage(user, createMessageRequestDto);
         return ApiResponse.success(clovaResponse);
     }
 
diff --git a/api/src/main/java/com/mbtips/user/controller/BeanChecker.java b/api/src/main/java/com/mbtips/user/controller/BeanChecker.java
@@ -0,0 +1,23 @@
+package com.mbtips.user.controller;
+
+import com.mbtips.common.properties.JwtProperties;
+import jakarta.annotation.PostConstruct;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanChecker {
+
+    private final ApplicationContext applicationContext;
+
+    public BeanChecker(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    @PostConstruct
+    public void checkBean() {
+        JwtProperties bean = applicationContext.getBean(JwtProperties.class);
+        System.out.println("JwtProperties 빈 등록 여부: " + bean.secret());
+        System.out.println("JwtProperties 빈 등록 여부: " + bean.expiration());
+    }
+}
diff --git a/core/src/main/java/com/mbtips/common/exception/enums/CommonException.java b/core/src/main/java/com/mbtips/common/exception/enums/CommonException.java
@@ -9,8 +9,8 @@ public enum CommonException implements ExceptionInterface {
     INVALID_REQUEST_ERROR(400, "잘못된 요청입니다."),
     LOGIN_EXPIRATION(403, "로그인이 만료되었습니다."),
     INTERNAL_SERVER_ERROR(500, "서버 오류입니다."),
-    JSON_PROCESS_ERROR(501, "JSON 변형 도중 오류가 발생했습니다.")
-
+    JSON_PROCESS_ERROR(501, "JSON 변형 도중 오류가 발생했습니다."),
+    TOO_FEW_CONVERSATIONS(40001, "대화의 개수가 부족합니다.(5회 이상)")
     ;
 
     private final int code;
diff --git a/repository/src/main/java/com/mbtips/fastfriend/entity/FastFriend.java b/repository/src/main/java/com/mbtips/fastfriend/entity/FastFriend.java
@@ -26,7 +26,6 @@ public class FastFriend {
     private int fastFriendAge;
 
     @Enumerated(EnumType.STRING)
-    @Column(length = 10, nullable = false)
     private Gender fastFriendSex;
 
     @Column(length = 20)
diff --git a/repository/src/main/java/com/mbtips/message/entity/MessageEntity.java b/repository/src/main/java/com/mbtips/message/entity/MessageEntity.java
@@ -27,11 +27,11 @@ public class MessageEntity {
     private ConversationEntity conversationEntity;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false, foreignKey = @ForeignKey(NO_CONSTRAINT))
+    @JoinColumn(name = "user_id", foreignKey = @ForeignKey(NO_CONSTRAINT))
     private UserEntity user;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "virtual_friend_id", nullable = false, foreignKey = @ForeignKey(NO_CONSTRAINT))
+    @JoinColumn(name = "virtual_friend_id", foreignKey = @ForeignKey(NO_CONSTRAINT))
     private VirtualFriendEntity virtualFriendEntity;
 
     @Column(length = 500, nullable = false)
@@ -45,8 +45,8 @@ public class MessageEntity {
     public MessageEntity(Message message) {
         this.messageId = message.getMessageId();
         this.conversationEntity = new ConversationEntity(message.getConversation());
-        this.user = new UserEntity(message.getUser());
-        this.virtualFriendEntity = new VirtualFriendEntity(message.getVirtualFriend());
+        if(message.getUser() != null ) this.user = new UserEntity(message.getUser());
+        if(message.getVirtualFriend() != null)this.virtualFriendEntity = new VirtualFriendEntity(message.getVirtualFriend());
         this.messageContent = message.getMessageContent();
         this.sentAt = LocalDateTime.now();
     }
diff --git a/repository/src/main/java/com/mbtips/message/repository/jpa/MessageJpaRepository.java b/repository/src/main/java/com/mbtips/message/repository/jpa/MessageJpaRepository.java
@@ -19,6 +19,7 @@ public interface MessageJpaRepository extends JpaRepository<MessageEntity, Long>
                 "m.user.userId, " +
                 "m.virtualFriendEntity.virtualFriendId) " +
             "from MessageEntity m " +
-            "where m.conversationEntity.conversationId = :conversationId")
+            "where m.conversationEntity.conversationId = :conversationId " +
+            "ORDER BY m.sentAt asc")
     List<GetMessageResponseDto> findByConversationId(Long conversationId);
 }
diff --git a/repository/src/main/resources/local/application-repository.yaml b/repository/src/main/resources/local/application-repository.yaml
@@ -8,7 +8,7 @@ spring:
   jpa:
     show-sql: true
     hibernate:
-      ddl-auto: null
+      ddl-auto: none
     properties:
       hibernate:
         format_sql: true
diff --git a/repository/src/main/resources/prod/application-repository.yaml b/repository/src/main/resources/prod/application-repository.yaml
@@ -9,7 +9,7 @@ spring:
     show-sql: true
     database-platform: org.hibernate.dialect.MySQL8Dialect
     hibernate:
-      ddl-auto: create
+      ddl-auto: none #테이블 생성
     properties:
       hibernate:
         format_sql: true

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ public ApiResponse<Void> exceptionsHandler(MethodArgumentNotValidException e) {`
`50`	`50`	`return ApiResponse.fail(CommonException.INVALID_REQUEST_ERROR);`
`51`	`51`	`}`
`52`	`52`
`53`		`- /**`
`54`		`- * VirtualFriendNotFoundException 구현 변경`
`55`		`- */`
	`53`	`+`
`56`	`54`
`57`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public interface MessageJpaRepository extends JpaRepository<MessageEntity, Long>`
`19`	`19`	`"m.user.userId, " +`
`20`	`20`	`"m.virtualFriendEntity.virtualFriendId) " +`
`21`	`21`	`"from MessageEntity m " +`
`22`		`- "where m.conversationEntity.conversationId = :conversationId")`
	`22`	`+ "where m.conversationEntity.conversationId = :conversationId " +`
	`23`	`+ "ORDER BY m.sentAt asc")`
`23`	`24`	`List<GetMessageResponseDto> findByConversationId(Long conversationId);`
`24`	`25`	`}`