Skip to content

CLAP-266 작업보드 수정 api 잘못된 request 매핑 오류 수정 #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joowojr merged 2 commits into from
Feb 4, 2025
Merged

CLAP-266 작업보드 수정 api 잘못된 request 매핑 오류 수정 #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
756fa3f
CLAP-266 Fix: 컴파일 오류 수정
joowojr Feb 4, 2025
fe31d10
CLAP-266 Fix: 잘못 매핑된 오류 수정
joowojr Feb 4, 2025
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
1 change: 1 addition & 0 deletions src/main/java/clap/server/application/mapper/NotificationMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public static FindNotificationListResponse toFindNoticeListResponse(Notification
notification.getReceiver().getMemberId(),
notification.getTask().getTitle(),
notification.getMessage() != null ? notification.getMessage() : null,
notification.isRead(),
notification.getCreatedAt()
);
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
import clap.server.application.port.outbound.task.LoadTaskPort;
import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
import clap.server.domain.policy.task.ProcessorValidationPolicy;
import clap.server.common.annotation.architecture.ApplicationService;
import clap.server.domain.model.member.Member;
import clap.server.domain.model.task.Task;
import clap.server.domain.policy.task.ProcessorValidationPolicy;
import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
import clap.server.domain.policy.task.TaskPolicyConstants;
import clap.server.exception.ApplicationException;
import clap.server.exception.code.TaskErrorCode;
Expand Down Expand Up @@ -51,15 +51,15 @@ public void updateTaskOrder(Long processorId, UpdateTaskOrderRequest request) {

// 가장 상위로 이동
if (request.prevTaskId() == 0) {
Task nextTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
Task nextTask = findByIdAndStatus(request.nextTaskId(), targetTask.getTaskStatus());
// 해당 상태에서 바로 앞에 있는 작업 찾기
Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), nextTask.getProcessorOrder()).orElse(null);
long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(targetTask, nextTask);
updateNewTaskOrder(targetTask, newOrder);
}
// 가장 하위로 이동
else if (request.nextTaskId() == 0) {
Task prevTask = findByIdAndStatus(request.targetTaskId(), targetTask.getTaskStatus());
Task prevTask = findByIdAndStatus(request.prevTaskId(), targetTask.getTaskStatus());
// 해당 상태에서 바로 뒤에 있는 작업 찾기
Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetTask.getTaskStatus(), prevTask.getProcessorOrder()).orElse(null);
long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
Expand Down Expand Up @@ -99,13 +99,13 @@ public void updateTaskOrderAndStatus(Long processorId, UpdateTaskOrderRequest re
processorValidationPolicy.validateProcessor(processorId, targetTask);

if (request.prevTaskId() == 0) {
Task nextTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
Task nextTask = findByIdAndStatus(request.nextTaskId(), targetStatus);
// 해당 상태에서 바로 앞 있는 작업 찾기
Task prevTask = loadTaskPort.findPrevOrderTaskByProcessorIdAndStatus(processorId, targetStatus, nextTask.getProcessorOrder()).orElse(null);
long newOrder = taskOrderCalculationPolicy.calculateOrderForTop(prevTask,nextTask);
updateNewTaskOrderAndStatus(targetStatus, targetTask, newOrder);
} else if (request.nextTaskId() == 0) {
Task prevTask = findByIdAndStatus(request.targetTaskId(), targetStatus);
Task prevTask = findByIdAndStatus(request.prevTaskId(), targetStatus);
// 해당 상태에서 바로 뒤에 있는 작업 찾기
Task nextTask = loadTaskPort.findNextOrderTaskByProcessorIdAndStatus(processorId, targetStatus, prevTask.getProcessorOrder()).orElse(null);
long newOrder = taskOrderCalculationPolicy.calculateOrderForBottom(prevTask, nextTask);
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/clap/server/domain/policy/task/TaskOrderCalculationPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,16 @@ public class TaskOrderCalculationPolicy {

public long calculateOrderForTop(Task prevTask, Task nextTask) {
Long prevTaskOrder = prevTask == null ? null : prevTask.getProcessorOrder();
if (prevTaskOrder == null){
if (prevTaskOrder == null) {
return nextTask.getProcessorOrder() - DEFAULT_PROCESSOR_ORDER_GAP;
}
return calculateNewProcessorOrder(prevTaskOrder, nextTask.getProcessorOrder());
} else return calculateNewProcessorOrder(prevTaskOrder, nextTask.getProcessorOrder());
}

public long calculateOrderForBottom(Task prevTask, Task nextTask) {
Long nextTaskOrder = nextTask == null ? null : nextTask.getProcessorOrder();
if (nextTaskOrder == null){
if (nextTaskOrder == null) {
return prevTask.getProcessorOrder() + DEFAULT_PROCESSOR_ORDER_GAP;
}
return calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTaskOrder);
} else return calculateNewProcessorOrder(prevTask.getProcessorOrder(), nextTaskOrder);
}

public long calculateNewProcessorOrder(Long prevTaskOrder, Long nextTaskOrder) {
Expand Down