Merge branch 'dev' of https://github.com/Mojacknong/Farmus-Spring int…

…o fix_47'/메인-루틴-조회
Mojacknong · Jul 31, 2024 · 1e27c33 · 1e27c33
2 parents c4a2a0c + 14d694f
commit 1e27c33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...m/modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieDiaryController.java b/...m/modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieDiaryController.java
@@ -63,9 +63,7 @@ public BaseResponseDto<CheckTodayDiaryResponse> checkTodayDiary(
     }
 
     @GetMapping(value = "/{myVeggieId}/one")
-    public BaseResponseDto<SelectDiaryOneResponse> selectDiaryOne(
-            @PathVariable("myVeggieId") Long myVeggieId
-    )  {
+    public BaseResponseDto<SelectDiaryOneResponse> selectDiaryOne(@PathVariable("myVeggieId") Long myVeggieId) {
         return myVeggieDiaryService.selectDiaryOne(MyVeggie.builder().id(myVeggieId).build());
     }
 

diff --git a/.../java/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/DiaryRepository.java b/.../java/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/DiaryRepository.java
@@ -46,4 +46,9 @@ public interface DiaryRepository extends JpaRepository<Diary, Long> {
           )
     List<Diary> findDiaryByFarmClub(@Param("farmClubId") Long farmClubId);
 
+    @Query("SELECT d FROM diary AS d WHERE d.myVeggie = :myVeggie AND FUNCTION('DATE', d.createdDate) = CURRENT_DATE")
+    List<Diary> findDiaryByToday(@Param("myVeggie") MyVeggie myVeggie);
+
+
+
 }
diff --git a/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java b/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieDiaryService.java
@@ -141,10 +141,8 @@ public void updateComment(User user, Long diaryCommentId, String content) {
         myVeggieRepository.updateDiaryCommentByIdAndUserId(diaryCommentId, user, content);
     }
     @Transactional
-    public BaseResponseDto<SelectDiaryOneResponse> selectDiaryOne(
-            MyVeggie myVeggie
-    )  {
-        List<Diary> diaryList = selectDiaryByMyVeggie(myVeggie);
+    public BaseResponseDto<SelectDiaryOneResponse> selectDiaryOne(MyVeggie myVeggie)  {
+        List<Diary> diaryList = diaryRepository.findDiaryByToday(myVeggie);
         if(diaryList.isEmpty()) {
             return BaseResponseDto.of(MyVeggieGardenSuccessCode.NOT_FOUND_DIARY, null);
         }