[fix] 메인페이지 루틴 조회 시 조건 추가 -> 오늘 해야할 루틴

Mojacknong · Jul 30, 2024 · c4a2a0c · c4a2a0c
1 parent f2869e7
commit c4a2a0c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieRoutineController.java b/...modernfarmer/farmusspring/domain/myveggiegarden/controller/MyVeggieRoutineController.java
@@ -62,9 +62,7 @@ public BaseResponseDto<?> checkVeggieRoutine(@Validated @RequestBody RoutineChec
     }
 
     @GetMapping(value = "/{myVeggieId}")
-    public BaseResponseDto<?> selectMyVeggieRoutineById(
-            @PathVariable("myVeggieId") Long myVeggieId
-    ) {
+    public BaseResponseDto<?> selectRoutineToday(@PathVariable("myVeggieId") Long myVeggieId) {
         MyVeggie myVeggie = MyVeggie.builder().id(myVeggieId).build();
         List<MyVeggieRoutine> result = myVeggieRoutineService.selectMyVeggieRoutineById(myVeggie);
         return BaseResponseDto.of(SuccessCode.SUCCESS, result);

diff --git a/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/RoutineRepository.java b/...ava/com/modernfarmer/farmusspring/domain/myveggiegarden/repository/RoutineRepository.java
@@ -39,4 +39,7 @@ public interface RoutineRepository extends JpaRepository<Routine, Long> {
             "FUNCTION('YEAR', r.date) = FUNCTION('YEAR', :month) AND FUNCTION('MONTH', r.date) = FUNCTION('MONTH', :month)")
     List<Routine> findRoutineAndRoutineAndMyVeggieByMonthWithUser(@Param("month") Date month, @Param("user") User user );
 
+
+    @Query("SELECT r FROM routine AS r  WHERE r.myVeggie = :myVeggie AND r.date = CURRENT_DATE")
+    List<Routine> findRoutineByIdAndToday(@Param("myVeggie") MyVeggie myVeggie);
 }
diff --git a/...a/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieRoutineService.java b/...a/com/modernfarmer/farmusspring/domain/myveggiegarden/service/MyVeggieRoutineService.java
@@ -51,7 +51,7 @@ public void eraseRoutine(RoutineDelete routineDelete) {
 
     @Transactional
     public List<MyVeggieRoutine> selectMyVeggieRoutineById(MyVeggie myVeggie) {
-        List<Routine> routineList = myVeggieRepository.findMyVeggieRoutineById(myVeggie);
+        List<Routine> routineList = routineRepository.findRoutineByIdAndToday(myVeggie);
         return  MyVeggieRoutine.processData(routineList);
     }