diff --git a/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java
index d74127ce..4aefc931 100644
--- a/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java
+++ b/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;
diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java
index d8e05c15..e329aac4 100644
--- a/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java
+++ b/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())
diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
index c2f2bc27..93a28e10 100644
--- a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
+++ b/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();
diff --git a/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java b/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java
index 782cad7f..892cc432 100644
--- a/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java
+++ b/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;
 
diff --git a/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java b/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java
index ff1f9b0f..20d80879 100644
--- a/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java
+++ b/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();
+    }
 }
 
diff --git a/src/main/java/learningFlow/learningFlow_BE/repository/UserCollectionRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/UserCollectionRepository.java
index 367ea49b..9cd5b1f0 100644
--- a/src/main/java/learningFlow/learningFlow_BE/repository/UserCollectionRepository.java
+++ b/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
diff --git a/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java b/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java
index 914667fd..d1019011 100644
--- a/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java
+++ b/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({" +
diff --git a/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java
index 20740ff1..c7e01b86 100644
--- a/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java
+++ b/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주일
 }
diff --git a/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java
index e24e669a..4d871fde 100644
--- a/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java
+++ b/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();
     }
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java
index c19634de..40d1e637 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java
+++ b/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());
     }
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
index 630dd00e..e12507bd 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
@@ -117,7 +117,8 @@ public CollectionResponseDTO.SearchResultDTO search(SearchRequestDTO.SearchCondi
         Map<Long, CollectionResponseDTO.CollectionLearningInfo> learningInfoMap = collections.stream()
                 .collect(Collectors.toMap(
                         Collection::getId,
-                        collection -> getLearningInfo(collection, currentUser, false)
+                        collection -> getLearningInfo(collection, currentUser, false),
+                        (existing, replacement) -> replacement  // added: 중복 키가 있을 경우 새 값 사용
                 ));
 
         return CollectionConverter.toSearchResultDTO(
@@ -141,8 +142,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 +154,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();
         }
 
@@ -163,11 +164,12 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
             return CollectionResponseDTO.CollectionLearningInfo.builder()
                     .learningStatus("COMPLETED")
                     .progressRate(100)
+                    .progressRatio(calculateProgressRatio(realUserCollection))
                     .startDate(realUserCollection.getCreatedAt().toLocalDate())
                     .completedDate(realUserCollection.getCompletedTime())
                     .resourceDTOList(isDetailView ?
-                            getAllResources(collection) :  // 상세 조회면 전체 리소스
-                            new ArrayList<>())  // 아니면 빈 리스트
+                            getAllResourcesWithProgress(collection, user, realUserCollection.getUserCollectionStatus()) :
+                            new ArrayList<>())
                     .build();
         }
 
@@ -175,17 +177,103 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
         return CollectionResponseDTO.CollectionLearningInfo.builder()
                 .learningStatus("IN_PROGRESS")
                 .progressRate(progressRate)
+                .progressRatio(calculateProgressRatio(realUserCollection))
                 .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);
+*/
+        if (userCollection.getStatus() == UserCollectionStatus.COMPLETED) {
+            return 100;
+        }
+
+        Collection collection = userCollection.getCollection();
+        User user = userCollection.getUser();
+
+        // 전체 에피소드 수
+        int totalEpisodes = collection.getEpisodes().size();
+
+        // 완료된 에피소드 수 계산
+        long completedEpisodes = collection.getEpisodes().stream()
+                .map(episode -> userEpisodeProgressRepository.findById(
+                        new UserEpisodeProgressId(episode.getId(), user.getLoginId())
+                ))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .filter(progress ->
+                        progress.getIsComplete() ||
+                                (progress.getCurrentProgress() != null && progress.getCurrentProgress() >= 100)
+                )
+                .count();
+/*                .filter(UserEpisodeProgress::getIsComplete)
+                .count();*/
+
+        return (int) Math.round((double) completedEpisodes / totalEpisodes * 100);
+    }
+
+    private String calculateProgressRatio(UserCollection userCollection) {
+        if (userCollection.getStatus() == UserCollectionStatus.COMPLETED) {
+            int totalEpisodes = userCollection.getCollection().getEpisodes().size();
+            return String.format("%d / %d회차 (100%%)", totalEpisodes, totalEpisodes);
+        }
+
+        Collection collection = userCollection.getCollection();
+        User user = userCollection.getUser();
+
+        int totalEpisodes = collection.getEpisodes().size();
+        int currentEpisode = userCollection.getUserCollectionStatus();
+
+        long completedEpisodes = collection.getEpisodes().stream()
+                .map(episode -> userEpisodeProgressRepository.findById(
+                        new UserEpisodeProgressId(episode.getId(), user.getLoginId())
+                ))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .filter(progress ->
+                        progress.getIsComplete() ||
+                                (progress.getCurrentProgress() != null && progress.getCurrentProgress() >= 100)
+                )
+                .count();
+/*                .filter(UserEpisodeProgress::getIsComplete)
+                .count();*/
+
+        double progressPercentage = (double) completedEpisodes / totalEpisodes * 100;
+
+        return String.format("%d / %d회차 (%.0f%%)",
+                currentEpisode,
+                totalEpisodes,
+                progressPercentage);
     }
 
     private List<ResourceResponseDTO.SearchResultResourceDTO> getFilteredResources(
@@ -216,9 +304,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();
     }
 
