Merge pull request #135 from MADA-UMC/server-heerang

feat: 삭제된 카테고리의 투두인 경우 유저 투두 조회에 포함되지 않도록 수정
MADA-UMC · Mar 14, 2024 · 3a91f09 · 3a91f09
2 parents 0059c00 + 8991313
commit 3a91f09
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/umc/mada/todo/service/TodoService.java b/src/main/java/com/umc/mada/todo/service/TodoService.java
@@ -314,12 +314,12 @@ public Map<String, Object> getUserTodo(User userId, LocalDate date) {
         Map<String, Object> map = new LinkedHashMap<>();
         Map<String, Object> data = new LinkedHashMap<>();
         for (Todo todo : userTodos){
-            if(todo.getDate()!= null && todo.getDate().equals(date) && todo.getRepeat().equals(Repeat.N)){
+            if(todo.getDate()!= null && todo.getDate().equals(date) && todo.getRepeat().equals(Repeat.N) && !todo.getCategory().getIsDeleted()){
                 filteredTodos.add(TodoResponseDto.of(todo));
             }
         }
         for (RepeatTodo repeatTodo : repeatTodos){
-            if(repeatTodo.getTodoId().getUserId() == userId){
+            if(repeatTodo.getTodoId().getUserId() == userId && !repeatTodo.getTodoId().getCategory().getIsDeleted()){
                 filteredRepeatTodos.add(RepeatTodoResponseDto.of(repeatTodo));
             }
         }