Merge pull request #172 from TeamLearningFlow/develop

Develop

Author: MODUGGAGI

src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java

@@ -105,17 +105,19 @@ public static ResourceResponseDTO.RecentlyWatchedEpisodeDTO convertToRecentlyWat
 
     public static List<ResourceResponseDTO.SearchResultResourceDTO> convertToResourceDTOWithToday(
             List<CollectionEpisode> episodes,
-            int nextEpisodeNumber
+            int nextEpisodeNumber,
+            int lastCompletedEpisode
     ) {
         return episodes.stream()
                 .map(episode -> ResourceResponseDTO.SearchResultResourceDTO.builder()
-                            .episodeId(episode.getId())
-                            .episodeName(episode.getEpisodeName())
-                            .url(episode.getResource().getUrl())
-                            .resourceSource(extractResourceSource(episode.getResource().getUrl()))
-                            .episodeNumber(episode.getEpisodeNumber())
-                            .today(episode.getEpisodeNumber().equals(nextEpisodeNumber))
-                            .build())
+                        .episodeId(episode.getId())
+                        .episodeName(episode.getEpisodeName())
+                        .url(episode.getResource().getUrl())
+                        .resourceSource(extractResourceSource(episode.getResource().getUrl()))
+                        .episodeNumber(episode.getEpisodeNumber())
+                        .today(episode.getEpisodeNumber().equals(nextEpisodeNumber))
+                        .completed(episode.getEpisodeNumber() <= lastCompletedEpisode)
+                        .build())
                 .toList();
     }
 

src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java

@@ -313,7 +313,8 @@ private CollectionResponseDTO.CollectionPreviewDTO getRecentLearning(User user)
                             .currentEpisode(currentEpisode)
                             .resourceDTOList(ResourceConverter.convertToResourceDTOWithToday(
                                     selectedEpisodes,
-                                    nextEpisode
+                                    nextEpisode,
+                                    currentEpisode
                             ))
                             .build();
 

src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java

@@ -65,6 +65,7 @@ public static class SearchResultResourceDTO {
         String resourceSource;
         Integer episodeNumber;
         Boolean today;
+        Boolean completed;
     }
 
     @Getter