Merge pull request #46 from HSU-Talky/dev

Merge dev into main

Author: zzuhannn

src/main/java/com/example/talky/adapter/ai/AiServerClient.java

@@ -43,6 +43,12 @@ public class NormalUser extends User{
     @JoinColumn(name = "guardian_id")
     private Guardians guardians;
 
+    @Column(name = "guardian_name")
+    private String guardianName;
+
+    @Column(name = "guardian_phone")
+    private String guardianPhone;
+
     private boolean isAcceptedLocationInfo;
 
     @Override

src/main/java/com/example/talky/adapter/ai/AiServerClientImpl.java

@@ -1,10 +1,10 @@
 package com.example.talky.domain.recommendation.service;
 
-import com.example.talky.domain.recommendation.web.dto.GetContextReq;
 import com.example.talky.global.ai.dto.AiRcmdRes;
-import com.example.talky.global.response.SuccessResponse;
-import org.springframework.http.ResponseEntity;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import org.springframework.web.multipart.MultipartFile;
 
 public interface RcmdService {
-    AiRcmdRes getAiRcmd(GetContextReq req, Long normalId);
+
+    AiRcmdRes getAiRcmd(MultipartFile file, String metadataJson, Long normalId) throws JsonProcessingException;
 }

src/main/java/com/example/talky/domain/auth/entity/NormalUser.java

@@ -1,27 +1,26 @@
 package com.example.talky.domain.recommendation.service;
 
-import com.example.talky.adapter.ai.AiServerClient;
-import com.example.talky.adapter.ai.response.RecommendationResponse;
+import com.example.talky.global.ai.FastApiClient;
 import com.example.talky.domain.auth.entity.NormalUser;
 import com.example.talky.domain.auth.exception.UserNotFoundException;
 import com.example.talky.domain.auth.repository.UserRepository;
 import com.example.talky.domain.favorites.entity.Favorite;
 import com.example.talky.domain.favorites.exception.FavoriteNorFoundException;
 import com.example.talky.domain.favorites.repository.FavoriteRepository;
-import com.example.talky.domain.recommendation.entity.Speech;
 import com.example.talky.domain.recommendation.entity.Conversation;
+import com.example.talky.domain.recommendation.entity.Speech;
 import com.example.talky.domain.recommendation.repository.ConversationRepository;
 import com.example.talky.domain.recommendation.repository.SpeechRepository;
 import com.example.talky.domain.recommendation.web.dto.GetContextReq;
-import com.example.talky.global.ai.dto.AiRcmdRes;
 import com.example.talky.global.ai.dto.ToAiReq;
-import com.example.talky.global.response.SuccessResponse;
+import com.example.talky.global.ai.dto.AiRcmdRes;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,15 +31,18 @@
 @RequiredArgsConstructor
 public class RcmdServiceImpl implements RcmdService {
 
-    private final AiServerClient aiServerClient;
+    private final FastApiClient fastApiClient;
     private final UserRepository userRepository;
     private final FavoriteRepository favoriteRepository;
     private final ConversationRepository conversationRepository; // AI 추적용
     private final SpeechRepository speechRepository; // 별도 API용
+    private final ObjectMapper objectMapper;
 
     @Transactional
     @Override
-    public AiRcmdRes getAiRcmd(GetContextReq req, Long normalId) {
+    public AiRcmdRes getAiRcmd(MultipartFile file, String metadataJson, Long normalId) throws JsonProcessingException {
+        // 메타데이터 JSON 파싱
+        GetContextReq req = objectMapper.readValue(metadataJson, GetContextReq.class);
         String choose = req.getChoose();
 
         // choose == null -> drop all record(새로운 user 대화 이력 테이블 사용)
@@ -71,11 +73,9 @@ public AiRcmdRes getAiRcmd(GetContextReq req, Long normalId) {
 
         if(req.getChoose() != null && req.getSttMessage() != null) {
             tracking.addFirst(req.getChoose());
-            tracking.addFirst(req.getSttMessage());
-        } else if (req.getSttMessage() != null) {
-            tracking.add(req.getSttMessage());
         }
 
+        // 변경된 대화 기록 저장
         conversation.modify(tracking);
 
         // Context 3 - 데이터베이스에 저장
@@ -97,32 +97,30 @@ public AiRcmdRes getAiRcmd(GetContextReq req, Long normalId) {
                 .map(Favorite::getSentence)
                 .toList();
 
-        // 이전 대화 기록이 없을 시 NPE 예외 던지는 중임
-        List<String> conversations = conversation.getConversations();
+        // AI 서버로 보낼 요청 객체 (ToAiReq) 생성
+        // sttMessage는 현재 턴에서는 AI 서버가 파일로부터 생성하므로 null로 설정
+        ToAiReq toAiReq = ToAiReq.builder()
+                .keywords(req.getKeywords())
+                .context(req.getContext())
+                .choose(choose)
+                .conversation(conversation.getConversations())
+                .favorites(favorites)
+                .sttMessage(null)
+                .build();
+
+        // AI 서버 호출
+        AiRcmdRes response = fastApiClient.getAiRecommendation(toAiReq, file);
+        String category = response.getCategory();
+        String sttResultFromAi = response.getSttMessage(); // AI 서버로부터 STT 결과 수신
 
-        ToAiReq toAiReq;
-        log.info("choose={}, conversations={}", choose, conversations);
-        if(choose == null && conversations == null) {
-            //log.info("잘못 들어옴");
-            toAiReq = ToAiReq.builder()
-                    .keywords(req.getKeywords())
-                    .context(req.getContext())
-                    .build();
+        // AI 서버에서 받은 STT 결과를 다음 턴의 컨텍스트를 위해 대화 기록에 추가
+        if (sttResultFromAi != null) {
+            tracking.add(sttResultFromAi);
+            conversation.modify(tracking);
+            conversationRepository.saveAndFlush(conversation);
         }
-        else {
-            //log.info("잘 들어왓음");
-            toAiReq = ToAiReq.builder()
-                    .keywords(req.getKeywords())
-                    .context(req.getContext())
-                    .conversations(conversations)
-                    .favorites(favorites)
-                    .sttMessage(req.getSttMessage())
-                    .build();
-        }
-        log.info(toAiReq.toString());
-        AiRcmdRes response = aiServerClient.getAiRcmdSentences(toAiReq);
-        // 카테고리 획득
-        String category = response.getCategory();
+
+        // 음성 기록 저장 (통계용)
         speechRepository.save(Speech.builder()
                         .normalUser((NormalUser) userRepository.findById(normalId)
                                 .orElseThrow(UserNotFoundException::new))
@@ -133,6 +131,7 @@ public AiRcmdRes getAiRcmd(GetContextReq req, Long normalId) {
     }
 
     private boolean favoriteIsPresent(Long normalId, String choose) {
+        if (choose == null) return false;
         return favoriteRepository.findByNormalUserIdAndSentence(normalId, choose).isPresent();
     }
 }

src/main/java/com/example/talky/domain/recommendation/service/RcmdService.java

@@ -1,21 +1,18 @@
 package com.example.talky.domain.recommendation.web.controller;
 
 import com.example.talky.domain.recommendation.service.RcmdService;
-import com.example.talky.domain.recommendation.web.dto.GetContextReq;
 import com.example.talky.global.ai.dto.AiRcmdRes;
 import com.example.talky.global.response.SuccessResponse;
 import com.example.talky.global.security.CustomUserDetails;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 @RestController
@@ -27,13 +24,15 @@ public class RcmdController {
 
     @PostMapping("/context")
     public ResponseEntity<SuccessResponse<?>> getAiSentence(
-            @Validated @RequestBody GetContextReq req,
-            @AuthenticationPrincipal CustomUserDetails userDetails) {
-        log.info(req.toString());
+            @RequestParam(value = "file", required = false) MultipartFile file, // 사용자의 음성 파일 (MP3 등)
+            @RequestParam("metadata") String metadataJson, // 메타데이터 (JSON 문자열)
+            @AuthenticationPrincipal CustomUserDetails userDetails) throws JsonProcessingException {
+        
         Long normalId = userDetails.getNormalUser().getId();
 
-        // 서비스 계층 호출
-        AiRcmdRes response = rcmdService.getAiRcmd(req, normalId);
+        // 서비스 계층 호출: 클라이언트로부터 받은 파일과 메타데이터를 서비스로 전달
+        // sttMessage는 더 이상 클라이언트에서 직접 받지 않음 (AI 서버에서 처리)
+        AiRcmdRes response = rcmdService.getAiRcmd(file, metadataJson, normalId);
         return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.ok(response));
     }
 

src/main/java/com/example/talky/domain/recommendation/service/RcmdServiceImpl.java

@@ -1,26 +1,15 @@
 package com.example.talky.domain.recommendation.web.dto;
 
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.ToString;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Getter
-@ToString
-@AllArgsConstructor
+@NoArgsConstructor
 public class GetContextReq {
-//    @NotEmpty(message = "장소는 필수 전달값입니다.")
-//    private String place;
-
-    @NotEmpty(message = "키워드는 필수 입력값입니다.")
     private List<String> keywords;
-
     private String context;
     private String choose;
-  
-    private List<String> conversations;
-    private String sttMessage;
+    private String sttMessage; // 사용자가 음성으로 입력한 mp3 파일을 서버에서 텍스트로 변환(STT)한 결과값. 추천 문장 생성에 활용됨.
 }