diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java index f1953e11..a167cb67 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java @@ -4,7 +4,7 @@ public record TaskBoardResponse( List tasksInProgress, - List tasksPendingComplete, + List tasksInReviewing, List tasksCompleted ){ } diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java index 95e9be15..0f33fe23 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java @@ -5,16 +5,16 @@ public record TeamStatusResponse( List members, int totalInProgressTaskCount, - int totalPendingTaskCount, + int totalInReviewingTaskCount, int totalTaskCount ) { // 기존 생성자 (3개 파라미터) - public TeamStatusResponse(List members, int totalInProgressTaskCount, int totalPendingTaskCount) { + public TeamStatusResponse(List members, int totalInProgressTaskCount, int totalInReviewingTaskCount) { this( (members == null) ? List.of() : members, totalInProgressTaskCount, - totalPendingTaskCount, - totalInProgressTaskCount + totalPendingTaskCount + totalInReviewingTaskCount, + totalInProgressTaskCount + totalInReviewingTaskCount ); } diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java index b8a9019c..3d6526fc 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamTaskResponse.java @@ -1,6 +1,5 @@ package clap.server.adapter.inbound.web.dto.task.response; -import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import com.querydsl.core.annotations.QueryProjection; import java.util.List; @@ -11,7 +10,7 @@ public record TeamTaskResponse( String imageUrl, String department, int inProgressTaskCount, - int pendingTaskCount, + int inReviewingTaskCount, int totalTaskCount, List tasks ) { diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java index ea6afd71..4755e380 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java @@ -43,7 +43,7 @@ public void updateTaskState( @PathVariable @NotNull Long taskId, @AuthenticationPrincipal SecurityUserDetails userInfo, @Parameter(description = "변경하고 싶은 작업 상태", - schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"})) + schema = @Schema(allowableValues = {"IN_PROGRESS", "IN_REVIEWING", "COMPLETED"})) @RequestBody TaskStatus taskStatus) { updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, taskStatus); diff --git a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java index 44570e00..ee7ed370 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java @@ -47,7 +47,7 @@ public ResponseEntity getTaskBoard( @Secured({"ROLE_MANAGER"}) @PatchMapping public void updateTaskBoard(@Parameter(description = "전환될 작업의 상태, 상태 전환이 아니라면 입력 X", - schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"})) + schema = @Schema(allowableValues = {"IN_PROGRESS", "IN_REVIEWING", "COMPLETED"})) @RequestParam(required = false) TaskStatus status, @RequestBody UpdateTaskOrderRequest request, @AuthenticationPrincipal SecurityUserDetails userInfo) { diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java index 8d04e98f..604809ec 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java @@ -89,7 +89,7 @@ public List findActiveManagers() { @Override public int getRemainingTasks(Long memberId) { - List targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED); + List targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING); return findTasksByMemberIdAndStatus(memberId, targetStatuses).size(); } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java index c2990dfd..297909a7 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskStatus.java @@ -8,7 +8,7 @@ public enum TaskStatus { REQUESTED("요청"), IN_PROGRESS("진행 중"), - PENDING_COMPLETED("완료 대기"), + IN_REVIEWING("완료 대기"), COMPLETED("완료"), TERMINATED("종료"); diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java index 48e6af25..88e2bd82 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java @@ -5,8 +5,6 @@ import clap.server.adapter.inbound.web.dto.task.request.FilterTeamStatusRequest; import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse; import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse; -import clap.server.adapter.inbound.web.dto.task.response.TeamTaskItemResponse; -import clap.server.adapter.inbound.web.dto.task.response.TeamTaskResponse; import clap.server.adapter.outbound.persistense.entity.task.TaskEntity; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import com.querydsl.core.BooleanBuilder; @@ -64,7 +62,7 @@ public List findTeamStatus(Long memberId, FilterTeamStatusRequ // 필터가 null인 경우, 기본적으로 모든 데이터 조회 if (filter != null) { // 진행 중 또는 완료 대기 상태 필터링 - builder.and(taskEntity.taskStatus.in(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED)); + builder.and(taskEntity.taskStatus.in(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING)); // 담당자 ID 필터링 if (memberId != null) { @@ -91,7 +89,7 @@ public List findTeamStatus(Long memberId, FilterTeamStatusRequ OrderSpecifier orderBy = "기여도순".equals(filter != null ? filter.sortBy() : "") ? new CaseBuilder() .when(taskEntity.taskStatus.eq(TaskStatus.IN_PROGRESS) - .or(taskEntity.taskStatus.eq(TaskStatus.PENDING_COMPLETED))) + .or(taskEntity.taskStatus.eq(TaskStatus.IN_REVIEWING))) .then(1) .otherwise(0) .desc() @@ -129,8 +127,8 @@ public List findTeamStatus(Long memberId, FilterTeamStatusRequ )).collect(Collectors.toList()); int inProgressTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(); - int pendingTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count(); - int totalTaskCount = inProgressTaskCount + pendingTaskCount; + int inReviewingTaskCount = (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_REVIEWING).count(); + int totalTaskCount = inProgressTaskCount + inReviewingTaskCount; return new TeamTaskResponse( entry.getKey(), @@ -138,7 +136,7 @@ public List findTeamStatus(Long memberId, FilterTeamStatusRequ entry.getValue().get(0).getProcessor().getImageUrl(), entry.getValue().get(0).getProcessor().getDepartment().getName(), (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_PROGRESS).count(), - (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.PENDING_COMPLETED).count(), + (int) entry.getValue().stream().filter(t -> t.getTaskStatus() == TaskStatus.IN_REVIEWING).count(), entry.getValue().size(), taskResponses ); diff --git a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java index 5c672e59..84379ddf 100644 --- a/src/main/java/clap/server/application/mapper/TaskResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java @@ -126,7 +126,7 @@ public static TaskBoardResponse toTaskBoardResponse(List tasks) { return new TaskBoardResponse( tasksByStatus.getOrDefault(TaskStatus.IN_PROGRESS, Collections.emptyList()), - tasksByStatus.getOrDefault(TaskStatus.PENDING_COMPLETED, Collections.emptyList()), + tasksByStatus.getOrDefault(TaskStatus.IN_REVIEWING, Collections.emptyList()), tasksByStatus.getOrDefault(TaskStatus.COMPLETED, Collections.emptyList()) ); } diff --git a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java index 27f44000..5af84887 100644 --- a/src/main/java/clap/server/application/port/inbound/domain/MemberService.java +++ b/src/main/java/clap/server/application/port/inbound/domain/MemberService.java @@ -26,7 +26,7 @@ public Member findActiveMember(Long memberId) { } public int getRemainingTasks(Long memberId) { - List targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED); + List targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING); return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size(); } diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java index 13b51b22..35b77786 100644 --- a/src/main/java/clap/server/domain/model/member/Member.java +++ b/src/main/java/clap/server/domain/model/member/Member.java @@ -43,9 +43,9 @@ public Member(MemberInfo memberInfo, Boolean agitNotificationEnabled, Boolean em public static Member createMember(Member admin, MemberInfo memberInfo) { return Member.builder() .memberInfo(memberInfo) - .agitNotificationEnabled(null) - .emailNotificationEnabled(null) - .kakaoworkNotificationEnabled(null) + .agitNotificationEnabled(false) + .emailNotificationEnabled(false) + .kakaoworkNotificationEnabled(false) .admin(admin) .imageUrl(null) .status(MemberStatus.PENDING) diff --git a/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java b/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java index 5bd33802..0efbdd4f 100644 --- a/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java +++ b/src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java @@ -11,13 +11,13 @@ public class TaskPolicyConstants { public static final List TASK_BOARD_STATUS_FILTER = List.of( TaskStatus.IN_PROGRESS, - TaskStatus.PENDING_COMPLETED, + TaskStatus.IN_REVIEWING, TaskStatus.COMPLETED); public static final List TASK_UPDATABLE_STATUS = List.of( TaskStatus.REQUESTED, TaskStatus.IN_PROGRESS, - TaskStatus.PENDING_COMPLETED, + TaskStatus.IN_REVIEWING, TaskStatus.COMPLETED ); } \ No newline at end of file diff --git a/src/main/resources/db/migration/dev/V20250205287__Modify_Task_Status_From_Task.sql b/src/main/resources/db/migration/dev/V20250205287__Modify_Task_Status_From_Task.sql new file mode 100644 index 00000000..9144e933 --- /dev/null +++ b/src/main/resources/db/migration/dev/V20250205287__Modify_Task_Status_From_Task.sql @@ -0,0 +1,2 @@ +alter table task + modify task_status enum ('COMPLETED', 'IN_PROGRESS', 'IN_REVIEWING', 'REQUESTED', 'TERMINATED') not null; \ No newline at end of file