Merge pull request #200 from TeamLearningFlow/develop

Develop

Author: MODUGGAGI

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

@@ -76,6 +76,26 @@ public static ResourceResponseDTO.changeEpisodeIsCompleteDTO toChangeEpisodeIsCo
                 .build();
     }
 
+    public static ResourceResponseDTO.SearchResultResourceDTO convertToResourceDTO(
+            CollectionEpisode episode,
+            UserEpisodeProgress userProgress, // added: 사용자 진도 정보 추가
+            Integer currentEpisodeNumber    // added: 현재 학습 중인 에피소드 번호 추가
+    ) {
+        return ResourceResponseDTO.SearchResultResourceDTO.builder()
+                .episodeId(episode.getId())
+                .episodeName(episode.getEpisodeName())
+                .url(episode.getResource().getUrl())
+                .resourceSource(extractResourceSource(episode.getResource().getUrl()))
+                .episodeNumber(episode.getEpisodeNumber())
+                // added: today 값 설정 - 다음 학습할 에피소드인지 확인
+                .today(episode.getEpisodeNumber().equals(currentEpisodeNumber + 1))
+                // added: completed 값 설정 - 현재 에피소드보다 번호가 작으면 완료된 것
+                .completed(episode.getEpisodeNumber() <= currentEpisodeNumber)
+                // added: progress 값 설정 - 해당 에피소드의 진도율
+                .progress(userProgress != null ? userProgress.getCurrentProgress() : null)
+                .build();
+    }
+
     public static ResourceResponseDTO.SearchResultResourceDTO convertToResourceDTO(
             CollectionEpisode episode,
             UserEpisodeProgress progress

src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java

@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -16,11 +17,13 @@ public class AuthTokenCleanupScheduler {
     private final PasswordResetTokenRepository tokenRepository;
 
     @Scheduled(cron = "0 0 0 * * *") // 매일 자정에 실행
+    @Transactional
     public void cleanupExpiredTokens() {
         tokenRepository.deleteByExpiryDateBefore(LocalDateTime.now());
     }
 
     @Scheduled(cron = "0 0 0 * * *") // 매일 자정에 실행
+    @Transactional
     public void cleanupExpiredEmailVerificationTokens() {
         emailVerificationTokenRepository.deleteByExpiryDateBefore(LocalDateTime.now());
     }

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

@@ -141,8 +141,8 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
                     .learningStatus("BEFORE")
                     .progressRate(null)
                     .resourceDTOList(isDetailView ?
-                            getAllResources(collection, null) :  // 상세 조회면 전체 리소스
-                            getFilteredResources(collection, null, 0))  // 아니면 필터링된 리소스
+                            getAllResourcesWithProgress(collection, null, 0) :
+                            getFilteredResources(collection, null, 0))
                     .build();
         }
 
@@ -153,8 +153,8 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
                     .learningStatus("BEFORE")
                     .progressRate(null)
                     .resourceDTOList(isDetailView ?
-                            getAllResources(collection, user) :  // 상세 조회면 전체 리소스
-                            getFilteredResources(collection, null, 0))  // 아니면 필터링된 리소스
+                            getAllResourcesWithProgress(collection, null, 0) :
+                            getFilteredResources(collection, null, 0))
                     .build();
         }
 
@@ -166,8 +166,8 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
                     .startDate(realUserCollection.getCreatedAt().toLocalDate())
                     .completedDate(realUserCollection.getCompletedTime())
                     .resourceDTOList(isDetailView ?
-                            getAllResources(collection) :  // 상세 조회면 전체 리소스
-                            new ArrayList<>())  // 아니면 빈 리스트
+                            getAllResourcesWithProgress(collection, user, realUserCollection.getUserCollectionStatus()) :
+                            new ArrayList<>())
                     .build();
         }
 
@@ -178,11 +178,34 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
                 .startDate(realUserCollection.getCreatedAt().toLocalDate())
                 .currentEpisode(realUserCollection.getUserCollectionStatus())
                 .resourceDTOList(isDetailView ?
-                        getAllResources(collection, user) :
+                        getAllResourcesWithProgress(collection, user, realUserCollection.getUserCollectionStatus()) :
                         getFilteredResources(collection, user, realUserCollection.getUserCollectionStatus()))
                 .build();
     }
 
+    private List<ResourceResponseDTO.SearchResultResourceDTO> getAllResourcesWithProgress(
+            Collection collection,
+            User user,
+            int currentEpisodeNumber
+    ) {
+        return collection.getEpisodes().stream()
+                .sorted(Comparator.comparing(CollectionEpisode::getEpisodeNumber))
+                .map(episode -> {
+                    UserEpisodeProgress progress = null;
+                    if (user != null) {
+                        progress = userEpisodeProgressRepository.findById(
+                                new UserEpisodeProgressId(episode.getId(), user.getLoginId())
+                        ).orElse(null);
+                    }
+                    return ResourceConverter.convertToResourceDTO(
+                            episode,
+                            progress,
+                            currentEpisodeNumber
+                    );
+                })
+                .toList();
+    }
+
     private int calculateProgressRate(UserCollection userCollection) {
         return (int) Math.round((double) userCollection.getUserCollectionStatus() /
                 userCollection.getCollection().getEpisodes().size() * 100);
@@ -216,9 +239,23 @@ private List<ResourceResponseDTO.SearchResultResourceDTO> getFilteredResources(
                     .limit(4)
                     .toList();
         }
-
-        return filteredEpisodes.stream()
+/*        return filteredEpisodes.stream()
                 .map(ResourceConverter::convertToResourceDTO)
+                .toList();*/
+        return filteredEpisodes.stream()
+                .map(episode -> {
+                    UserEpisodeProgress progress = null;
+                    if (user != null) {
+                        progress = userEpisodeProgressRepository.findById(
+                                new UserEpisodeProgressId(episode.getId(), user.getLoginId())
+                        ).orElse(null);
+                    }
+                    return ResourceConverter.convertToResourceDTO(
+                            episode,
+                            progress,
+                            currentEpisode
+                    );
+                })
                 .toList();
     }