Merge pull request #235 from TeamLearningFlow/develop

Develop

Author: LJYeon12

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

@@ -7,9 +7,12 @@
 import learningFlow.learningFlow_BE.domain.CollectionEpisode;
 import learningFlow.learningFlow_BE.domain.UserCollection;
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class ResourceConverter {
-    public static ResourceResponseDTO.ResourceUrlDTO watchEpisode(Collection collection, UserEpisodeProgress userProgress, Resource resource, Optional<Memo> memo){
+    public static ResourceResponseDTO.ResourceUrlDTO watchEpisode(Collection collection, UserEpisodeProgress userProgress, Resource resource, Optional<Memo> memo
+                                                                  ,List<UserEpisodeProgress> userEpisodeProgressList){
         String memoContents = "작성하신 글의 첫 줄은 노트의 제목이 됩니다, 최대 2,000자까지 입력하실 수 있어요";
         if (memo.isPresent())
             memoContents = memo.get().getContents();
@@ -21,15 +24,16 @@ public static ResourceResponseDTO.ResourceUrlDTO watchEpisode(Collection collect
                 .urlTitle(resource.getTitle())
                 .progress(userProgress.getCurrentProgress())
                 .memoContents(memoContents)
-                .episodeInformationList(episodeInformationList(collection,userProgress))
+                .episodeInformationList(episodeInformationList(collection,userProgress, userEpisodeProgressList))
                 .build();
     }
     public static ResourceResponseDTO.ResourceBlogUrlDTO watchBlogEpisode(
             Collection collection,
             UserEpisodeProgress userProgress,
             String pageResource,
             String resourceTitle,
-            Optional<Memo> memo){
+            Optional<Memo> memo,
+            List<UserEpisodeProgress> userEpisodeProgressList){
         String memoContents = "작성하신 글의 첫 줄은 노트의 제목이 됩니다, 최대 2,000자까지 입력하실 수 있어요";
         if (memo.isPresent())
             memoContents = memo.get().getContents();
@@ -41,15 +45,38 @@ public static ResourceResponseDTO.ResourceBlogUrlDTO watchBlogEpisode(
                 .urlTitle(resourceTitle)
                 .progress(userProgress.getCurrentProgress())
                 .memoContents(memoContents)
-                .episodeInformationList(episodeInformationList(collection, userProgress))
+                .episodeInformationList(episodeInformationList(collection, userProgress, userEpisodeProgressList))
                 .build();
     }
 
     public static List<ResourceResponseDTO.episodeInformation> episodeInformationList(
-            Collection collection, UserEpisodeProgress userEpisodeProgress
+            Collection collection, UserEpisodeProgress userEpisodeProgress, List<UserEpisodeProgress> userEpisodeProgressList
     ) {
         List<ResourceResponseDTO.episodeInformation> episodeInformationList = new ArrayList<>();
 
+        // userEpisodeProgressList를 에피소드 ID를 키로 하는 Map으로 변환
+        Map<Long, UserEpisodeProgress> progressMap = userEpisodeProgressList.stream()
+                .collect(Collectors.toMap(
+                        progress -> progress.getUserEpisodeProgressId().getCollectionEpisodeId(),
+                        Function.identity()
+                ));
+
+        // 컬렉션에 속한 각 에피소드마다 진행 상태를 매핑
+        for (CollectionEpisode episode : collection.getEpisodes()) {
+            // 해당 에피소드에 대해 UserEpisodeProgress가 존재하면 isComplete를 가져오고,
+            // 없으면 기본값(false)를 사용
+            Boolean isComplete = progressMap.containsKey(episode.getId())
+                    ? progressMap.get(episode.getId()).getIsComplete() : false;
+
+            episodeInformationList.add(new ResourceResponseDTO.episodeInformation(
+                    episode.getId(),
+                    episode.getEpisodeNumber(),
+                    episode.getResource().getTitle(),
+                    isComplete,
+                    episode.getResource().getType()
+            ));
+        }/*
+        // 유저 episodeProgress에서 가져올 것
         for (CollectionEpisode episode : collection.getEpisodes()) {
             episodeInformationList.add(new ResourceResponseDTO.episodeInformation(
                     episode.getId(),
@@ -58,7 +85,7 @@ public static List<ResourceResponseDTO.episodeInformation> episodeInformationLis
                     userEpisodeProgress.getIsComplete(),
                     episode.getResource().getType()
             ));
-        }
+        }*/
         episodeInformationList.sort(Comparator.comparingInt(ResourceResponseDTO.episodeInformation::getEpisodeNumber));
         return episodeInformationList;
     }

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

@@ -1,9 +1,11 @@
 package learningFlow.learningFlow_BE.repository;
 
+import learningFlow.learningFlow_BE.domain.Collection;
 import learningFlow.learningFlow_BE.domain.CollectionEpisode;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
+import java.util.List;
 
 public interface CollectionEpisodeRepository extends JpaRepository<CollectionEpisode, Long> {
+
+    List<CollectionEpisode> findByCollection(Collection collection);
 }

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

@@ -7,8 +7,12 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+
 public interface UserEpisodeProgressRepository extends JpaRepository<UserEpisodeProgress, UserEpisodeProgressId> {
     @Modifying
     @Query("DELETE FROM UserEpisodeProgress uep WHERE uep.id.userId = :loginId")
     void deleteAllByUserId(@Param("loginId") String loginId);
+
+    List<UserEpisodeProgress> findByUserEpisodeProgressId_UserIdAndUserEpisodeProgressId_CollectionEpisodeIdIn(String loginId, List<Long> episodeId);
 }

src/main/java/learningFlow/learningFlow_BE/service/resource/ResourceService.java

@@ -12,6 +12,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -70,6 +71,20 @@ public Optional<Memo> getMemoContents(Long episodeId){
         return memoRepository.findByEpisodeId(episodeId);
     }
 
+    @Transactional
+    public List<UserEpisodeProgress> getEpisodeProgress(String loginId, Long episodeId){
+        CollectionEpisode episode = collectionEpisodeRepository.findById(episodeId)
+                .orElseThrow(() -> new ResourceHandler(ErrorStatus.EPISODE_NOT_FOUND));
+        Collection collection = episode.getCollection();
+        List<CollectionEpisode> episodes = collectionEpisodeRepository.findByCollection(collection);
+        List<Long> episodeIds = episodes.stream()
+                .map(CollectionEpisode::getId)
+                .collect(Collectors.toList());
+
+        return userEpisodeProgressRepository
+                .findByUserEpisodeProgressId_UserIdAndUserEpisodeProgressId_CollectionEpisodeIdIn(loginId, episodeIds);
+    }
+
     @Transactional
     public void updateUserCollection(CollectionEpisode episode, String loginId) {
         Collection collection = episode.getCollection();

src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java

@@ -30,6 +30,7 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Optional;
 
 @RestController
@@ -76,8 +77,9 @@ public ApiResponse<ResourceResponseDTO.ResourceUrlDTO> watchEpisode(
         Collection collection = resourceService.getCollection(episodeId);
         Optional<Memo> memo = resourceService.getMemoContents(episodeId);
         Resource resource = youtubeUrlEmbedService.getResource(episodeId);
+        List<UserEpisodeProgress> episodeProgress = resourceService.getEpisodeProgress(loginId, episodeId);
         ResourceResponseDTO.ResourceUrlDTO response =
-                ResourceConverter.watchEpisode(collection, userEpisodeProgress, resource, memo);
+                ResourceConverter.watchEpisode(collection, userEpisodeProgress, resource, memo, episodeProgress);
         return ApiResponse.onSuccess(response);
     }
 
@@ -115,8 +117,9 @@ public ApiResponse<ResourceResponseDTO.ResourceBlogUrlDTO> watchBlogEpisode(
         Collection collection = resourceService.getCollection(episodeId);
         Optional<Memo> memo = resourceService.getMemoContents(episodeId);
         String resourceTitle = resourceService.getResource(episodeId).getTitle();
+        List<UserEpisodeProgress> episodeProgress = resourceService.getEpisodeProgress(loginId, episodeId);
         String blogSourceUrl = "/resources/" + episodeId + "/blog/content";
-        ResourceResponseDTO.ResourceBlogUrlDTO response = ResourceConverter.watchBlogEpisode(collection, userEpisodeProgress, blogSourceUrl, resourceTitle, memo);
+        ResourceResponseDTO.ResourceBlogUrlDTO response = ResourceConverter.watchBlogEpisode(collection, userEpisodeProgress, blogSourceUrl, resourceTitle, memo, episodeProgress);
         return ApiResponse.onSuccess(response);
     }