Merge pull request #225 from TeamLearningFlow/develop

Develop

Author: MODUGGAGI

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

@@ -122,18 +122,27 @@ public static ResourceResponseDTO.RecentlyWatchedEpisodeDTO convertToRecentlyWat
             UserEpisodeProgress userEpisodeProgress
     ) {
         return ResourceResponseDTO.RecentlyWatchedEpisodeDTO.builder()
-                .resourceId(getResourceId(userCollection))
+                .episodeId(getEpisodeId(userCollection))
                 .collectionId(userCollection.getCollection().getId())
                 .collectionTitle(userCollection.getCollection().getTitle())
                 .resourceSource(extractResourceSource(getResourceUrl(userCollection)))
                 .episodeNumber(userCollection.getUserCollectionStatus())
                 .episodeName(getEpisodeName(userCollection))
                 .progressRatio(calculateProgressRatio(userCollection))
-                .currentProgress(userEpisodeProgress.getCurrentProgress())
-                .totalProgress(userEpisodeProgress.getTotalProgress())
+                .currentProgress(userEpisodeProgress != null ? userEpisodeProgress.getCurrentProgress() : 0)
+                .totalProgress(userEpisodeProgress != null ? userEpisodeProgress.getTotalProgress() : 0)
                 .build();
     }
 
+    private static Long getEpisodeId(UserCollection userCollection) {
+        // added: episodeId를 찾는 메소드 추가
+        return userCollection.getCollection().getEpisodes().stream()
+                .filter(episode -> episode.getEpisodeNumber().equals(userCollection.getUserCollectionStatus()))
+                .findFirst()
+                .map(CollectionEpisode::getId)
+                .orElse(null);
+    }
+
     public static List<ResourceResponseDTO.SearchResultResourceDTO> convertToResourceDTOWithToday(
             List<CollectionEpisode> episodes,
             int nextEpisodeNumber,
@@ -152,6 +161,29 @@ public static List<ResourceResponseDTO.SearchResultResourceDTO> convertToResourc
                 .toList();
     }
 
+    public static ResourceResponseDTO.RecentlyWatchedEpisodeDTO convertToRecentlyWatchedEpisodeDTO(
+            UserCollection userCollection,
+            UserEpisodeProgress userEpisodeProgress,
+            CollectionEpisode currentEpisode,  // added: 파라미터 추가
+            int totalEpisodes,                 // added: 파라미터 추가
+            double progressPercentage          // added: 파라미터 추가
+    ) {
+        return ResourceResponseDTO.RecentlyWatchedEpisodeDTO.builder()
+                .episodeId(currentEpisode.getId())
+                .collectionId(userCollection.getCollection().getId())
+                .collectionTitle(userCollection.getCollection().getTitle())
+                .resourceSource(extractResourceSource(currentEpisode.getResource().getUrl()))
+                .episodeNumber(userCollection.getUserCollectionStatus())
+                .episodeName(currentEpisode.getEpisodeName())
+                .progressRatio(String.format("%d / %d회차 (%.0f%%)",
+                        userCollection.getUserCollectionStatus(),
+                        totalEpisodes,
+                        progressPercentage))
+                .currentProgress(userEpisodeProgress != null ? userEpisodeProgress.getCurrentProgress() : 0)
+                .totalProgress(userEpisodeProgress != null ? userEpisodeProgress.getTotalProgress() : 0)
+                .build();
+    }
+
     public static String extractResourceSource(String url) {
 
         String lowerCaseUrl = url.toLowerCase();

src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java

@@ -227,10 +227,36 @@ public UserResponseDTO.UserMyPageResponseDTO getUserMyPageResponseDTO(String log
                         return null;
                     }
 
+                    // added: 완료된 에피소드 수 계산
+                    long completedEpisodes = userCollection.getCollection().getEpisodes().stream()
+                            .map(episode -> userEpisodeProgressRepository.findById(
+                                    new UserEpisodeProgressId(episode.getId(), loginId)
+                            ))
+                            .filter(Optional::isPresent)
+                            .map(Optional::get)
+                            .filter(progress ->
+                                    progress.getIsComplete() ||
+                                            (progress.getCurrentProgress() != null && progress.getCurrentProgress() >= 100)
+                            )
+                            .count();
+
+                    // added: 전체 에피소드 수
+                    int totalEpisodes = userCollection.getCollection().getEpisodes().size();
+
+                    // added: 진행률 계산
+                    double progressPercentage = (double) completedEpisodes / totalEpisodes * 100;
+
+
                     UserEpisodeProgressId progressId = new UserEpisodeProgressId(currentEpisode.getId(), loginId);
                     UserEpisodeProgress userEpisodeProgress = userEpisodeProgressRepository.findById(progressId).orElse(null);
 
-                    return ResourceConverter.convertToRecentlyWatchedEpisodeDTO(userCollection, userEpisodeProgress);
+                    return ResourceConverter.convertToRecentlyWatchedEpisodeDTO(
+                            userCollection,
+                            userEpisodeProgress,
+                            currentEpisode,
+                            totalEpisodes,
+                            progressPercentage
+                    );
                 })
                 .filter(Objects::nonNull)
                 .toList();

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

@@ -86,7 +86,7 @@ public static class ProgressResponseDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RecentlyWatchedEpisodeDTO {
-        Long resourceId;
+        Long episodeId;
         Long collectionId;
         String collectionTitle;
         String resourceSource;