Merge branch 'develop' into fix/cast-creation/80

umc-owncast · Aug 22, 2024 · 42e56b2 · 42e56b2
2 parents 9c2c2d2 + f3b841c
commit 42e56b2
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/main/java/com/umc/owncast/domain/bookmark/service/BookMarkServiceImpl.java b/src/main/java/com/umc/owncast/domain/bookmark/service/BookMarkServiceImpl.java
@@ -61,13 +61,13 @@ private List<BookmarkResultDTO> getBookMarkResultDTOs(Member member, List<Cast>
 
                 sentences.forEach(sentence -> {
 
-                    Sentence nextSentence = sentenceRepository.findById(sentence.getId() + 1)
+                    Sentence prevSentence = sentenceRepository.findById(sentence.getId() - 1)
                             .orElseGet(() -> Sentence.builder()
                                     .timePoint(null)
                                     .build());
 
-                    if(!Objects.equals(nextSentence.getCast().getId(), sentence.getCast().getId())){
-                        nextSentence = Sentence.builder()
+                    if(!Objects.equals(prevSentence.getCast().getId(), sentence.getCast().getId())){
+                        prevSentence = Sentence.builder()
                                 .timePoint(null)
                                 .build();
                     }
@@ -78,8 +78,8 @@ private List<BookmarkResultDTO> getBookMarkResultDTOs(Member member, List<Cast>
                         .sentenceId(sentence.getId())
                         .originalSentence(sentence.getOriginalSentence())
                         .translatedSentence(sentence.getTranslatedSentence())
-                        .start(sentence.getTimePoint())
-                        .end(nextSentence.getTimePoint())
+                        .start(prevSentence.getTimePoint())
+                        .end(sentence.getTimePoint())
                         .build());
                     }
                 );
@@ -96,13 +96,13 @@ public List<BookmarkResultDTO> getBookmarks(Member member, Long playlistId) {
 
         return sentenceList.stream().map(sentence -> {
 
-            Sentence nextSentence = sentenceRepository.findById(sentence.getId() + 1)
+            Sentence prevSentence = sentenceRepository.findById(sentence.getId() - 1)
                     .orElseGet(() -> Sentence.builder()
                             .timePoint(null)
                             .build());
 
-            if(!Objects.equals(nextSentence.getCast().getId(), sentence.getCast().getId())){
-                nextSentence = Sentence.builder()
+            if(!Objects.equals(prevSentence.getCast().getId(), sentence.getCast().getId())){
+                prevSentence = Sentence.builder()
                         .timePoint(null)
                         .build();
             }
@@ -113,8 +113,8 @@ public List<BookmarkResultDTO> getBookmarks(Member member, Long playlistId) {
                     .sentenceId(sentence.getId())
                     .originalSentence(sentence.getOriginalSentence())
                     .translatedSentence(sentence.getTranslatedSentence())
-                    .start(sentence.getTimePoint())
-                    .end(nextSentence.getTimePoint())
+                    .start(prevSentence.getTimePoint())
+                    .end(sentence.getTimePoint())
                     .build();
         }).toList();
     }