Merge pull request #51 from Mojacknong/fix_50/일기-댓글

[fix] 일기 댓글 조회 조건 변경 / farmClubId 제거
Mojacknong · Jul 31, 2024 · 052da71 · 052da71
2 parents accc3fa + 3b5eb08
commit 052da71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/...m/modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieDiaryController.java b/...m/modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieDiaryController.java
@@ -105,14 +105,9 @@ public BaseResponseDto<?> cancelLike(
         return BaseResponseDto.of(SuccessCode.SUCCESS, null);
     }
 
-    @GetMapping(value = "/{diaryId}/{farmClubId}/comment")
-    public BaseResponseDto<?> selectComment(
-            @AuthenticationPrincipal CustomUser user,
-            @PathVariable("diaryId") Long diaryId,
-            @PathVariable("farmClubId") Long farmClubId
-    )  {
-        List<DiaryCommentContent> diaryCommentList = myVeggieDiaryService.selectComment(user.getUserId(), diaryId, farmClubId);
-
+    @GetMapping(value = "/{diaryId}/comment")
+    public BaseResponseDto<?> selectComment(@AuthenticationPrincipal CustomUser user, @PathVariable("diaryId") Long diaryId)  {
+        List<DiaryCommentContent> diaryCommentList = myVeggieDiaryService.selectComment(user.getUserId(), diaryId);
         return BaseResponseDto.of(SuccessCode.SUCCESS, diaryCommentList);
     }
 

diff --git a/.../java/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/DiaryRepository.java b/.../java/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/DiaryRepository.java
@@ -32,9 +32,8 @@ public interface DiaryRepository extends JpaRepository<Diary, Long> {
              "JOIN FETCH dc.diary AS d " +
              "JOIN FETCH d.myVeggie AS mv " +
              "JOIN FETCH mv.user " +
-             "JOIN FETCH d.farmClub " +
-             "WHERE d.id = :diaryId AND d.farmClub.id = :farmClubId AND d.isOpen = true")
-     List<DiaryComment> findDiary(@Param("diaryId") Long diaryId, @Param("farmClubId") Long farmClubId);
+             "WHERE d.id = :diaryId")
+     List<DiaryComment> findDiaryById(@Param("diaryId") Long diaryId);
 
 
     @Query("SELECT d FROM diary AS d " +

diff --git a/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java b/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java
@@ -156,11 +156,8 @@ public BaseResponseDto<SelectDiaryOneResponse> selectDiaryOne(MyVeggie myVeggie)
 
 
     @Transactional
-    public List<DiaryCommentContent> selectComment(
-            Long userId, Long diaryId, Long farmClubId
-    )  {
-
-        List<DiaryComment> diaryCommentList = diaryRepository.findDiary(diaryId, farmClubId);
+    public List<DiaryCommentContent> selectComment(Long userId, Long diaryId)  {
+        List<DiaryComment> diaryCommentList = diaryRepository.findDiaryById(diaryId);
         List<DiaryCommentContent> diaryCommentContent = DiaryCommentContent.processData(diaryCommentList, userId);
         return diaryCommentContent;
     }