Skip to content

Commit 5554aab

Browse files
committed
CLAP-120 Fix: 전체요청 조회시 processor null일 경우 에러 수정
1 parent 96d82ca commit 5554aab

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private Page<TaskEntity> getTasksPage(Pageable pageable, BooleanBuilder whereCla
9999
private OrderSpecifier<?> getOrderSpecifier(String sortBy, String sortDirection) {
100100
DateTimePath<LocalDateTime> sortColumn = switch (sortBy) {
101101
case "REQUESTED_AT" -> taskEntity.updatedAt;
102-
case "FINISHED_AT" -> taskEntity.completedAt;
102+
case "FINISHED_AT" -> taskEntity.finishedAt;
103103
default -> taskEntity.updatedAt;
104104
};
105105
return "ASC".equalsIgnoreCase(sortDirection)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ List<TaskEntity> findYesterdayTaskByUpdatedAtIsBetween(
2828
@Query("SELECT t FROM TaskEntity t " +
2929
"WHERE t.processor.memberId = :processorId " +
3030
"AND t.taskStatus IN :taskStatus " +
31-
"AND (t.taskStatus != 'COMPLETED' OR t.completedAt >= :untilDate)")
31+
"AND (t.taskStatus != 'COMPLETED' OR t.finishedAt >= :untilDate)")
3232
Slice<TaskEntity> findTasksWithTaskStatusAndCompletedAt(
3333
@Param("processorId") Long processorId,
3434
@Param("taskStatus") List<TaskStatus> taskStatus,

src/main/java/clap/server/application/mapper/TaskMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static FilterAllTasksResponse toFilterAllTasksResponse(Task task) {
103103
task.getCategory().getName(),
104104
task.getTitle(),
105105
task.getRequester().getMemberInfo().getNickname(),
106-
task.getProcessor().getMemberInfo().getNickname(),
106+
task.getProcessor() != null ? task.getProcessor().getMemberInfo().getNickname() : "",
107107
task.getTaskStatus(),
108108
task.getFinishedAt() != null ? task.getFinishedAt() : null
109109
);

src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
44
import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse;
55
import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
6-
import clap.server.adapter.inbound.web.dto.task.FilterTaskListResponse;
76
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
87
import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse;
9-
import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse;
108
import clap.server.domain.model.task.Task;
119
import org.springframework.data.domain.Page;
1210
import org.springframework.data.domain.Pageable;

0 commit comments

Comments
 (0)