From b9d643af3c1c15d418a15774b6a646a15dbb8c4f Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 00:16:27 +0900
Subject: [PATCH 01/14] =?UTF-8?q?feat=20:=20=EC=BB=AC=EB=A0=89=EC=85=98=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4?=
 =?UTF-8?q?=EB=B6=80=20=EC=97=90=ED=94=BC=EC=86=8C=EB=93=9C=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../converter/ResourceConverter.java          | 20 +++++++
 .../common/AuthTokenCleanupScheduler.java     |  3 +
 .../service/collection/CollectionService.java | 55 ++++++++++++++++---
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
index c2f2bc27..87d18460 100644
--- a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
+++ b/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
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..fa041b02 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
+++ b/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();
     }
 

From 7312cbb1067e255b75aa010d7f327fa27764baf7 Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 01:58:01 +0900
Subject: [PATCH 02/14] =?UTF-8?q?feat=20:=20=EA=B5=AC=EA=B8=80=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/handler/OAuth2LoginSuccessHandler.java            | 3 ---
 src/main/resources/application.yml                             | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

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/resources/application.yml b/src/main/resources/application.yml
index cbbc7d01..41e760a8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -24,6 +24,7 @@ spring:
       client:
         registration:
           google:
+            redirect-uri: "http://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:

From 54527cb9d6a5a4a4a357d8f69ddb65fb00dae873 Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 02:03:19 +0900
Subject: [PATCH 03/14] =?UTF-8?q?feat=20:=20=EA=B5=AC=EA=B8=80=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 41e760a8..d513d9cb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -24,7 +24,7 @@ spring:
       client:
         registration:
           google:
-            redirect-uri: "http://onboarding.p-e.kr/login/oauth2/code/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:

From 5b800306687fe5589ab9fab47372f60e4cef1896 Mon Sep 17 00:00:00 2001
From: LJYeon12 <juyeon010530@gmail.com>
Date: Thu, 20 Feb 2025 06:14:21 +0900
Subject: [PATCH 04/14] =?UTF-8?q?/resources/{episodeId}/save-progress=20ap?=
 =?UTF-8?q?i=20response=EC=97=90=20isCompleted=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningFlow_BE/converter/ResourceConverter.java          | 3 ++-
 .../learningFlow_BE/service/resource/ResourceService.java     | 3 ++-
 .../web/controller/ResourceRestController.java                | 4 ++--
 .../learningFlow_BE/web/dto/resource/ResourceResponseDTO.java | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
index 87d18460..fbcbd8ad 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();
     }
 
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..6803fc8f 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
@@ -94,7 +94,7 @@ public void updateUserCollection(CollectionEpisode episode, String loginId) {
         }
     }
     @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));
@@ -102,6 +102,7 @@ public void saveProgress(ResourceRequestDTO.ProgressRequestDTO request, String u
         Integer requestProgress = request.getProgress();
         if (requestProgress >= 80) userEpisode.setIsComplete(true);
         userEpisode.setCurrentProgress(requestProgress);
+        return userEpisode.getIsComplete();
     }
 
     @Transactional
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/resource/ResourceResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java
index cf9d595b..4bd819f3 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

From b6f1a3ca1d233926dcf8c44cd42538e714819d4b Mon Sep 17 00:00:00 2001
From: LJYeon12 <juyeon010530@gmail.com>
Date: Thu, 20 Feb 2025 07:10:03 +0900
Subject: [PATCH 05/14] =?UTF-8?q?update=5Fat=20=EB=AF=B8=EB=B0=98=EC=98=81?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningFlow_BE/service/resource/ResourceService.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 6803fc8f..92eea0e9 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
@@ -76,22 +76,19 @@ public void updateUserCollection(CollectionEpisode episode, String loginId) {
         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 Boolean saveProgress(ResourceRequestDTO.ProgressRequestDTO request, String userId, Long episodeId) {
@@ -102,6 +99,7 @@ public Boolean saveProgress(ResourceRequestDTO.ProgressRequestDTO request, Strin
         Integer requestProgress = request.getProgress();
         if (requestProgress >= 80) userEpisode.setIsComplete(true);
         userEpisode.setCurrentProgress(requestProgress);
+        userEpisodeProgressRepository.save(userEpisode);
         return userEpisode.getIsComplete();
     }
 
@@ -114,6 +112,7 @@ 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;
     }
 }
\ No newline at end of file

