Merge pull request #207 from TeamLearningFlow/develop

Develop

Author: LJYeon12

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

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

@@ -94,14 +94,15 @@ 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));
         // 만약 진도가 80이상인 경우 완료로 저장
         Integer requestProgress = request.getProgress();
         if (requestProgress >= 80) userEpisode.setIsComplete(true);
         userEpisode.setCurrentProgress(requestProgress);
+        return userEpisode.getIsComplete();
     }
 
     @Transactional

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")

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