[docs] 리드미 작성

.github/workflows/buildTest.yml

@@ -75,7 +75,7 @@ jobs:
         shell: bash
       - name: Create JSON Config File
         env:
-          TTS_JSON_CONTENT: ${{ secrets.TTS_JSON }}
+          TTS_JSON_CONTENT: ${{ secrets.TTS_JSON_CONTENT }}
         run: |
           echo "${TTS_JSON_CONTENT}" > src/main/resources/tts.json
           echo $TTS_JSON_CONTENT

.github/workflows/dockerdeploy.yml

@@ -53,13 +53,13 @@ jobs:
       # 5. JSON Config 파일 생성
     - name: Create JSON Config File
       env:
-        TTS_JSON_CONTENT: ${{ secrets.TTS_JSON }}
+        TTS_JSON_CONTENT: ${{ secrets.TTS_JSON_CONTENT }}
       run: |
         echo "${TTS_JSON_CONTENT}" > src/main/resources/tts.json
 
       # 6. 빌드 및 테스트 실행
     - name: Build and Test
-      run: ./gradlew build -x test
+      run: ./gradlew build
 
     - name: Docker Login
       uses: docker/login-action@v3

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.3.5'
+    id 'org.springframework.boot' version '3.3.6'
     id 'io.spring.dependency-management' version '1.1.6'
 }
 
@@ -24,6 +24,7 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.springframework:spring-context:6.1.15'
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
     // DEVELOP