From 0213fea651a261f82804072543b449d2945adf04 Mon Sep 17 00:00:00 2001
From: LJYeon12 <juyeon010530@gmail.com>
Date: Thu, 20 Feb 2025 08:50:46 +0900
Subject: [PATCH 06/14] =?UTF-8?q?jdbc=20=EC=8B=9C=EA=B0=84=20=ED=95=9C?=
 =?UTF-8?q?=EA=B5=AD=20=EC=8B=9C=EA=B0=84=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/learningFlow/learningFlow_BE/domain/BaseEntity.java    | 1 +
 src/main/resources/application.yml                              | 2 ++
 2 files changed, 3 insertions(+)

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/resources/application.yml b/src/main/resources/application.yml
index d513d9cb..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:

From 0628e9810c0130599bc4fabf56f77d053ec3ab5c Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 10:01:54 +0900
Subject: [PATCH 07/14] =?UTF-8?q?feat=20:=20RefreshToken=20=EC=9C=A0?=
 =?UTF-8?q?=ED=9A=A8=EA=B8=B0=EA=B0=84=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningFlow_BE/security/jwt/JwtProperties.java           | 2 +-
 .../learningFlow_BE/security/jwt/JwtTokenProvider.java        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

From 9eb5388d706b83029888c8ba783ff39fea9eb515 Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 10:02:07 +0900
Subject: [PATCH 08/14] =?UTF-8?q?feat=20:=20=EA=B0=81=20=EC=97=90=ED=94=BC?=
 =?UTF-8?q?=EC=86=8C=EB=93=9C=EC=9D=98=20completed=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningFlow_BE/converter/ResourceConverter.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
