Merge branch 'release/0.0.3' of https://github.com/29ana-notai/Team29_BE

src/main/java/notai/annotation/application/AnnotationQueryService.java

@@ -34,12 +34,9 @@ public List<AnnotationResponse> getAnnotationsByDocumentAndPageNumbers(
         document.validateOwner(member);
 
         List<Annotation> annotations = annotationRepository.findByDocumentIdAndPageNumberIn(documentId, pageNumbers);
-        if (annotations.isEmpty()) {
-            throw new NotFoundException(ANNOTATION_NOT_FOUND);
-        }
 
         return annotations.stream()
                 .map(AnnotationResponse::from)
-                .collect(Collectors.toList());
+                .toList();
     }
 }

src/main/java/notai/annotation/presentation/response/AnnotationResponse.java

@@ -2,6 +2,8 @@
 
 import notai.annotation.domain.Annotation;
 
+import java.time.LocalDateTime;
+
 public record AnnotationResponse(
         Long id,
         Long documentId,
@@ -11,8 +13,8 @@ public record AnnotationResponse(
         int width,
         int height,
         String content,
-        String createdAt,
-        String updatedAt
+        LocalDateTime createdAt,
+        LocalDateTime updatedAt
 ) {
 
     public static AnnotationResponse from(Annotation annotation) {
@@ -25,8 +27,8 @@ public static AnnotationResponse from(Annotation annotation) {
                 annotation.getWidth(),
                 annotation.getHeight(),
                 annotation.getContent(),
-                annotation.getCreatedAt().toString(),
-                annotation.getUpdatedAt().toString()
+                annotation.getCreatedAt(),
+                annotation.getUpdatedAt()
         );
     }
 }

src/main/java/notai/common/exception/ErrorMessages.java

@@ -42,7 +42,7 @@ public enum ErrorMessages {
 
     // auth
     INVALID_ACCESS_TOKEN("유효하지 않은 토큰입니다."),
-    INVALID_REFRESH_TOKEN("유요하지 않은 Refresh Token입니다."),
+    INVALID_REFRESH_TOKEN("유효하지 않은 Refresh Token입니다."),
     EXPIRED_REFRESH_TOKEN("만료된 Refresh Token입니다."),
     INVALID_LOGIN_TYPE("지원하지 않는 소셜 로그인 타입입니다."),
     NOTFOUND_ACCESS_TOKEN("토큰 정보가 존재하지 않습니다."),

src/main/java/notai/pageRecording/application/PageRecordingService.java

@@ -1,6 +1,7 @@
 package notai.pageRecording.application;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import notai.document.domain.Document;
 import notai.document.domain.DocumentRepository;
 import notai.member.domain.Member;
@@ -13,6 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -24,6 +26,8 @@ public class PageRecordingService {
     private final MemberRepository memberRepository;
 
     public void savePageRecording(Long memberId, PageRecordingSaveCommand command) {
+        log.info("recordingId: {}, documentId: {}", command.recordingId(), command.documentId());
+
         Recording foundRecording = recordingRepository.getById(command.recordingId());
         Document foundDocument = documentRepository.getById(command.documentId());
         Member member = memberRepository.getById(memberId);

src/main/java/notai/recording/domain/Recording.java

@@ -40,7 +40,7 @@ public void updateFilePath(FilePath filePath) {
     }
 
     public void validateDocumentOwnership(Document document) {
-        if (this.document.getId().equals(document.getId())) {
+        if (!this.document.getId().equals(document.getId())) {
             throw new NotFoundException(RECORDING_NOT_FOUND);
         }
     }

src/main/java/notai/stt/application/SttService.java

@@ -27,20 +27,21 @@ public class SttService {
      * AI 서버로부터 받은 STT 결과를 처리하여 페이지별 STT 데이터를 생성하고 저장합니다.
      * 1. STT 테스크와 관련 엔티티들을 조회
      * 2. 음성 인식된 단어들을 페이지와 매칭
-     * 3. 매칭 결과를 저장하고 테스크를 완료 처리
+     * 3. 테스크를 완료처리하고 매칭 결과 저장
      */
     public void updateSttResult(UpdateSttResultCommand command) {
         SttTask sttTask = sttTaskRepository.getById(command.taskId());
-        Stt stt = sttTask.getStt();
-        Recording recording = stt.getRecording();
+        Recording recording = sttTask.getRecording();
 
-        List<PageRecording> pageRecordings = pageRecordingRepository.findAllByRecordingIdOrderByStartTime(recording.getId());
+        List<PageRecording> pageRecordings =
+                pageRecordingRepository.findAllByRecordingIdOrderByStartTime(recording.getId());
 
-        SttPageMatchedDto matchedResult = stt.matchWordsWithPages(command.words(), pageRecordings);
-        List<Stt> pageMatchedSttResults = Stt.createFromMatchedResult(recording, matchedResult);
-        sttRepository.saveAll(pageMatchedSttResults);
+        SttPageMatchedDto matchedResult = Stt.matchWordsWithPages(command.words(), pageRecordings);
+        List<Stt> pageMatchedSttResults = Stt.createFromMatchedResult(sttTask, matchedResult);
 
         sttTask.complete();
         sttTaskRepository.save(sttTask);
+
+        sttRepository.saveAll(pageMatchedSttResults);
     }
 }

src/main/java/notai/stt/application/SttTaskService.java

@@ -11,7 +11,6 @@
 import notai.recording.domain.Recording;
 import notai.recording.domain.RecordingRepository;
 import notai.stt.application.command.SttRequestCommand;
-import notai.stt.domain.Stt;
 import notai.stt.domain.SttRepository;
 import notai.sttTask.domain.SttTask;
 import notai.sttTask.domain.SttTaskRepository;
@@ -38,14 +37,14 @@ public void submitSttTask(SttRequestCommand command) {
 
         try {
             byte[] audioBytes = Files.readAllBytes(audioFile.toPath());
-            
+
             ByteArrayResource resource = new ByteArrayResource(audioBytes) {
                 @Override
                 public String getFilename() {
                     return audioFile.getName();
                 }
             };
-            
+
             TaskResponse response = aiClient.submitSttTask(resource);
             createAndSaveSttTask(recording, response);
         } catch (IOException e) {
@@ -62,10 +61,7 @@ private File validateAudioFile(String audioFilePath) {
     }
 
     private void createAndSaveSttTask(Recording recording, TaskResponse response) {
-        Stt stt = new Stt(recording);
-        sttRepository.save(stt);
-
-        SttTask sttTask = new SttTask(response.taskId(), stt, TaskStatus.PENDING);
+        SttTask sttTask = new SttTask(response.taskId(), TaskStatus.PENDING, recording);
         sttTaskRepository.save(sttTask);
     }
 }

src/main/java/notai/stt/domain/Stt.java

@@ -8,9 +8,9 @@
 import lombok.NoArgsConstructor;
 import notai.common.domain.RootEntity;
 import notai.pageRecording.domain.PageRecording;
-import notai.recording.domain.Recording;
 import notai.stt.application.command.UpdateSttResultCommand;
 import notai.stt.application.dto.SttPageMatchedDto;
+import notai.sttTask.domain.SttTask;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,8 +34,8 @@ public class Stt extends RootEntity<Long> {
 
     @NotNull
     @ManyToOne(fetch = LAZY)
-    @JoinColumn(name = "recording_id")
-    private Recording recording;
+    @JoinColumn(name = "stt_task_id")
+    private SttTask sttTask;
 
     private Integer pageNumber;
 
@@ -46,12 +46,12 @@ public class Stt extends RootEntity<Long> {
 
     private Integer endTime;
 
-    public Stt(Recording recording) {
-        this.recording = recording;
+    public Stt(SttTask sttTask) {
+        this.sttTask = sttTask;
     }
 
-    public Stt(Recording recording, Integer pageNumber, String content, Integer startTime, Integer endTime) {
-        this.recording = recording;
+    public Stt(SttTask sttTask, Integer pageNumber, String content, Integer startTime, Integer endTime) {
+        this.sttTask = sttTask;
         this.pageNumber = pageNumber;
         this.content = content;
         this.startTime = startTime;
@@ -62,20 +62,20 @@ public Stt(Recording recording, Integer pageNumber, String content, Integer star
      * 페이지별 STT 결과로부터 새로운 STT 엔티티를 생성합니다.
      * 시작/종료 시간은 페이지 내 첫/마지막 단어의 시간으로 설정합니다.
      */
-    public static Stt createFromPageContent(Recording recording, SttPageMatchedDto.PageMatchedContent content) {
+    public static Stt createFromPageContent(SttTask sttTask, SttPageMatchedDto.PageMatchedContent content) {
         return new Stt(
-            recording, 
-            content.pageNumber(), 
-            content.content(), 
-            content.words().get(0).startTime(), 
-            content.words().get(content.words().size() - 1).endTime()
+                sttTask,
+                content.pageNumber(),
+                content.content(),
+                content.words().get(0).startTime(),
+                content.words().get(content.words().size() - 1).endTime()
         );
     }
 
     /**
      * 음성 인식된 단어들을 페이지 기록과 매칭하여 페이지별 STT 결과를 생성합니다.
      */
-    public SttPageMatchedDto matchWordsWithPages(
+    public static SttPageMatchedDto matchWordsWithPages(
             List<UpdateSttResultCommand.Word> words,
             List<PageRecording> pageRecordings
     ) {
@@ -85,8 +85,8 @@ public SttPageMatchedDto matchWordsWithPages(
 
         // 페이지 번호 순으로 자동 정렬됨
         Map<Integer, List<SttPageMatchedDto.PageMatchedWord>> pageWordMap = new TreeMap<>();
-        int wordIndex = 0;  
-        PageRecording lastPage = pageRecordings.get(pageRecordings.size() - 1);  
+        int wordIndex = 0;
+        PageRecording lastPage = pageRecordings.get(pageRecordings.size() - 1);
 
         // 각 페이지별로 매칭되는 단어들을 찾아 처리
         for (PageRecording page : pageRecordings) {
@@ -97,7 +97,7 @@ public SttPageMatchedDto matchWordsWithPages(
             // 현재 페이지의 시간 범위에 속하는 단어들을 찾아 매칭
             while (wordIndex < words.size()) {
                 UpdateSttResultCommand.Word word = words.get(wordIndex);
-                
+
                 // 페이지 시작 시간보다 이른 단어는 건너뛰기
                 if (word.start() + TIME_THRESHOLD < pageStart) {
                     wordIndex++;
@@ -124,14 +124,22 @@ public SttPageMatchedDto matchWordsWithPages(
         }
 
         // 페이지별로 단어들을 하나의 텍스트로 합치는 과정
-        List<SttPageMatchedDto.PageMatchedContent> pageContents = pageWordMap.entrySet().stream()
+        List<SttPageMatchedDto.PageMatchedContent> pageContents = pageWordMap
+                .entrySet().stream()
                 .map(entry -> {
                     Integer pageNumber = entry.getKey();
-                    List<SttPageMatchedDto.PageMatchedWord> pageWords = entry.getValue();
-                    String combinedContent = pageWords.stream()
-                            .map(SttPageMatchedDto.PageMatchedWord::word)
-                            .collect(Collectors.joining(" "));
-                    return new SttPageMatchedDto.PageMatchedContent(pageNumber, combinedContent, pageWords);
+                    List<SttPageMatchedDto.PageMatchedWord>
+                            pageWords = entry.getValue();
+                    String combinedContent =
+                            pageWords.stream()
+                                     .map(SttPageMatchedDto.PageMatchedWord::word)
+                                     .collect(Collectors.joining(
+                                             " "));
+                    return new SttPageMatchedDto.PageMatchedContent(
+                            pageNumber,
+                            combinedContent,
+                            pageWords
+                    );
                 })
                 .toList();
 
@@ -141,9 +149,9 @@ public SttPageMatchedDto matchWordsWithPages(
     /**
      * 페이지 매칭 결과로부터 STT 엔티티들을 생성하고 저장합니다.
      */
-    public static List<Stt> createFromMatchedResult(Recording recording, SttPageMatchedDto matchedResult) {
+    public static List<Stt> createFromMatchedResult(SttTask sttTask, SttPageMatchedDto matchedResult) {
         return matchedResult.pageContents().stream()
-                .map(content -> createFromPageContent(recording, content))
-                .toList();
+                            .map(content -> createFromPageContent(sttTask, content))
+                            .toList();
     }
 }

src/main/java/notai/stt/presentation/SttController.java

@@ -13,7 +13,7 @@
 @RequestMapping("/api/stt")
 @RequiredArgsConstructor
 public class SttController {
-        private final SttQueryService sttQueryService;
+    private final SttQueryService sttQueryService;
 
     @GetMapping("/documents/{documentId}/pages/{pageNumber}")
     public SttPageResponse getSttByPage(

src/main/java/notai/stt/presentation/response/SttPageResponse.java

@@ -1,30 +1,31 @@
 package notai.stt.presentation.response;
 
 import notai.stt.domain.Stt;
+
 import java.util.List;
 
 public record SttPageResponse(
-    Integer pageNumber,
-    List<SttContent> contents
+        Integer pageNumber,
+        List<SttContent> contents
 ) {
+    public static SttPageResponse of(Integer pageNumber, List<Stt> sttList) {
+        List<SttContent> contents = sttList.stream()
+                                           .map(SttContent::from)
+                                           .toList();
+        return new SttPageResponse(pageNumber, contents);
+    }
+
     public record SttContent(
-        String content,
-        Integer startTime,
-        Integer endTime
+            String content,
+            Integer startTime,
+            Integer endTime
     ) {
         public static SttContent from(Stt stt) {
             return new SttContent(
-                stt.getContent(),
-                stt.getStartTime(),
-                stt.getEndTime()
+                    stt.getContent(),
+                    stt.getStartTime(),
+                    stt.getEndTime()
             );
         }
     }
-
-    public static SttPageResponse of(Integer pageNumber, List<Stt> sttList) {
-        List<SttContent> contents = sttList.stream()
-            .map(SttContent::from)
-            .toList();
-        return new SttPageResponse(pageNumber, contents);
-    }
 }

src/main/java/notai/stt/query/SttQueryRepository.java

@@ -6,5 +6,6 @@
 
 public interface SttQueryRepository {
     List<Stt> findAllByDocumentIdAndPageNumber(Long documentId, Integer pageNumber);
+
     List<Stt> findAllByDocumentId(Long documentId);
 }

src/main/java/notai/stt/query/SttQueryRepositoryImpl.java

@@ -2,8 +2,9 @@
 
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
-import notai.stt.domain.Stt;
 import static notai.stt.domain.QStt.stt;
+import notai.stt.domain.Stt;
+import static notai.sttTask.domain.QSttTask.sttTask;
 
 import java.util.List;
 
@@ -15,18 +16,24 @@ public class SttQueryRepositoryImpl implements SttQueryRepository {
     public List<Stt> findAllByDocumentIdAndPageNumber(Long documentId, Integer pageNumber) {
         return queryFactory
                 .selectFrom(stt)
-                .join(stt.recording).fetchJoin()
-                .where(stt.recording.document.id.eq(documentId)
+                .join(stt.sttTask, sttTask).fetchJoin()
+                .join(sttTask.recording).fetchJoin()
+                .join(sttTask.recording.document).fetchJoin()
+                .where(sttTask.recording.document.id.eq(documentId)
                         .and(stt.pageNumber.eq(pageNumber)))
+                .orderBy(stt.pageNumber.asc())
                 .fetch();
     }
 
     @Override
     public List<Stt> findAllByDocumentId(Long documentId) {
         return queryFactory
                 .selectFrom(stt)
-                .join(stt.recording).fetchJoin()
-                .where(stt.recording.document.id.eq(documentId))
+                .join(stt.sttTask, sttTask).fetchJoin()
+                .join(sttTask.recording).fetchJoin()
+                .join(sttTask.recording.document).fetchJoin()
+                .where(sttTask.recording.document.id.eq(documentId))
+                .orderBy(stt.pageNumber.asc())
                 .fetch();
     }
 }