Skip to content

Commit f4f4670

Browse files
committed
CLAP-239 Feat: 기본 조회와 필터링 조회 usecase 통합
<footer> - 관련: #254
1 parent 3d00271 commit f4f4670

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

src/main/java/clap/server/application/port/inbound/task/FilterTaskBoardUsecase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
import java.time.LocalDate;
88

99
public interface FilterTaskBoardUsecase {
10-
TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable);
10+
TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate fromDate, FilterTaskBoardRequest request);
1111
}

src/main/java/clap/server/application/port/inbound/task/GetTaskBoardUsecase.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/clap/server/application/service/task/GetTaskBoardService.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,12 @@
55
import clap.server.application.mapper.TaskResponseMapper;
66
import clap.server.application.port.inbound.domain.MemberService;
77
import clap.server.application.port.inbound.task.FilterTaskBoardUsecase;
8-
import clap.server.application.port.inbound.task.GetTaskBoardUsecase;
98
import clap.server.application.port.outbound.task.LoadTaskPort;
109
import clap.server.common.annotation.architecture.ApplicationService;
1110
import clap.server.domain.model.task.Task;
1211
import clap.server.domain.policy.task.TaskPolicyConstants;
1312
import lombok.RequiredArgsConstructor;
1413
import lombok.extern.slf4j.Slf4j;
15-
import org.springframework.data.domain.Pageable;
16-
import org.springframework.data.domain.Slice;
1714
import org.springframework.transaction.annotation.Transactional;
1815

1916
import java.time.LocalDate;
@@ -24,23 +21,15 @@
2421
@ApplicationService
2522
@RequiredArgsConstructor
2623
@Transactional(readOnly = true)
27-
class GetTaskBoardService implements GetTaskBoardUsecase, FilterTaskBoardUsecase {
24+
class GetTaskBoardService implements FilterTaskBoardUsecase {
2825
private final MemberService memberService;
2926
private final LoadTaskPort loadTaskPort;
3027

3128
@Override
32-
public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
29+
public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate fromDate, FilterTaskBoardRequest request) {
3330
memberService.findActiveMember(processorId);
34-
LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
35-
Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable);
36-
return TaskResponseMapper.toSliceTaskItemResponse(tasks);
37-
}
38-
39-
@Override
40-
public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilDate, FilterTaskBoardRequest request, Pageable pageable) {
41-
memberService.findActiveMember(processorId);
42-
LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
43-
Slice<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable);
44-
return TaskResponseMapper.toSliceTaskItemResponse(tasks);
31+
LocalDateTime fromDateTime = fromDate != null ? fromDate.atStartOfDay() : null;
32+
List<Task> tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskPolicyConstants.TASK_BOARD_STATUS_FILTER, fromDateTime, request);
33+
return TaskResponseMapper.toTaskBoardResponse(tasks);
4534
}
4635
}

0 commit comments

Comments
 (0)