Develop

build.gradle

@@ -54,6 +54,9 @@ dependencies {
 
 	// .env 파일 로딩
 	implementation 'me.paulschwarz:spring-dotenv:4.0.0'
+
+	// S3 (latest dependency)
+	implementation 'io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.2'
 }
 
 tasks.named('test') {

src/main/java/com/capstone/kkumteul/domain/auth/web/controller/AuthController.java

@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/auth")
+@RequestMapping("/api/auth")
 @RequiredArgsConstructor
 public class AuthController {
 

src/main/java/com/capstone/kkumteul/domain/fairytale/exception/FairytaleErrorCode.java

@@ -10,7 +10,8 @@
 @AllArgsConstructor
 public enum FairytaleErrorCode implements BaseResponseCode {
 
-    FAIRYTALE_NOT_FOUND("FAIRYTALE_404_1", NOT_FOUND, "동화를 찾을 수 없습니다.");
+    FAIRYTALE_NOT_FOUND("FAIRYTALE_404_1", NOT_FOUND, "동화를 찾을 수 없습니다."),
+    PARAGRAPH_NOT_FOUND("FAIRYTALE_404_2", NOT_FOUND, "요청한 ID에 해당하는 Paragraph를 찾을 수 없습니다.");
 
     private final String code;
     private final int httpStatus;

src/main/java/com/capstone/kkumteul/domain/fairytale/exception/ParagraphNotFoundException.java

@@ -0,0 +1,9 @@
+package com.capstone.kkumteul.domain.fairytale.exception;
+
+import com.capstone.kkumteul.global.exception.BaseException;
+
+public class ParagraphNotFoundException extends BaseException {
+    public ParagraphNotFoundException() {
+        super(FairytaleErrorCode.PARAGRAPH_NOT_FOUND);
+    }
+}

src/main/java/com/capstone/kkumteul/domain/fairytale/repository/ParagraphRepository.java

@@ -13,4 +13,8 @@ public interface ParagraphRepository extends JpaRepository<Paragraph, Long> {
 
     /** 특정 페이지의 문장들 조회 — 단어장 추출 시 페이지 단위 본문 로드 */
     List<Paragraph> findByFairytaleIdAndPage(Long fairytaleId, int page);
+
+    boolean existsById(Long paragraphId);
+
+    boolean existsByFairytaleId(Long fairytaleId);
 }

src/main/java/com/capstone/kkumteul/domain/fairytale/validator/ParagraphValidator.java

@@ -0,0 +1,20 @@
+package com.capstone.kkumteul.domain.fairytale.validator;
+
+import com.capstone.kkumteul.domain.fairytale.repository.ParagraphRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class ParagraphValidator {
+
+    private final ParagraphRepository paragraphRepository;
+
+    public boolean paragraphIdIsValid(Long paragraphId) {
+        return paragraphRepository.existsById(paragraphId);
+    }
+
+    public boolean fairytaleIdIsValid(Long fairytaleId) {
+        return paragraphRepository.existsByFairytaleId(fairytaleId);
+    }
+}

src/main/java/com/capstone/kkumteul/domain/fairytale/web/controller/FairytaleController.java

@@ -2,15 +2,14 @@
 
 import com.capstone.kkumteul.domain.fairytale.entity.Island;
 import com.capstone.kkumteul.domain.fairytale.service.FairytaleService;
+import com.capstone.kkumteul.domain.fairytale.service.sse.SseService;
 import com.capstone.kkumteul.domain.fairytale.web.dto.FairytaleDetailRes;
 import com.capstone.kkumteul.domain.fairytale.web.dto.FairytaleGenerateReq;
 import com.capstone.kkumteul.domain.fairytale.web.dto.FairytaleListRes;
 import com.capstone.kkumteul.domain.kafka.service.EventService;
 import com.capstone.kkumteul.domain.user.entity.User;
 import com.capstone.kkumteul.global.response.SuccessResponse;
 import com.capstone.kkumteul.global.security.AuthUser;
-
-import com.capstone.kkumteul.domain.fairytale.service.sse.SseService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -24,7 +23,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/fairytales")
+@RequestMapping("/api/fairytales")
 public class FairytaleController {
 
     private final FairytaleService fairytaleService;

src/main/java/com/capstone/kkumteul/domain/kafka/dto/MessageInterface.java

@@ -1,6 +1,4 @@
 package com.capstone.kkumteul.domain.kafka.dto;
 
 public interface MessageInterface {
-
-    Long getUserId();
 }

src/main/java/com/capstone/kkumteul/domain/kafka/service/EventService.java

@@ -6,6 +6,8 @@
 import com.capstone.kkumteul.domain.kafka.dto.FairytaleGenerateMessage;
 import com.capstone.kkumteul.domain.kafka.dto.MessageInterface;
 import com.capstone.kkumteul.domain.user.entity.User;
+import com.capstone.kkumteul.domain.voice.web.dto.TtsFileRequest;
+import com.capstone.kkumteul.domain.voice.web.dto.TtsModelingRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,6 +30,9 @@ public class EventService {
     @Value("${FAIRYTALE_GENERATION}")
     private String FAIRYTALE_GENERATION;
 
+    @Value(("${TTS_MODELING}"))
+    private String TTS_MODELING;
+
     @Transactional
     public Long createFairytaleMessageSend(User user, FairytaleGenerateReq request) {
 
@@ -55,10 +60,30 @@ public Long createFairytaleMessageSend(User user, FairytaleGenerateReq request)
         kafkaTemplate.send(FAIRYTALE_GENERATION, message)
                 .whenComplete((result, e) -> {
                     if (e != null) {
-                        log.error("fairytale_generate failed", e);
+                        log.error("fairytale_generate failed. userId={}, message={}", user.getId(), message, e);
                     }
                 });
 
         return saved.getId();
     }
+
+    public void sendTtsModelingRequest(TtsModelingRequest message) {
+
+        kafkaTemplate.send(TTS_MODELING, message)
+                .whenComplete((result, e) -> {
+                    if(e != null) {
+                        log.error("tts_modeling_request failed. userId={}, message={}", message.getUserId(), message.getUploadedUrl(), e);
+                    }
+                });
+    }
+
+    public void sendTtsFileRequest(TtsFileRequest message) {
+
+        kafkaTemplate.send(TTS_MODELING, message)
+                .whenComplete((result, e) -> {
+                    if( e != null) {
+                        log.error("tts_file_request occurred error. userId={}, paragraphId={}", message.getUserId(), message.getFairytaleId(), e);
+                    }
+                });
+    }
 }

src/main/java/com/capstone/kkumteul/domain/voice/entity/TtsHistory.java

@@ -0,0 +1,27 @@
+package com.capstone.kkumteul.domain.voice.entity;
+
+import com.capstone.kkumteul.domain.fairytale.entity.Paragraph;
+import com.capstone.kkumteul.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TtsHistory {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "paragraph_id")
+    private Paragraph paragraph;
+
+    private String ttsUrl;
+}

src/main/java/com/capstone/kkumteul/domain/voice/entity/VoiceModel.java

@@ -0,0 +1,28 @@
+package com.capstone.kkumteul.domain.voice.entity;
+
+import com.capstone.kkumteul.domain.user.entity.User;
+import com.capstone.kkumteul.global.entity.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class VoiceModel extends BaseEntity {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    // extracted tts model name
+    @Column(unique = true, nullable = true)
+    private String modelName;
+
+    @Column(nullable = false, unique = true)
+    private String wavFileUrl;
+}

src/main/java/com/capstone/kkumteul/domain/voice/exception/FileUploadFailException.java

@@ -0,0 +1,9 @@
+package com.capstone.kkumteul.domain.voice.exception;
+
+import com.capstone.kkumteul.global.exception.BaseException;
+
+public class FileUploadFailException extends BaseException {
+    public FileUploadFailException() {
+        super(VoiceErrorCode.FILE_UPLOAD_FAIL);
+    }
+}

src/main/java/com/capstone/kkumteul/domain/voice/exception/InvalidFileException.java

@@ -0,0 +1,9 @@
+package com.capstone.kkumteul.domain.voice.exception;
+
+import com.capstone.kkumteul.global.exception.BaseException;
+
+public class InvalidFileException extends BaseException {
+    public InvalidFileException() {
+        super(VoiceErrorCode.INVALID_FILE_EXCEPTION);
+    }
+}

src/main/java/com/capstone/kkumteul/domain/voice/exception/VoiceErrorCode.java

@@ -0,0 +1,18 @@
+package com.capstone.kkumteul.domain.voice.exception;
+
+import com.capstone.kkumteul.global.response.code.BaseResponseCode;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum VoiceErrorCode implements BaseResponseCode {
+
+    INVALID_FILE_EXCEPTION("INVALID_FILE_400", 400, "요청값으로 전달한 파일의 양식이 잘못었습니다."),
+    FILE_NOT_CREATED("FILE_NOT_FOUND_404", 404, "TTS 음성 파일을 찾을 수 없습니다."),
+    FILE_UPLOAD_FAIL("FILE_UPLOAD_FAIL_500", 500, "파일을 변환하고, S3에 업로드하는 것에 실패했습니다.");
+
+    private final String code;
+    private final int httpStatus;
+    private final String message;
+}

src/main/java/com/capstone/kkumteul/domain/voice/exception/VoiceFileNotFoundException.java

@@ -0,0 +1,9 @@
+package com.capstone.kkumteul.domain.voice.exception;
+
+import com.capstone.kkumteul.global.exception.BaseException;
+
+public class VoiceFileNotFoundException extends BaseException {
+    public VoiceFileNotFoundException() {
+        super(VoiceErrorCode.FILE_NOT_CREATED);
+    }
+}

src/main/java/com/capstone/kkumteul/domain/voice/repository/TtsHistoryRepository.java

@@ -0,0 +1,23 @@
+package com.capstone.kkumteul.domain.voice.repository;
+
+import com.capstone.kkumteul.domain.voice.entity.TtsHistory;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Optional;
+
+public interface TtsHistoryRepository extends CrudRepository<TtsHistory, Long> {
+
+    @Query("""
+select  th
+from TtsHistory th join fetch
+    th.paragraph p
+where p.id = :paragraphId
+    and th.user.id = :userId
+"""
+    )
+    Optional<TtsHistory> findByParagraphIdAndUserId(
+            @Param("paragraphId") Long paragraphId,
+            @Param("userId") Long userId);
+}

src/main/java/com/capstone/kkumteul/domain/voice/repository/VoiceModelRepository.java

@@ -0,0 +1,7 @@
+package com.capstone.kkumteul.domain.voice.repository;
+
+import com.capstone.kkumteul.domain.voice.entity.VoiceModel;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface VoiceModelRepository extends JpaRepository<VoiceModel, Long> {
+}

src/main/java/com/capstone/kkumteul/domain/voice/service/S3Uploader.java

@@ -0,0 +1,65 @@
+package com.capstone.kkumteul.domain.voice.service;
+
+import com.capstone.kkumteul.domain.user.entity.User;
+import io.awspring.cloud.s3.ObjectMetadata;
+import io.awspring.cloud.s3.S3Operations;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+@Slf4j
+@Component
+public class S3Uploader {
+
+    private final S3Operations s3Operations;
+    private final String AWS_S3_BUCKET_NAME;
+
+    // for dependency injection with environment variable
+    public S3Uploader(
+            S3Operations s3Operations,
+            @Value("${AWS_S3_BUCKET_NAME}")
+            String AWS_S3_BUCKET_NAME
+    ) {
+        this.s3Operations = s3Operations;
+        this.AWS_S3_BUCKET_NAME = AWS_S3_BUCKET_NAME;
+    }
+
+    // upload S3 bucket
+    public String upload(MultipartFile wavFile, User user) throws IOException {
+        return putS3(
+                convert(wavFile),
+                createFilename(
+                        wavFile.getOriginalFilename(),
+                        user.getId()
+                ),
+                wavFile.getContentType()
+        );
+    }
+
+    private InputStream convert(MultipartFile wavFile) throws IOException {
+        return wavFile.getInputStream();
+    }
+
+    // with UUID
+    private String createFilename(String originalFilename, Long userId) {
+        String uuid = UUID.randomUUID().toString();
+        String uniqueFilename = uuid + "-" + originalFilename.replaceAll("\\s", "-");
+        return "tts/" + userId.toString() + "/train/" + uniqueFilename;
+    }
+
+    private String putS3(InputStream inputStream,String filename, String contentType) throws IOException {
+        return s3Operations.upload(
+                AWS_S3_BUCKET_NAME,
+                        filename,
+                        inputStream,
+                        ObjectMetadata.builder()
+                                .contentType(contentType)
+                                .build()
+                ).getURL().toString();
+    }
+}

src/main/java/com/capstone/kkumteul/domain/voice/service/VoiceService.java

@@ -0,0 +1,12 @@
+package com.capstone.kkumteul.domain.voice.service;
+
+import com.capstone.kkumteul.domain.user.entity.User;
+import com.capstone.kkumteul.domain.voice.web.dto.TtsFileResponse;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface VoiceService {
+    Void saveWav(MultipartFile wavFile, User user);
+    Boolean hasTtsHistory(Long userId, Long paragraphId);
+    TtsFileResponse getTtsFile(Long userId, Long paragraphId);
+    Void createTtsFile(Long userId, Long paragraphId);
+}