Skip to content

Commit 93fdeb1

Browse files
committed
fix: 주변 사용자 할 일 해제 오류 해결
1 parent 19d9aa9 commit 93fdeb1

4 files changed

Lines changed: 9 additions & 12 deletions

File tree

backend/src/main/java/com/dubu/backend/todo/application/TodoCommandFacade.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,7 @@ public void deleteTodosOnPlanRemoved(List<Long> subPathIds) {
246246
}
247247

248248
public void unfavorite(Long memberId, Long sourceTodoId){
249-
MemberStatus status = memberApi.getMemberStatus(memberId);
250-
validateTodoMemberStatus(TodoRequestType.FAVORITE, status);
251-
252-
Todo todo = todoQueryService.findFavoriteTodoFromParent(sourceTodoId);
249+
Todo todo = todoQueryService.findFavoriteTodoFromParent(memberId, sourceTodoId);
253250
todoCommandService.deleteTodo(todo);
254251
}
255252

backend/src/main/java/com/dubu/backend/todo/application/TodoQueryService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public List<TodoInfo> findTodosInPathsWithChildLinks(List<Long> subPathIds, Long
6565
return todoRepository.searchTodoInfosWithTodoLink(TodoSearchCond.subPathIdsOf(subPathIds, true), TodoChildLinkSearchCond.of(memberId));
6666
}
6767

68-
public Todo findFavoriteTodoFromParent(Long parentTodoId){
69-
return todoRepository.findByIdWithChildLinksAndChildTodo(parentTodoId).orElseThrow(TodoNotFoundException::new);
68+
public Todo findFavoriteTodoFromParent(Long memberId, Long parentTodoId){
69+
return todoRepository.findByParentTodoAndMemberIdAndTypeWithTodoLink(parentTodoId, memberId, TodoType.FAVORITE).orElseThrow(TodoNotFoundException::new);
7070
}
7171

7272
public Slice<TodoInfo> findFavoriteTodos(Long memberId, Long cursorTodoId, int size){

backend/src/main/java/com/dubu/backend/todo/domain/repository/TodoRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public interface TodoRepository extends JpaRepository<Todo, Long>, TodoQueryRepo
2525
@Query("SELECT t FROM Todo t LEFT JOIN t.parentLinks tpl WHERE tpl.parentTodo = :todo AND t.type = :type")
2626
List<Todo> findByParentTodoAndTypeWithTodoLInk(Todo todo, TodoType type);
2727

28-
@Query("SELECT DISTINCT t FROM Todo t JOIN FETCH t.childLinks tcl JOIN FETCH tcl.childTodo WHERE t.id = :todoId")
29-
Optional<Todo> findByIdWithChildLinksAndChildTodo(Long todoId);
28+
@Query("SELECT t FROM Todo t LEFT JOIN t.parentLinks tcl WHERE tcl.parentTodo.id = :todoId AND t.memberId = :memberId AND t.type = :type")
29+
Optional<Todo> findByParentTodoAndMemberIdAndTypeWithTodoLink(Long todoId, Long memberId, TodoType type);
3030

3131
@Query("SELECT DISTINCT t FROM Todo t LEFT JOIN FETCH t.parentLinks tcl WHERE t.scheduleId = :scheduleId")
3232
List<Todo> findByScheduleIdWithParentLinks(Long scheduleId);

backend/src/main/resources/application-prod.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ logging:
9999
level:
100100
root: info
101101

102-
#decorator:
103-
# datasource:
104-
# p6spy:
105-
# enable-logging: false
102+
decorator:
103+
datasource:
104+
p6spy:
105+
enable-logging: false

0 commit comments

Comments
 (0)