Merge branch 'feat/issue-24' into develop

yhj0214 · yhj0214 · commit 7389dd918059 · 2025-04-19T14:05:36.000+09:00
diff --git a/api/src/main/java/com/mbtips/domain/addition/controller/AdditionController.java b/api/src/main/java/com/mbtips/domain/addition/controller/AdditionController.java
@@ -12,6 +12,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @SecurityRequirements
 @RequiredArgsConstructor
@@ -22,8 +24,8 @@ public class AdditionController {
 
     @GetMapping("/tips/{virtualFriendId}")
     @Operation(summary = "대화 꿀팁", description = "해당 AI와의 대화 꿀팁을 반환합니다.")
-    public ApiResponse<String> requestConversationTips(@PathVariable Long virtualFriendId, @LoginUser User user){
-        String result = additionService.requestConversationTips(virtualFriendId);
+    public ApiResponse<List<String>> requestConversationTips(@PathVariable Long virtualFriendId, @LoginUser User user){
+        List<String> result = additionService.requestConversationTips(virtualFriendId);
         return ApiResponse.success(result);
     }
 
@@ -37,8 +39,8 @@ public ApiResponse<String> requestTemperature(@PathVariable Long conversationId)
 
     @GetMapping("/recommendtopic/{virtualFriendId}")
     @Operation(summary = "대화 주제 추천", description = "해당 AI와의 대화 주제를 추천합니다.")
-    public ApiResponse<String> reqeustRecommendTopic(@PathVariable Long virtualFriendId) {
-        String result = additionService.requestRecommendTopic(virtualFriendId);
+    public ApiResponse<List<String>> reqeustRecommendTopic(@PathVariable Long virtualFriendId) {
+        List<String> result = additionService.requestRecommendTopic(virtualFriendId);
         return ApiResponse.success(result);
     }
 }
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
@@ -21,6 +21,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Service
 @RequiredArgsConstructor
@@ -32,14 +34,19 @@ public class AdditionService {
     public final MessageService messageService;
     public final VirtualFriendService virtualFriendService;
 
-    public String requestConversationTips(Long virtualFriendId) {
+    public List<String> requestConversationTips(Long virtualFriendId) {
         VirtualFriendInfoResponse virtualFriend = virtualFriendService.findFriendInfoById(virtualFriendId);
 
         String mbtiTrait = MbtiTraits.getTrait(MbtiType.valueOf(virtualFriend.mbti()));
         mbtiTrait = mbtiTrait.substring(mbtiTrait.indexOf("특징을 설명해주면 다음과 같아"));
-        String requestPrompt = mbtiTrait + ", 이 mbti와 대화할 때, 꿀팁 알려줘";
+        String requestPrompt = mbtiTrait + ", 이 mbti와 대화할 때 꿀팁 작성해줘. 대화 주제 별로 번호를 달아 나열해 설명해줘. 4~5개정도만 알려주고, 꿀팁 앞뒤로 쓸데없는 구문은 빼고 답변해줘";
         log.debug("requstPrompt : {}", requestPrompt);
-        String result = messageManager.messageRequest(requestPrompt);
+        String response = messageManager.messageRequest(requestPrompt);
+
+        log.debug("result : {}", response);
+
+
+        List<String> result = extractItems(response);
         return result;
     }
 
@@ -69,14 +76,36 @@ public String requestTemperature(Long conversationId) {
         return result;
     }
 
-    public String requestRecommendTopic(Long virtualFriendId) {
+    public List<String> requestRecommendTopic(Long virtualFriendId) {
         VirtualFriendInfoResponse virtualFriend = virtualFriendService.findFriendInfoById(virtualFriendId);
         String mbtiTrait = MbtiTraits.getTrait(MbtiType.valueOf(virtualFriend.mbti()));
         mbtiTrait = mbtiTrait.substring(mbtiTrait.indexOf("특징을 설명해주면 다음과 같아"));
-        String requestPrompt = mbtiTrait + ", 이 mbti와 대화할 때, 맞는 대화 주제 키워드 5개만 추천해줘, 짧게 단어로만 이야기해줘";
+        String requestPrompt = mbtiTrait + ", 이 mbti와 대화할 때, 맞는 대화 주제를 작성해줘. 대화 주제 별로 번호를 달아 나열해 설명해줘. 4~5개정도만 알려주고, 대화 주제 앞뒤로 쓸데없는 구문은 빼고 답변해줘";
 
-        String result = messageManager.messageRequest(requestPrompt);
-        log.debug("result : {}", result);
+        String response = messageManager.messageRequest(requestPrompt);
+        log.debug("result : {}", response);
+
+        List<String> result = extractItems(response);
         return result;
     }
+
+    private List<String> extractItems(String text) {
+        List<String> items = new ArrayList<>();
+
+        // (?m) : ^, $가 각 라인 시작/끝을 의미하도록
+        // (?s) : '.'이 개행문자도 매칭하도록
+        // \\d+\\.\\s* : 숫자+마침표+공백
+        // (.+?) : 항목 내용 (최소 매칭)
+        // (?=\\r?\\n\\d+\\.|\\z) : 다음 항목 번호 또는 문자열 끝 전까지
+        String regex = "(?ms)\\d+\\.\\s*(.+?)(?=\\r?\\n\\d+\\.|\\z)";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(text);
+
+        while (matcher.find()) {
+            // group(1)에 번호와 마침표를 제외한 '내용'만 들어있음
+            items.add(matcher.group(1).trim());
+        }
+
+        return items;
+    }
 }
diff --git a/api/src/main/java/com/mbtips/domain/fastfriend/service/FastFriendService.java b/api/src/main/java/com/mbtips/domain/fastfriend/service/FastFriendService.java
@@ -47,9 +47,9 @@ public String messageRequest(FastFriendMessageRequest request) {
     private String getfastFriendPrompt(FastFriend fastFriend) {
         StringBuilder result = new StringBuilder();
 
+        if(fastFriend.getFastFriendName() != null) result.append(" 너의 이름은 " + fastFriend.getFastFriendName() +"이야. 명심해!");
         MbtiType mbtiType = MbtiType.valueOf(fastFriend.getMbti());
         result.append(MbtiTraits.getTrait(mbtiType));
-        if(fastFriend.getFastFriendName() != null) result.append(" 너의 이름은 " + fastFriend.getFastFriendName() +"이야. ");
         if(fastFriend.getFastFriendAge() != 0) result.append(" 너의 나이는 " + fastFriend.getFastFriendAge() + "이야. ");
         if(fastFriend.getFastFriendSex() != null) result.append(" 너의 성별은 " + fastFriend.getFastFriendSex() + "이야. ");
         if(fastFriend.getFastFriendRelationship() != null) result.append("너와 나의 관계는 " + fastFriend.getFastFriendRelationship() + "이야");
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
@@ -50,13 +50,18 @@ public String sendMessage(User user, CreateMessageRequestDto createMessageReques
 
         messageService.saveMessage(requestMessage);
 
+        List<GetMessageResponseDto> messages = messageService.getRecentMessagesOfConversationId(conversation.getConversationId());
+
         String prompt = makePrompt(createMessageRequestDto.conversationId());
+
+        String recentMessagesPrompt = makeRecentMessageString(messages);
+        prompt += recentMessagesPrompt;
+        prompt = prompt + ". 이제 대화를 시작해보자!";
         log.debug("prompt : {} ", prompt);
+
         String responseContent = messageRequest(prompt + " " + createMessageRequestDto.messageContent());
         log.debug("responseMessage : {} ", responseContent);
 
-        List<GetMessageResponseDto> messages = messageService.getRecentMessagesOfConversationId(conversation.getConversationId());
-
 
         Message responseMessage = Message.builder()
                 .conversation(conversation)
@@ -68,6 +73,23 @@ public String sendMessage(User user, CreateMessageRequestDto createMessageReques
         return responseContent;
     }
 
+    private String makeRecentMessageString(List<GetMessageResponseDto> messages) {
+        StringBuilder messageBuilder = new StringBuilder();
+        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(", ");
+        }
+
+        return messageBuilder.toString();
+    }
+
     private String makePrompt(Long conversationId) {
         Conversation conversation = conversationRepository.findById(conversationId);
         VirtualFriend virtualFriend = conversation.getVirtualFriend();
@@ -76,15 +98,14 @@ private String makePrompt(Long conversationId) {
         String mbti = virtualFriend.getMbti();
         MbtiType mbtiType = MbtiType.valueOf(mbti);
         String result = MbtiTraits.getTrait(mbtiType);
-        // 가상친구 관심사
-        result += ". 이제 대화를 시작해보자!";
+
         return result;
 
     }
 
     public String messageRequest(String content){
         com.mbtips.clova.dto.Message message = new com.mbtips.clova.dto.Message("user", content);
-        ChatRequest chatRequest = new ChatRequest(Arrays.asList(message));
+        ChatRequest chatRequest = new ChatRequest(Arrays.asList(message), 2000);
         String apiResult = clovaApiFeignClient.getResponse(
                 "Bearer " + clovaApiKeyProvider.apiKey(),
                 UUID.randomUUID().toString(),
diff --git a/external/src/main/java/com/mbtips/clova/dto/ChatRequest.java b/external/src/main/java/com/mbtips/clova/dto/ChatRequest.java
@@ -12,4 +12,5 @@
 public
 class ChatRequest {
     private List<Message> messages;
+    private Integer maxTokens;
 }

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@`
`12`	`12`	`public`
`13`	`13`	`class ChatRequest {`
`14`	`14`	`private List<Message> messages;`
	`15`	`+ private Integer maxTokens;`
`15`	`16`	`}`