@@ -243,41 +345,58 @@ public HomeResponseDTO.GuestHomeInfoDTO getGuestHomeCollections() {
     public HomeResponseDTO.UserHomeInfoDTO getUserHomeCollections(User user) {
         // 최근 학습 컬렉션 조회
         CollectionResponseDTO.CollectionPreviewDTO recentLearning = getRecentLearning(user);
+        List<Collection> recommendedCollections = new ArrayList<>();
 
-        // 추천 컬렉션 목록 조회
-        // 1. interestField와 preferType 모두 충족
-        List<Collection> recommendedCollections = new ArrayList<>(collectionRepository.findByInterestFieldAndPreferType(
+        // 1단계: interestField와 preferType 모두 충족하는 컬렉션 추가
+        recommendedCollections.addAll(collectionRepository.findByInterestFieldAndPreferType(
                 user.getInterestFields(), user.getPreferType(), true, true, HOME_COLLECTION_SIZE
         ));
 
-        // 2. interestField만 충족
+        // 중복 제거
+        recommendedCollections = new ArrayList<>(recommendedCollections.stream()
+                .distinct()
+                .toList());
+
+        // 2단계: interestField만 충족하는 컬렉션 추가
         if (recommendedCollections.size() < HOME_COLLECTION_SIZE) {
-            recommendedCollections.addAll(
-                    collectionRepository.findByInterestFieldAndPreferType(
-                            user.getInterestFields(), user.getPreferType(), true, false,
-                            HOME_COLLECTION_SIZE - recommendedCollections.size()
-                    )
+            List<Collection> interestFieldCollections = collectionRepository.findByInterestFieldAndPreferType(
+                    user.getInterestFields(), user.getPreferType(), true, false,
+                    HOME_COLLECTION_SIZE - recommendedCollections.size()
             );
+            recommendedCollections.addAll(interestFieldCollections);
+
+            // 중복 제거
+            recommendedCollections = new ArrayList<>(recommendedCollections.stream()
+                    .distinct()
+                    .toList());
         }
 
-        // 3. preferType만 충족
+        // 3단계: preferType만 충족하는 컬렉션 추가
         if (recommendedCollections.size() < HOME_COLLECTION_SIZE) {
-            recommendedCollections.addAll(
-                    collectionRepository.findByInterestFieldAndPreferType(
-                            user.getInterestFields(), user.getPreferType(), false, true,
-                            HOME_COLLECTION_SIZE - recommendedCollections.size()
-                    )
+            List<Collection> preferTypeCollections = collectionRepository.findByInterestFieldAndPreferType(
+                    user.getInterestFields(), user.getPreferType(), false, true,
+                    HOME_COLLECTION_SIZE - recommendedCollections.size()
             );
+            recommendedCollections.addAll(preferTypeCollections);
+
+            // 중복 제거
+            recommendedCollections = new ArrayList<>(recommendedCollections.stream()
+                    .distinct()
+                    .toList());
         }
 
-        // 4. 모두 불충족
+        // 4단계: 나머지 컬렉션 추가
         if (recommendedCollections.size() < HOME_COLLECTION_SIZE) {
-            recommendedCollections.addAll(
-                    collectionRepository.findByInterestFieldAndPreferType(
-                            user.getInterestFields(), user.getPreferType(), false, false,
-                            HOME_COLLECTION_SIZE - recommendedCollections.size()
-                    )
+            List<Collection> remainingCollections = collectionRepository.findByInterestFieldAndPreferType(
+                    user.getInterestFields(), user.getPreferType(), false, false,
+                    HOME_COLLECTION_SIZE - recommendedCollections.size()
             );
+            recommendedCollections.addAll(remainingCollections);
+
+            // 마지막 중복 제거
+            recommendedCollections = new ArrayList<>(recommendedCollections.stream()
+                    .distinct()
+                    .toList());
         }
 
         Map<Long, CollectionResponseDTO.CollectionLearningInfo> learningInfoMap = recommendedCollections.stream()
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java b/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
index 5d6c0ceb..08e22e59 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
@@ -10,6 +10,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Optional;
 
 @Service
@@ -71,37 +72,38 @@ public Optional<Memo> getMemoContents(Long episodeId){
 
     @Transactional
     public void updateUserCollection(CollectionEpisode episode, String loginId) {
-        // UserCollection 조회
         Collection collection = episode.getCollection();
         User user = userRepository.findById(loginId)
                 .orElseThrow(() -> new ResourceHandler(ErrorStatus.USER_NOT_FOUND));
 
-        // UserCollection 조회
         Optional<UserCollection> optionalUserCollection = userCollectionRepository.findByUserAndCollection(user, collection);
         Integer episodeNumber = episode.getEpisodeNumber();
 
         UserCollection userCollection;
-
         if (optionalUserCollection.isPresent()) {
-            // UserCollection 이 존재하는 경우 episodeNumber 만 업데이트
             userCollection = optionalUserCollection.get();
 
             userCollection.updateUserCollection(episodeNumber);
         } else {
-            // UserCollection 이 존재하지 않는 경우 새로 생성
             userCollection = new UserCollection();
             userCollection.setUserCollection(user, collection, episodeNumber);
         }
+        userCollectionRepository.save(userCollection);
     }
     @Transactional
-    public void saveProgress(ResourceRequestDTO.ProgressRequestDTO request, String userId, Long episodeId) {
+    public Boolean saveProgress(ResourceRequestDTO.ProgressRequestDTO request, String userId, Long episodeId) {
         UserEpisodeProgressId userEpisodeId = new UserEpisodeProgressId(episodeId, userId);
         UserEpisodeProgress userEpisode = userEpisodeProgressRepository.findById(userEpisodeId)
                 .orElseThrow(() -> new ResourceHandler(ErrorStatus.USER_PROGRESS_NOT_FOUND));
         // 만약 진도가 80이상인 경우 완료로 저장
         Integer requestProgress = request.getProgress();
-        if (requestProgress >= 80) userEpisode.setIsComplete(true);
+        if (requestProgress >= 80) {
+            userEpisode.setIsComplete(true);
+            checkUserCollectionComplete(episodeId, userId);
+        }
         userEpisode.setCurrentProgress(requestProgress);
+        userEpisodeProgressRepository.save(userEpisode);
+        return userEpisode.getIsComplete();
     }
 
     @Transactional
@@ -113,6 +115,33 @@ public Boolean changeEpisodeComplete(Long episodeId, String loginId){
         if (isComplete.equals(true)) isComplete = userEpisodeProgress.setIsComplete(false);
         else isComplete = userEpisodeProgress.setIsComplete(true);
         userEpisodeProgress.setCurrentProgress(0);
+        userEpisodeProgressRepository.save(userEpisodeProgress);
         return isComplete;
     }
+
+    @Transactional
+    public void checkUserCollectionComplete(Long episodeId, String loginId){
+        Collection collection = collectionEpisodeRepository.findById(episodeId)
+                .orElseThrow(() -> new ResourceHandler(ErrorStatus.EPISODE_NOT_FOUND))
+                .getCollection();
+        User user = userRepository.findById(loginId)
+                .orElseThrow(() -> new ResourceHandler(ErrorStatus.USER_NOT_FOUND));
+        UserCollection userCollection = userCollectionRepository.findByUserAndCollection(user, collection)
+                .orElseThrow(() -> new ResourceHandler(ErrorStatus.USER_COLLECTION_NOT_FOUND));
+        List<CollectionEpisode> episodes = collection.getEpisodes();
+        boolean allCompleted = true;
+        for (CollectionEpisode episode : episodes) {
+            UserEpisodeProgressId userEpisodeProgressId = new UserEpisodeProgressId(episode.getId(), loginId);
+            UserEpisodeProgress userEpisodeProgress = userEpisodeProgressRepository.findById(userEpisodeProgressId)
+                    .orElseThrow(() -> new ResourceHandler(ErrorStatus.USER_PROGRESS_NOT_FOUND));
+            if (!userEpisodeProgress.getIsComplete().equals(Boolean.TRUE)) {
+                allCompleted = false;
+                break;
+            }
+        }
+        if (allCompleted){
+            userCollection.CompleteUserCollection();
+            userCollectionRepository.save(userCollection);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
index 3a1c0ec1..495a6b49 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
@@ -214,7 +214,7 @@ public UserResponseDTO.UserMyPageResponseDTO getUserMyPageResponseDTO(String log
                 .orElseThrow(() -> new UserHandler(ErrorStatus.USER_NOT_FOUND));
 
         List<UserCollection> inProgressUserCollectionList
-                = userCollectionRepository.findByUserAndStatusOrderByCompletedTimeDesc(user, UserCollectionStatus.IN_PROGRESS);
+                = userCollectionRepository.findByUserAndStatusOrderByUpdatedAtDesc(user, UserCollectionStatus.IN_PROGRESS);
 
         List<ResourceResponseDTO.RecentlyWatchedEpisodeDTO> recentlyWatchedEpisodeDTOList = inProgressUserCollectionList.stream()
                 .map(userCollection -> {
@@ -227,17 +227,43 @@ 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();
 
 
         List<UserCollection> completedUserCollectionList
-                = userCollectionRepository.findByUserAndStatusOrderByCompletedTimeDesc(user, UserCollectionStatus.COMPLETED);
+                = userCollectionRepository.findByUserAndStatusOrderByUpdatedAtDesc(user, UserCollectionStatus.COMPLETED);
 
         List<CollectionResponseDTO.CollectionPreviewDTO> completedCollectionList = completedUserCollectionList.stream()
                 .map(userCollection -> {
diff --git a/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java
index 85bdfcb0..632824c6 100644
--- a/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java
+++ b/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java
@@ -171,8 +171,8 @@ public ApiResponse<ResourceResponseDTO.ProgressResponseDTO> saveProgress(
             @PathVariable("episodeId") Long episodeId,
             @Valid @RequestBody ResourceRequestDTO.ProgressRequestDTO request) {
         String loginId = principalDetails.getUser().getLoginId();
-        resourceService.saveProgress(request, loginId, episodeId);
-        ResourceResponseDTO.ProgressResponseDTO response = ResourceConverter.toSaveProgressResponse(request);
+        Boolean isCompleted = resourceService.saveProgress(request, loginId, episodeId);
+        ResourceResponseDTO.ProgressResponseDTO response = ResourceConverter.toSaveProgressResponse(request, isCompleted);
         return ApiResponse.onSuccess(response);
     }
     @PostMapping("/update-complete")
diff --git a/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java
index b7837890..6cd948b9 100644
--- a/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java
+++ b/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java
@@ -64,6 +64,7 @@ public static class CollectionPreviewDTO {
     public static class CollectionLearningInfo {
         String learningStatus;
         Integer progressRate;
+        String progressRatio;
         Integer currentEpisode;
         LocalDate startDate;
         LocalDate completedDate;
diff --git a/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java
index cf9d595b..7bc58dd0 100644
--- a/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java
+++ b/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java
@@ -78,6 +78,7 @@ public static class SearchResultResourceDTO {
     public static class ProgressResponseDTO {
         private ResourceType resourceType;
         private Integer progress;
+        private Boolean isCompleted;
     }
 
     @Getter
@@ -85,7 +86,7 @@ public static class ProgressResponseDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RecentlyWatchedEpisodeDTO {
-        Long resourceId;
+        Long episodeId;
         Long collectionId;
         String collectionTitle;
         String resourceSource;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cbbc7d01..94a23559 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,6 +15,8 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.MySQL8Dialect
         format_sql: true
+        jdbc:
+          time_zone: Asia/Seoul
     show-sql: true                                   # SQL ?? ??
   sql:
     init:
@@ -24,6 +26,7 @@ spring:
       client:
         registration:
           google:
+            redirect-uri: "https://onboarding.p-e.kr/login/oauth2/code/google"
             client-id: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID}
             client-secret: ${SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET}
             scope: