Merge pull request #47 from AI-Tutor-2024/develop

[DEPLOY]

Author: EunbeenDev

src/main/java/com/example/ai_tutor/domain/auth/application/AuthService.java

@@ -148,15 +148,22 @@ public ResponseEntity<?> signIn(SignInReq signInReq, @RequestHeader("Authorizati
         UsernamePasswordAuthenticationToken authentication =
                 new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
         SecurityContextHolder.getContext().setAuthentication(authentication);
+
         // 5. JWT 토큰 생성 및 refresh 저장
         TokenMapping tokenMapping = customTokenProviderService.createToken(authentication);
 
+        // 기존 토큰이 있으면 삭제
+        tokenRepository.findByUserEmail(user.getEmail())
+                .ifPresent(tokenRepository::delete);
+
+        // 새 토큰 저장
         Token token = Token.builder()
                 .userEmail(user.getEmail())
                 .refreshToken(tokenMapping.getRefreshToken())
                 .build();
         tokenRepository.save(token);
 
+
         // 6. 응답 구성
         AuthRes authResponse = AuthRes.builder()
                 .accessToken(tokenMapping.getAccessToken())

src/main/java/com/example/ai_tutor/domain/note/application/ProfessorNoteService.java

@@ -22,6 +22,7 @@
 import com.example.ai_tutor.global.DefaultAssert;
 import com.example.ai_tutor.global.config.security.token.UserPrincipal;
 import com.example.ai_tutor.global.payload.ApiResponse;
+import com.example.ai_tutor.global.util.ConvertToMp3;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.Random;
 import java.util.List;
 
@@ -50,6 +52,7 @@ public class ProfessorNoteService {
     private final ClovaService clovaService;
 
     private final AmazonS3 amazonS3;
+    private final ConvertToMp3 convertToMp3;
 
     // 노트 생성
     @Transactional
@@ -89,7 +92,8 @@ public boolean convertSpeechToText(Long noteId, MultipartFile file) {
         try {
             // 3. CLOVA STT API 호출 (동기 처리)
             log.info("CLOVA STT 응답");
-            JsonNode response = clovaService.processSpeechToText(file).block();
+            File mp3File = convertToMp3.convert(file);
+            JsonNode response = clovaService.processSpeechToText(mp3File).block();
             log.info("CLOVA STT 응답: {}", response);
 
             // 4. STT 결과에서 텍스트 추출 및 저장

src/main/java/com/example/ai_tutor/domain/openAPI/clova/ClovaService.java

@@ -4,6 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
@@ -13,6 +14,8 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
+import java.io.File;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -47,4 +50,30 @@ public Mono<JsonNode> processSpeechToText(MultipartFile file) {
                     return Mono.error(new RuntimeException("Clova Speech API 호출 실패", error));
                 });
     }
+
+    public Mono<JsonNode> processSpeechToText(File mp3File) {
+        // 1. 파일을 Resource로 감싸기
+        FileSystemResource resource = new FileSystemResource(mp3File);
+
+        // 2. 멀티파트 구성
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("media", resource);
+        body.add("params", "{ \"language\": \"enko\", \"completion\": \"sync\" }");
+
+        return clovaWebClient.post()
+                .uri(clovaUrl + "/recognizer/upload")
+                .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+                .header("X-CLOVASPEECH-API-KEY", secret)
+                .contentType(MediaType.MULTIPART_FORM_DATA)
+                .bodyValue(body)
+                .retrieve()
+                .bodyToMono(JsonNode.class)
+                .doOnSuccess(response -> log.info("Clova Speech API 응답 성공: {}", response))
+                .doOnError(error -> log.error("Clova Speech API 호출 중 오류 발생: {}", error.getMessage()))
+                .onErrorResume(error -> {
+                    log.error("Clova Speech API 호출 중 예외 처리 발생: {}", error.getMessage());
+                    return Mono.error(new RuntimeException("Clova Speech API 호출 실패", error));
+                });
+    }
+
 }

src/main/java/com/example/ai_tutor/global/util/ConvertToMp3.java

@@ -0,0 +1,74 @@
+package com.example.ai_tutor.global.util;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ConvertToMp3 {
+
+    private static final List<String> SUPPORTED_EXTENSIONS = List.of("mp4", "m4a", "wav");
+
+    /**
+     * 확장자 확인
+     */
+    private String getExtension(MultipartFile file) {
+        String originalName = file.getOriginalFilename();
+        if (originalName == null || !originalName.contains(".")) {
+            throw new IllegalArgumentException("파일 이름에 확장자가 없습니다.");
+        }
+        return originalName.substring(originalName.lastIndexOf('.') + 1).toLowerCase();
+    }
+
+    /**
+     * 사용자가 업로드한 파일을 mp3로 변환하여 반환합니다.
+     * @param inputFile 사용자로부터 업로드된 MultipartFile (.mp4, .m4a, .wav)
+     * @return mp3로 변환된 File 객체
+     */
+    public File convert(MultipartFile inputFile) throws IOException, InterruptedException {
+        String ext = getExtension(inputFile);
+        if (!SUPPORTED_EXTENSIONS.contains(ext)) {
+            throw new IllegalArgumentException("지원하지 않는 확장자입니다: " + ext);
+        }
+
+        // 임시 파일로 저장
+        File inputTemp = File.createTempFile("input-", "." + ext);
+        inputFile.transferTo(inputTemp);
+
+        // 출력될 mp3 임시 파일
+        File outputMp3 = File.createTempFile("converted-", ".mp3");
+
+        // ffmpeg 명령어 실행
+        ProcessBuilder pb = new ProcessBuilder(
+                "ffmpeg", "-y",               // 덮어쓰기 허용
+                "-i", inputTemp.getAbsolutePath(),
+                "-vn",                        // 영상 제거 (오디오만)
+                "-acodec", "libmp3lame",      // mp3 코덱
+                outputMp3.getAbsolutePath()
+        );
+
+        pb.redirectErrorStream(true);
+        Process process = pb.start();
+        int exitCode = process.waitFor();
+
+        // 임시 원본 파일은 삭제
+        if (!inputTemp.delete()) {
+            log.warn("임시 입력 파일 삭제 실패: {}", inputTemp.getAbsolutePath());
+        }
+
+        if (exitCode != 0) {
+            if (!outputMp3.delete()) {
+                log.warn("실패한 mp3 파일 삭제 실패: {}", outputMp3.getAbsolutePath());
+            }
+            throw new RuntimeException("ffmpeg 변환 실패 (exitCode=" + exitCode + ")");
+        }
+
+        return outputMp3;
+    }
+}