Merge pull request #217 from TeamLearningFlow/develop

Develop

Author: LJYeon12

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

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

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

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

src/main/java/learningFlow/learningFlow_BE/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);
+        }
+    }
 }