index 87d18460..ed47b4b0 100644
--- a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
+++ b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
@@ -90,7 +90,7 @@ public static ResourceResponseDTO.SearchResultResourceDTO convertToResourceDTO(
                 // added: today 값 설정 - 다음 학습할 에피소드인지 확인
                 .today(episode.getEpisodeNumber().equals(currentEpisodeNumber + 1))
                 // added: completed 값 설정 - 현재 에피소드보다 번호가 작으면 완료된 것
-                .completed(episode.getEpisodeNumber() <= currentEpisodeNumber)
+                .completed(userProgress != null && userProgress.getIsComplete())
                 // added: progress 값 설정 - 해당 에피소드의 진도율
                 .progress(userProgress != null ? userProgress.getCurrentProgress() : null)
                 .build();

From 90f5fecda17dce390ceba379c48f942cbd1056a7 Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 11:10:22 +0900
Subject: [PATCH 09/14] =?UTF-8?q?feat=20:=20=EC=A7=84=EB=8F=84=EC=9C=A8=20?=
 =?UTF-8?q?=EA=B3=84=EC=82=B0=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../converter/CollectionConverter.java        |  2 +-
 .../service/collection/CollectionService.java | 64 +++++++++++++++++++
 .../dto/collection/CollectionResponseDTO.java |  1 +
 3 files changed, 66 insertions(+), 1 deletion(-)

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/service/collection/CollectionService.java b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
index fa041b02..3e1ddf00 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
@@ -163,6 +163,7 @@ public CollectionResponseDTO.CollectionLearningInfo getLearningInfo(
             return CollectionResponseDTO.CollectionLearningInfo.builder()
                     .learningStatus("COMPLETED")
                     .progressRate(100)
+                    .progressRatio(calculateProgressRatio(realUserCollection))
                     .startDate(realUserCollection.getCreatedAt().toLocalDate())
                     .completedDate(realUserCollection.getCompletedTime())
                     .resourceDTOList(isDetailView ?
@@ -175,6 +176,7 @@ 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 ?
@@ -207,8 +209,70 @@ private List<ResourceResponseDTO.SearchResultResourceDTO> getAllResourcesWithPro
     }
 
     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(
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;

From 31176e5253ee123b06b828975eed41e71540a82d Mon Sep 17 00:00:00 2001
From: LJYeon12 <juyeon010530@gmail.com>
Date: Thu, 20 Feb 2025 12:10:59 +0900
Subject: [PATCH 10/14] =?UTF-8?q?=EC=88=98=EA=B0=95=20=EC=99=84=EB=A3=8C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiPayload/code/status/ErrorStatus.java   |  2 ++
 .../domain/UserCollection.java                |  4 +++
 .../service/resource/ResourceService.java     | 33 +++++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)

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/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/service/resource/ResourceService.java b/src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java
index 92eea0e9..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,7 +72,6 @@ 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));
@@ -97,7 +97,10 @@ public Boolean saveProgress(ResourceRequestDTO.ProgressRequestDTO request, Strin
                 .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();
@@ -115,4 +118,30 @@ public Boolean changeEpisodeComplete(Long episodeId, String loginId){
         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

From 49c613b0d615732a6c2df189299ac8777c889f3a Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 12:34:15 +0900
Subject: [PATCH 11/14] =?UTF-8?q?feat=20:=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/collection/CollectionService.java               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 3e1ddf00..bab4ad15 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(
@@ -384,7 +385,8 @@ public HomeResponseDTO.UserHomeInfoDTO getUserHomeCollections(User user) {
         Map<Long, CollectionResponseDTO.CollectionLearningInfo> learningInfoMap = recommendedCollections.stream()
                 .collect(Collectors.toMap(
                         Collection::getId,
-                        collection -> getLearningInfo(collection, user, false)
+                        collection -> getLearningInfo(collection, user, false),
+                        (existing, replacement) -> replacement  // added: 중복 키가 있을 경우 새 값 사용
                 ));
 
         return HomeConverter.convertToUserHomeInfoDTO(

From 97b8655ea0fa2e09bb21798de871098dc428144e Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 12:44:00 +0900
Subject: [PATCH 12/14] =?UTF-8?q?feat=20:=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/collection/CollectionService.java | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

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 bab4ad15..e12507bd 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java
@@ -345,48 +345,64 @@ 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()
                 .collect(Collectors.toMap(
                         Collection::getId,
-                        collection -> getLearningInfo(collection, user, false),
-                        (existing, replacement) -> replacement  // added: 중복 키가 있을 경우 새 값 사용
+                        collection -> getLearningInfo(collection, user, false)
                 ));
 
         return HomeConverter.convertToUserHomeInfoDTO(

From d9362f813efa6ff27a48e7b55c7aa7ef7d170b95 Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 13:10:00 +0900
Subject: [PATCH 13/14] =?UTF-8?q?feat=20:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B5=9C=EA=B7=BC=20=ED=95=99=EC=8A=B5=20?=
 =?UTF-8?q?=EC=BB=AC=EB=A0=89=EC=85=98=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EC=A4=80=20UpdatedAt=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=EC=9C=BC=EB=A1=9C=20=EB=82=B4=EB=A6=BC=EC=B0=A8?=
 =?UTF-8?q?=EC=88=9C=20=EC=A0=95=EB=A0=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningFlow_BE/repository/UserCollectionRepository.java  | 2 +-
 .../learningFlow_BE/service/user/UserService.java             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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/service/user/UserService.java b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
index 0dbca90c..c0c9bd87 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
@@ -211,7 +211,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 -> {
@@ -234,7 +234,7 @@ public UserResponseDTO.UserMyPageResponseDTO getUserMyPageResponseDTO(String log
 
 
         List<UserCollection> completedUserCollectionList
-                = userCollectionRepository.findByUserAndStatusOrderByCompletedTimeDesc(user, UserCollectionStatus.COMPLETED);
+                = userCollectionRepository.findByUserAndStatusOrderByUpdatedAtDesc(user, UserCollectionStatus.COMPLETED);
 
         List<CollectionResponseDTO.CollectionPreviewDTO> completedCollectionList = completedUserCollectionList.stream()
                 .map(userCollection -> {

From 67f78798035219b6b5ae70483a1f357f451bbf3a Mon Sep 17 00:00:00 2001
From: MODUGGAGI <kiroro0814@naver.com>
Date: Thu, 20 Feb 2025 16:43:13 +0900
Subject: [PATCH 14/14] =?UTF-8?q?feat=20:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20resource=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../converter/ResourceConverter.java          | 38 +++++++++++++++++--
 .../service/user/UserService.java             | 28 +++++++++++++-
 .../web/dto/resource/ResourceResponseDTO.java |  2 +-
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
index ed47b4b0..c4b7789f 100644
--- a/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
+++ b/src/main/java/learningFlow/learningFlow_BE/converter/ResourceConverter.java
@@ -121,18 +121,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,
@@ -151,6 +160,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/service/user/UserService.java b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
index c0c9bd87..16d42baa 100644
--- a/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
+++ b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java
@@ -224,10 +224,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();
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..c0377ff8 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
@@ -85,7 +85,7 @@ public static class ProgressResponseDTO {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class RecentlyWatchedEpisodeDTO {
-        Long resourceId;
+        Long episodeId;
         Long collectionId;
         String collectionTitle;
         String resourceSource;