From c335cf32330bcb5d4d7ebbfa9d1bbd6162678f7d Mon Sep 17 00:00:00 2001 From: myqewr Date: Tue, 8 Apr 2025 15:37:21 +0900 Subject: [PATCH] [fix] : Fix "Get Greenroom Info" API --- .../api/domain/greenroom/repository/TodoRepository.java | 4 ++++ .../server/api/domain/greenroom/service/GreenroomService.java | 1 - .../server/api/domain/greenroom/service/TodoService.java | 2 +- server/src/test/resources/schema-test.sql | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/greenroom/server/api/domain/greenroom/repository/TodoRepository.java b/server/src/main/java/com/greenroom/server/api/domain/greenroom/repository/TodoRepository.java index 913d976..1ebb2af 100644 --- a/server/src/main/java/com/greenroom/server/api/domain/greenroom/repository/TodoRepository.java +++ b/server/src/main/java/com/greenroom/server/api/domain/greenroom/repository/TodoRepository.java @@ -24,9 +24,13 @@ public interface TodoRepository extends JpaRepository { @EntityGraph(attributePaths = {"activity"}) List findAllByGreenRoomAndUseYn(GreenRoom greenRoom, Boolean useYn); + @EntityGraph(attributePaths = {"activity"}) + List findAllByGreenRoomAndUseYnAndNextTodoDateIsNotNull(GreenRoom greenRoom, Boolean useYn); + @Query("select t from Todo t where t.greenRoom.greenroomId = :greenroomId and t.activity.activityId in (:activityIds)") List findAllByGreenRoomAndActivity(@Param("greenroomId")Long greenroomId,@Param("activityIds") List activityIds ); + @EntityGraph(attributePaths ={"activity"}) List findAllByGreenRoom(GreenRoom greenRoom); @EntityGraph(attributePaths ={"activity"}) diff --git a/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/GreenroomService.java b/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/GreenroomService.java index a99af02..7b72fb6 100644 --- a/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/GreenroomService.java +++ b/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/GreenroomService.java @@ -282,7 +282,6 @@ public GreenroomTodoCycleResponseDto updateActivityStatus(ActivityStatusUpdateRe todoService.createTodo(greenRoom,new ArrayList<>(active)); return getGreenroomTodoInfo(greenroomId); - } private void updateExistingTodos(List todoList, Set activeIds, Set inactiveIds) { diff --git a/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/TodoService.java b/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/TodoService.java index 98bbcad..a9ce0df 100644 --- a/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/TodoService.java +++ b/server/src/main/java/com/greenroom/server/api/domain/greenroom/service/TodoService.java @@ -32,7 +32,7 @@ public class TodoService { public GreenroomInfoResponseDto.GreenroomTodoInfoDto getGreenroomTodoInfo(GreenRoom greenRoom){ - List greemroomTodoList = todoRepository.findAllByGreenRoomAndUseYn(greenRoom,true); + List greemroomTodoList = todoRepository.findAllByGreenRoomAndUseYnAndNextTodoDateIsNotNull(greenRoom,true); //오늘 해야하는 일인지 확인 Predicate isTodo = todo -> !todo.getNextTodoDate().isAfter(LocalDate.now()); diff --git a/server/src/test/resources/schema-test.sql b/server/src/test/resources/schema-test.sql index 495fd20..5bd333b 100644 --- a/server/src/test/resources/schema-test.sql +++ b/server/src/test/resources/schema-test.sql @@ -186,8 +186,6 @@ ALTER TABLE `adornment` ADD FOREIGN KEY (`item_id`) REFERENCES `item` (`item_id` ALTER TABLE `adornment` ADD FOREIGN KEY (`greenroom_id`) REFERENCES `greenroom` (`greenroom_id`); -ALTER TABLE `suggestion` ADD FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`); - ALTER TABLE `item` ADD FOREIGN KEY (`grade_id`) REFERENCES `grade` (`grade_id`); ALTER TABLE `notification` ADD FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`);