Merge pull request #250 from TeamLearningFlow/develop

Author: LJYeon12

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

@@ -67,8 +67,9 @@ public Resource getResource(Long episodeId){
     }
 
     @Transactional
-    public Optional<Memo> getMemoContents(Long episodeId){
-        return memoRepository.findByEpisodeId(episodeId);
+    public Optional<Memo> getMemoContents(Long episodeId, String loginId){
+        MemoId memoId = new MemoId(episodeId, loginId);
+        return memoRepository.findById(memoId);
     }
 
     @Transactional

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

@@ -75,7 +75,7 @@ public ApiResponse<ResourceResponseDTO.ResourceUrlDTO> watchEpisode(
         String loginId = principalDetails.getUser().getLoginId();
         UserEpisodeProgress userEpisodeProgress = resourceService.getUserEpisodeProgress(episodeId, loginId);
         Collection collection = resourceService.getCollection(episodeId);
-        Optional<Memo> memo = resourceService.getMemoContents(episodeId);
+        Optional<Memo> memo = resourceService.getMemoContents(episodeId, loginId);
         Resource resource = youtubeUrlEmbedService.getResource(episodeId);
         List<UserEpisodeProgress> episodeProgress = resourceService.getEpisodeProgress(loginId, episodeId);
         ResourceResponseDTO.ResourceUrlDTO response =
@@ -115,7 +115,7 @@ public ApiResponse<ResourceResponseDTO.ResourceBlogUrlDTO> watchBlogEpisode(
         String loginId = principalDetails.getUser().getLoginId();
         UserEpisodeProgress userEpisodeProgress = resourceService.getUserEpisodeProgress(episodeId, loginId);
         Collection collection = resourceService.getCollection(episodeId);
-        Optional<Memo> memo = resourceService.getMemoContents(episodeId);
+        Optional<Memo> memo = resourceService.getMemoContents(episodeId, loginId);
         String resourceTitle = resourceService.getResource(episodeId).getTitle();
         List<UserEpisodeProgress> episodeProgress = resourceService.getEpisodeProgress(loginId, episodeId);
         String blogSourceUrl = "/resources/" + episodeId + "/blog/content";