Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public Page<FilterPendingApprovalResponse> findPendingApprovalTasks(Pageable pag

@Override
public Slice<Task> findByProcessorAndStatus(Long processorId, List<TaskStatus> statuses, LocalDateTime untilDate, Pageable pageable) {
log.info("untildate {}", untilDate);
Slice<TaskEntity> tasks = taskRepository.findTasksWithTaskStatusAndCompletedAt(processorId, statuses, untilDate, pageable);
return tasks.map(taskPersistenceMapper::toDomain);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
);


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



}


Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
package clap.server.application.Task;

import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskOrderRequest;
import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse;
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
import clap.server.application.mapper.TaskMapper;
import clap.server.application.port.inbound.domain.MemberService;
import clap.server.application.port.inbound.domain.TaskService;
import clap.server.application.port.inbound.task.TaskBoardUsecase;
import clap.server.application.port.outbound.task.CommandTaskPort;
import clap.server.application.port.outbound.task.LoadTaskPort;
import clap.server.common.annotation.architecture.ApplicationService;
import clap.server.domain.model.member.Member;
import clap.server.domain.model.task.Task;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

@ApplicationService
Expand All @@ -25,13 +30,16 @@ class TaskBoardService implements TaskBoardUsecase {
TaskStatus.COMPLETED
);
private final MemberService memberService;
private final TaskService taskService;
private final LoadTaskPort loadTaskPort;
private final CommandTaskPort commandTaskPort;

@Transactional(readOnly = true)
@Override
public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pageable pageable) {
memberService.findById(processorId);
Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDate.plusDays(1).atStartOfDay(), pageable);
LocalDateTime untilDateTime = untilDate==null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay();
Slice<Task> tasks = loadTaskPort.findByProcessorAndStatus(processorId, VIEWABLE_STATUSES, untilDateTime, pageable);
return TaskMapper.toSliceTaskItemResponse(tasks);
}

Expand Down
Loading