Skip to content

Commit f1f035a

Browse files
committed
CLAP-70 Fix: untilDate 파라미터가 null일 경우 처리
<footer> - 관련: #29
1 parent 825e519 commit f1f035a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pag
5858

5959
@Override
6060
public Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable) {
61-
log.info("untildate {}", untilDate);
6261
Slice<TaskEntity> tasks = taskRepository.findTasksWithTaskStatusAndCompletedAt(processorId, statuses, untilDate, pageable);
6362
return tasks.map(taskPersistenceMapper::toDomain);
6463
}

src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskRepository.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
2525
);
2626

2727

28-
@Query("SELECT t FROM TaskEntity t WHERE t.processor.memberId = :processorId " +
28+
@Query("SELECT t FROM TaskEntity t " +
29+
"WHERE t.processor.memberId = :processorId " +
2930
"AND t.taskStatus IN :taskStatus " +
3031
"AND (t.taskStatus != 'COMPLETED' OR t.completedAt >= :untilDate)")
3132
Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
@@ -36,6 +37,7 @@ Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
3637
);
3738

3839

40+
3941
}
4042

4143

src/main/java/clap/server/application/Task/TaskBoardService.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
package clap.server.application.Task;
22

3+
import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
34
import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
45
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
56
import clap.server.application.mapper.TaskMapper;
67
import clap.server.application.port.inbound.domain.MemberService;
8+
import clap.server.application.port.inbound.domain.TaskService;
79
import clap.server.application.port.inbound.task.TaskBoardUsecase;
10+
import clap.server.application.port.outbound.task.CommandTaskPort;
811
import clap.server.application.port.outbound.task.LoadTaskPort;
912
import clap.server.common.annotation.architecture.ApplicationService;
13+
import clap.server.domain.model.member.Member;
1014
import clap.server.domain.model.task.Task;
1115
import lombok.RequiredArgsConstructor;
1216
import org.springframework.data.domain.Pageable;
1317
import org.springframework.data.domain.Slice;
1418
import org.springframework.transaction.annotation.Transactional;
1519

1620
import java.time.LocalDate;
21+
import java.time.LocalDateTime;
1722
import java.util.List;
1823

1924
@ApplicationService
@@ -25,13 +30,16 @@ class TaskBoardService implements TaskBoardUsecase {
2530
TaskStatus.COMPLETED
2631
);
2732
private final MemberService memberService;
33+
private final TaskService taskService;
2834
private final LoadTaskPort loadTaskPort;
35+
private final CommandTaskPort commandTaskPort;
2936

3037
@Transactional(readOnly = true)
3138
@Override
3239
public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
3340
memberService.findById(processorId);
34-
Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDate.plusDays(1).atStartOfDay(), pageable);
41+
LocalDateTime untilDateTime = untilDate==null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
42+
Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDateTime, pageable);
3543
return TaskMapper.toSliceTaskItemResponse(tasks);
3644
}
3745

0 commit comments

Comments
 (0)