@@ -73,6 +74,8 @@ dependencies {
 
     // MONITORING
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    // Prometheus
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 
     // LOGGER
     // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
@@ -106,10 +109,10 @@ dependencies {
     // https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
     implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.1'
     implementation 'org.apache.httpcomponents:httpmime:4.5.13'
+
+
 }
 
 test {
     useJUnitPlatform()
 }
-
-

src/main/java/com/oreo/finalproject_5re5_be/concat/controller/ConcatRowTabController.java

@@ -4,9 +4,8 @@
 import com.oreo.finalproject_5re5_be.concat.dto.request.*;
 import com.oreo.finalproject_5re5_be.concat.dto.response.ConcatTabResponseDto;
 import com.oreo.finalproject_5re5_be.concat.dto.response.TabRowResponseDto;
-import com.oreo.finalproject_5re5_be.concat.service.AudioFileService;
-import com.oreo.finalproject_5re5_be.concat.service.ConcatRowService;
-import com.oreo.finalproject_5re5_be.concat.service.ConcatTabService;
+import com.oreo.finalproject_5re5_be.concat.entity.BgmFile;
+import com.oreo.finalproject_5re5_be.concat.service.*;
 import com.oreo.finalproject_5re5_be.global.dto.response.ResponseDto;
 import com.oreo.finalproject_5re5_be.member.dto.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
@@ -28,6 +27,8 @@ public class ConcatRowTabController {
     private final ConcatRowService concatRowService;
     private final ConcatTabService concatTabService;
     private final AudioFileService audioFileService;
+    private final BgmFileService bgmFileservice;
+    private final ConcatRowTabService concatRowTabService;
 
     //탭 로우 조회
     //탭 로우 저장
@@ -40,36 +41,15 @@ public class ConcatRowTabController {
     public ResponseEntity<ResponseDto<Boolean>> saveRowAndTab(
             @RequestBody TabRowUpdateRequestDto dto,
             @AuthenticationPrincipal CustomUserDetails customUserDetails) {
-        ConcatRowSaveRequestDto concatRows = dto.getConcatRows();
-        ConcatUpdateRequestDto concatTabs = dto.getConcatTab();
-        boolean updateConcatTab = concatTabService.updateConcatTab(concatTabs, customUserDetails.getMember().getSeq());
-        boolean updateConcatRows = concatRowService.updateConcatRows(concatRows);
-        return new ResponseDto<>(HttpStatus.OK.value(), updateConcatTab && updateConcatRows).toResponseEntity();
-
+        try {
+            boolean result = concatRowTabService.saveTabAndRows(dto, customUserDetails.getMember().getSeq());
+            return new ResponseDto<>(HttpStatus.OK.value(), result).toResponseEntity();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return new ResponseDto<>(HttpStatus.INTERNAL_SERVER_ERROR.value(), false).toResponseEntity();
+        }
     }
 
-//    @Operation(
-//            summary = "ConcatRow, ConcatTab을 저장합니다.",
-//            description = ""
-//    )
-//    @PostMapping("save")
-//    public ResponseEntity<ResponseDto<Boolean>> saveRowAndTab(
-//            @RequestBody TabRowUpdateRequestDto dto,
-//            @AuthenticationPrincipal CustomUserDetails customUserDetails) {
-//        ConcatUpdateRequestDto concatUpdateRequestDto = dto.getConcatTab();
-//        Long memberSeq = customUserDetails.getMember().getSeq();
-//        List<RowAudioFileDto> rowAudioFiles = dto.getAudioFiles();
-//        boolean updateTab = false;
-//        boolean updateRow = false;
-//        if (concatUpdateRequestDto != null) {
-//            updateTab = concatTabService.updateConcatTab(concatUpdateRequestDto,
-//                    memberSeq);
-//            updateRow = concatRowService.updateConcatRows(rowAudioFiles, concatUpdateRequestDto.getTabId());
-//        }
-//
-//        return new ResponseDto<>(HttpStatus.OK.value(), updateTab && updateRow).toResponseEntity();
-//    }
-//
 
     @Operation(
             summary = "ConcatRow, ConcatTab을 조회합니다.",
@@ -79,12 +59,38 @@ public ResponseEntity<ResponseDto<Boolean>> saveRowAndTab(
     public ResponseEntity<ResponseDto<TabRowResponseDto>> readRowAndTab(
             @RequestParam Long projectSeq,
             @AuthenticationPrincipal CustomUserDetails customUserDetails) {
+
+        // Tab setting
         ConcatTabResponseDto concatTabResponseDto
                 = concatTabService.readConcatTab(projectSeq, customUserDetails.getMember().getSeq());
 
+        // Tabseq로 bgmFile 리스트 불러오기
+        List<BgmFile> bgmFiles = bgmFileservice.getBgmFilesByTabSeq(concatTabResponseDto.getTabId());
+
+        // BgmFile 리스트를 OriginAudioRequest 형태로 변환
+        List<OriginAudioRequest> bgmFileList = bgmFiles.stream()
+                .map(bgm -> OriginAudioRequest.builder()
+                        .seq(bgm.getBgmFileSeq())
+                        .audioUrl(bgm.getAudioUrl())
+                        .fileName(bgm.getFileName())
+                        .fileSize(bgm.getFileSize())
+                        .fileLength(bgm.getFileLength())
+                        .extension(bgm.getExtension())
+                        .build())
+                .toList();
+
+        // ConcatTabResponseDto에 bgmFileList 추가
+        concatTabResponseDto = ConcatTabResponseDto.builder()
+                .tabId(concatTabResponseDto.getTabId())
+                .frontSilence(concatTabResponseDto.getFrontSilence())
+                .status(concatTabResponseDto.getStatus())
+                .bgmFileList(bgmFileList) // BgmFile 리스트 추가
+                .build();
+
+        // Row setting
+        // ConcatRow와 AudioFile 리스트 조회
         List<RowAudioFileDto> audioFiles = audioFileService.getAudioFilesByProjectAndStatusTrue(projectSeq);
 
-
         List<ConcatRowRequest> concatRowRequests = audioFiles.stream().map(x -> ConcatRowRequest.builder()
                 .originAudioRequest(OriginAudioRequest.builder()
                         .seq(x.getAudioFileSeq())
@@ -108,4 +114,3 @@ public ResponseEntity<ResponseDto<TabRowResponseDto>> readRowAndTab(
     }
 }
 
-

src/main/java/com/oreo/finalproject_5re5_be/concat/controller/ConcatTabController.java

@@ -32,10 +32,12 @@ public class ConcatTabController {
             description = "생성이 성공했다면 True를 반환합니다."
     )
     @PostMapping("create")
-    public ResponseEntity<ResponseDto<Boolean>> create(@RequestBody ConcatCreateRequestDto createRequestDto) {
-        projectService.projectCheck(createRequestDto.getMemberSequence(), createRequestDto.getProjectSequence());
+    public ResponseEntity<ResponseDto<Boolean>> create(@AuthenticationPrincipal CustomUserDetails customUserDetails,
+                                                           @RequestParam Long projectSeq) {
+        projectService.projectCheck(customUserDetails.getMember().getSeq(), projectSeq);
         //사용자 예외처리
-        return new ResponseDto<>(HttpStatus.OK.value(), concatTabService.createConcatTab(createRequestDto))
+        return new ResponseDto<>(HttpStatus.OK.value(), concatTabService
+                .createConcatTab(new ConcatCreateRequestDto(projectSeq, customUserDetails.getMember().getSeq())))
                 .toResponseEntity();
     }
 

src/main/java/com/oreo/finalproject_5re5_be/concat/entity/ConcatTab.java

@@ -11,7 +11,7 @@
 @Getter
 @Builder
 @NoArgsConstructor
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Entity(name = "concat_tab")
 public class ConcatTab extends BaseEntity {
     @Id

src/main/java/com/oreo/finalproject_5re5_be/concat/service/ConcatRowTabService.java

@@ -0,0 +1,53 @@
+package com.oreo.finalproject_5re5_be.concat.service;
+
+import com.oreo.finalproject_5re5_be.concat.dto.request.ConcatRowSaveRequestDto;
+import com.oreo.finalproject_5re5_be.concat.dto.request.ConcatUpdateRequestDto;
+import com.oreo.finalproject_5re5_be.concat.dto.request.TabRowUpdateRequestDto;
+import com.oreo.finalproject_5re5_be.concat.entity.BgmFile;
+import com.oreo.finalproject_5re5_be.concat.entity.ConcatTab;
+import com.oreo.finalproject_5re5_be.concat.repository.BgmFileRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ConcatRowTabService {
+
+    private final ConcatTabService concatTabService;
+    private final ConcatRowService concatRowService;
+    private final BgmFileService bgmFileService;
+    private final BgmFileRepository bgmFileRepository;
+
+    @Transactional
+    public boolean saveTabAndRows(TabRowUpdateRequestDto dto, Long memberSeq) {
+        // 1. ConcatTab 업데이트
+        ConcatUpdateRequestDto concatTabs = dto.getConcatTab();
+        boolean updateConcatTab = concatTabService.updateConcatTab(concatTabs, memberSeq);
+
+        // 2. ConcatRow 업데이트 (말만 업데이트고 사실 생성임)
+        ConcatRowSaveRequestDto concatRows = dto.getConcatRows();
+        boolean updateConcatRows = concatRowService.updateConcatRows(concatRows);
+
+        // 3. BgmFile 저장
+        ConcatTab concatTab = concatTabService.getConcatTabBySeq(concatTabs.getTabId()); // ConcatTab 조회
+
+        List<BgmFile> bgmFiles = concatTabs.getBgmFileList().stream()
+                .map(bgmRequest -> BgmFile.builder()
+                        .concatTab(concatTab)
+                        .audioUrl(bgmRequest.getAudioUrl())
+                        .fileName(bgmRequest.getFileName())
+                        .fileSize(bgmRequest.getFileSize())
+                        .fileLength(bgmRequest.getFileLength())
+                        .extension(bgmRequest.getExtension())
+                        .build())
+                .toList();
+
+        bgmFileRepository.saveAll(bgmFiles); // DB에 저장
+
+
+        return updateConcatTab && updateConcatRows;
+    }
+}

src/main/java/com/oreo/finalproject_5re5_be/concat/service/ConcatTabService.java

@@ -60,7 +60,15 @@ public boolean createConcatTab(Project project) {
         if (concatTabRepository.existsById(project.getProSeq())) {
             return false;
         }
-        ConcatTab concatTab = new ConcatTab(project.getProSeq(), project, 'Y', 0.0f, null);
+
+        ConcatTab concatTab = ConcatTab.builder()
+                .project(project) // Hibernate가 projectId를 자동으로 동기화
+                .status('Y')
+                .frontSilence(0.0f)
+                .bgmFiles(null)//create라서 처음엔 null
+                .build();
+
+        System.out.println("concatTab = " + concatTab);
         concatTabRepository.save(concatTab);
         return true;
     }
@@ -112,19 +120,12 @@ public boolean updateConcatTab(ConcatUpdateRequestDto concatUpdateRequestDto, Lo
         Project project = projectRepository.findById(concatUpdateRequestDto.getTabId())
                 .orElseThrow(() -> new NoSuchElementException("수정할 프로젝트가 없습니다."));
 
-        // Dto의 originAudioRequests를 통해 bgmFiles 리스트 생성
-        List<BgmFile> bgmFiles = concatUpdateRequestDto.getBgmFileList().stream()
-                .map(request -> bgmFileRepository.findById(request.getSeq())
-                        .orElseThrow(() -> new NoSuchElementException("BgmFile not found with ID: " + request.getSeq())))
-                .toList();
-
         // Builder로 새로운 ConcatTab 생성
         ConcatTab updatedTab = ConcatTab.builder()
                 .projectId(existingTab.getProjectId()) // 기존 값 유지
                 .project(existingTab.getProject()) // 기존 값 유지
                 .frontSilence(concatUpdateRequestDto.getFrontSilence()) // 업데이트된 값
                 .status(concatUpdateRequestDto.getStatus()) // 업데이트된 값
-                .bgmFiles(bgmFiles) // 새로운 BgmFile 리스트
                 .build();
 
         concatTabRepository.save(updatedTab);
@@ -157,4 +158,11 @@ public boolean updateBgmAudioFiles(Long tabSeq, List<Long> bgmFileSeqs) {
         concatTabRepository.save(concatTab);
         return true;
     }
-}
+
+    //
+    @Transactional
+    public ConcatTab getConcatTabBySeq(Long tabSeq) {
+        return concatTabRepository.findById(tabSeq)
+                .orElseThrow(() -> new IllegalArgumentException("Invalid ConcatTab ID: " + tabSeq));
+    }
+}

src/main/java/com/oreo/finalproject_5re5_be/concat/service/helper/ConcatTabHelper.java

@@ -6,8 +6,10 @@
 import com.oreo.finalproject_5re5_be.concat.entity.ConcatTab;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 
 /**
@@ -22,7 +24,8 @@ public ConcatTabResponseDto prepareConcatTab(ConcatTab concatTab, Long memberSeq
         // 사용자 검증
         if (validateMemberCurrent(concatTab, memberSeq)) {
             // bgmFile객체들을 그대로 프론트에게 줄 수 없으니 bgmFiles를 OriginAudioRequest(DTO)로 변환
-            List<OriginAudioRequest> bgmList = concatTab.getBgmFiles().stream()
+            List<OriginAudioRequest> bgmList = Optional.ofNullable(concatTab.getBgmFiles())
+                    .orElse(new ArrayList<>()).stream()
                     .map(this::convertToOriginAudioRequest)
                     .toList();
 

src/main/java/com/oreo/finalproject_5re5_be/global/config/SwaggerConfig.java

@@ -22,8 +22,7 @@ public class SwaggerConfig {
     public OpenAPI openAPI() {
         //swagger servers 지정
         List<Server> server = new ArrayList<>();
-        server.add(new Server().description("https Server").url("https://5re5park.site"));
-        server.add(new Server().description("http Server").url("http://5re5park.site:8080"));
+        server.add(new Server().description("https Server").url("https://dev1.5re5park.site"));
         server.add(new Server().description("localhost").url("http://localhost:8080"));
 
         OpenAPI info = new OpenAPI()

src/main/java/com/oreo/finalproject_5re5_be/global/exception/ErrorCode.java

@@ -35,7 +35,23 @@ public enum ErrorCode {
     ENTITY_NOT_FOUND(400, " Entity Not Found"),
     INTERNAL_SERVER_ERROR(500, "Server Error"),
     INVALID_TYPE_VALUE(400, " Invalid Type Value"),
-    HANDLE_ACCESS_DENIED(403, "Access is Denied");
+    HANDLE_ACCESS_DENIED(403, "Access is Denied"),
+
+    // 프로젝트 ERROR 처리
+    PROJECT_NOT_FOUND_ERROR(404, "해당 프로젝트를 찾을 수 없습니다."),
+
+    // TTS ERROR 처리
+    PROJECT_MISMATCH_ERROR(400, "요청하신 프로젝트를 소유하고 있지 않습니다."),
+    VOICE_ENTITY_NOT_FOUND_ERROR(404, "해당 음성을 찾을 수 없습니다."),
+    TTS_SENTENCE_NOT_FOUND_ERROR(404, "해당 문장을 찾을 수 없습니다."),
+
+    // TTS 생성 ERROR 처리
+    TTS_MAKE_FAILED_ERROR(500, "TTS 생성에 실패했습니다."),
+    TTS_MAKE_INVALID_INPUT_VALUE_ERROR(400, "TTS 생성 입력값이 올바르지 않습니다."),
+    TTS_MAKE_INVALID_SPEED(400, "허용되지 않는 TTS 속도입니다."),
+    TTS_MAKE_INVALID_PITCH(400, "허용되지 않는 TTS 음높이입니다."),
+    TTS_MAKE_INVALID_VOLUME(400, "허용되지 않는 TTS 음량입니다.");
+
 
     private final String message;
     private final int status;