Deploy

src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java

@@ -75,6 +75,8 @@ public enum ErrorStatus implements BaseErrorCode {
     // Resource 에러
     RESOURCE_NOT_FOUND(HttpStatus.NOT_FOUND, "RESOURCE4001", "존재하지 않는 리소스 입니다."),
 
+    USER_COLLECTION_NOT_FOUND(HttpStatus.NOT_FOUND, "USER COLLECTION4001", "존재하지 않는 리소스 입니다."),
+
     // User Progress
     USER_PROGRESS_NOT_FOUND(HttpStatus.NOT_FOUND, "USER-PROGRESS4001", "진도 값이 null 인 상태입니다.");
     private final HttpStatus httpStatus;

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

@@ -102,7 +102,7 @@ public static CollectionResponseDTO.CollectionPreviewDTO toCollectionPreviewDTO(
                 .likesCount(collection.getBookmarkCount()) //북마크 -> 좋아요로 이름만 변경 
                 .isLiked(currentUser != null && currentUser.hasBookmarked(collection.getId())) //북마크 -> 좋아요로 이름만 변경
                 .progressRatePercentage(learningInfo.getProgressRate())
-                .progressRatio(calculateProgressRatio(collection, learningInfo))
+                .progressRatio(learningInfo.getProgressRatio())
                 .learningStatus(learningInfo.getLearningStatus())
                 .startDate(learningInfo.getStartDate())
                 .completedDate(learningInfo.getCompletedDate())

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

@@ -63,10 +63,11 @@ public static List<ResourceResponseDTO.episodeInformation> episodeInformationLis
         return episodeInformationList;
     }
 
-    public static ResourceResponseDTO.ProgressResponseDTO toSaveProgressResponse(ResourceRequestDTO.ProgressRequestDTO request) {
+    public static ResourceResponseDTO.ProgressResponseDTO toSaveProgressResponse(ResourceRequestDTO.ProgressRequestDTO request, Boolean isCompleted) {
         return ResourceResponseDTO.ProgressResponseDTO.builder()
                 .progress(request.getProgress())
                 .resourceType(request.getResourceType())
+                .isCompleted(isCompleted)
                 .build();
     }
 
@@ -76,6 +77,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(userProgress != null && userProgress.getIsComplete())
+                // added: progress 값 설정 - 해당 에피소드의 진도율
+                .progress(userProgress != null ? userProgress.getCurrentProgress() : null)
+                .build();
+    }
+
     public static ResourceResponseDTO.SearchResultResourceDTO convertToResourceDTO(
             CollectionEpisode episode,
             UserEpisodeProgress progress
@@ -101,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,
@@ -131,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/domain/BaseEntity.java

@@ -7,6 +7,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 import java.time.LocalDateTime;
 

src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java

@@ -75,5 +75,9 @@ public void updateUserCollection(Integer userCollectionStatus) {
         this.userCollectionStatus = userCollectionStatus;
         this.completedTime = LocalDate.now();
     }
+    public void CompleteUserCollection(){
+        this.status = UserCollectionStatus.COMPLETED;
+        this.completedTime = LocalDate.now();
+    }
 }
 

src/main/java/learningFlow/learningFlow_BE/repository/UserCollectionRepository.java

@@ -14,7 +14,7 @@
 
 public interface UserCollectionRepository extends JpaRepository<UserCollection, Long> {
     Optional<UserCollection> findByUserAndCollection(User user, Collection collection);
-    List<UserCollection> findByUserAndStatusOrderByCompletedTimeDesc(User user, UserCollectionStatus status);
+    List<UserCollection> findByUserAndStatusOrderByUpdatedAtDesc(User user, UserCollectionStatus status);
     Optional<UserCollection> findFirstByUserAndStatusOrderByUpdatedAtDesc(User user, UserCollectionStatus status);
 
     @Modifying

src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java

@@ -86,13 +86,10 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
                 .build();
         response.setHeader(HttpHeaders.SET_COOKIE, cookie.toString());
 
-
         response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
         response.setHeader("Access-Control-Allow-Credentials", "true");
         response.setHeader("Access-Control-Expose-Headers", "Authorization, Refresh-Token");
 
-
-
         // ⭐️ 팝업 창을 닫고 부모 창에 메시지 전달하는 스크립트 (프론트엔드 도메인 사용)
         String redirectScript = "<script>" +
                 "  window.opener.postMessage({" +

src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java

@@ -9,5 +9,5 @@
 @ConfigurationProperties(prefix = "custom.jwt")
 public class JwtProperties {
     private long accessTokenValidityInSeconds = 3600; // 1시간
-    private long refreshTokenValidityInSeconds = 604800; // 1주일
+    //private long refreshTokenValidityInSeconds = 604800; // 1주일
 }

src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java

@@ -44,12 +44,12 @@ public String createRefreshToken(Authentication authentication) {
         User user = principalDetails.getUser();
 
         Date now = new Date();
-        Date validity = new Date(now.getTime() + jwtProperties.getRefreshTokenValidityInSeconds() * 1000);
+        //Date validity = new Date(now.getTime() + jwtProperties.getRefreshTokenValidityInSeconds() * 1000);
 
         return Jwts.builder()
                 .subject(user.getEmail())
                 .issuedAt(now)
-                .expiration(validity)
+                //.expiration(validity)
                 .signWith(jwtSecretKey)
                 .compact();
     }

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());
     }