CLAP-287 푸시 알림 활성화 초기값 false로 설정

src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskBoardResponse.java

@@ -4,7 +4,7 @@
 
 public record TaskBoardResponse(
         List<TaskItemResponse> tasksInProgress,
-        List<TaskItemResponse> tasksPendingComplete,
+        List<TaskItemResponse> tasksInReviewing,
         List<TaskItemResponse> tasksCompleted
 ){
 }

src/main/java/clap/server/adapter/inbound/web/dto/task/response/TeamStatusResponse.java

@@ -5,16 +5,16 @@
 public record TeamStatusResponse(
         List<TeamTaskResponse> members,
         int totalInProgressTaskCount,
-        int totalPendingTaskCount,
+        int totalInReviewingTaskCount,
         int totalTaskCount
 ) {
     // 기존 생성자 (3개 파라미터)
-    public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalPendingTaskCount) {
+    public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalInReviewingTaskCount) {
         this(
                 (members == null) ? List.of() : members,
                 totalInProgressTaskCount,
-                totalPendingTaskCount,
-                totalInProgressTaskCount + totalPendingTaskCount
+                totalInReviewingTaskCount,
+                totalInProgressTaskCount + totalInReviewingTaskCount
         );
     }
 

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<TeamTaskItemResponse> tasks
 ) {

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);

src/main/java/clap/server/adapter/inbound/web/task/TaskBoardController.java

@@ -47,7 +47,7 @@ public ResponseEntity<TaskBoardResponse> 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) {

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

@@ -89,7 +89,7 @@ public List<Member> findActiveManagers() {
 
     @Override
     public int getRemainingTasks(Long memberId) {
-        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
         return findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
     }
 

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("종료");
 

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<TeamTaskResponse> 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<TeamTaskResponse> 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,16 +127,16 @@ public List<TeamTaskResponse> 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(),
                             entry.getValue().get(0).getProcessor().getNickname(),
                             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
                     );

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

@@ -126,7 +126,7 @@ public static TaskBoardResponse toTaskBoardResponse(List<Task> 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())
         );
     }

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<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.PENDING_COMPLETED);
+        List<TaskStatus> targetStatuses = List.of(TaskStatus.IN_PROGRESS, TaskStatus.IN_REVIEWING);
         return loadMemberPort.findTasksByMemberIdAndStatus(memberId, targetStatuses).size();
     }
 

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)

src/main/java/clap/server/domain/policy/task/TaskPolicyConstants.java

@@ -11,13 +11,13 @@ public class TaskPolicyConstants {
 
     public static final List<TaskStatus> TASK_BOARD_STATUS_FILTER = List.of(
             TaskStatus.IN_PROGRESS,
-            TaskStatus.PENDING_COMPLETED,
+            TaskStatus.IN_REVIEWING,
             TaskStatus.COMPLETED);
 
     public static final List<TaskStatus> TASK_UPDATABLE_STATUS = List.of(
             TaskStatus.REQUESTED,
             TaskStatus.IN_PROGRESS,
-            TaskStatus.PENDING_COMPLETED,
+            TaskStatus.IN_REVIEWING,
             TaskStatus.COMPLETED
     );
 }

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;