Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

# Conflicts:
#	src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java

Author: hyoseong-Choi

.github/image/tf-erd.png

@@ -1,11 +1,7 @@
 package clap.server.adapter.inbound.web.dto.auth.response;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 public record LoginResponse(
         String accessToken,
-        String refreshToken,
-        @Schema(description = "회원 정보")
-        MemberInfoResponse memberInfo
+        String refreshToken
 ) {}
 

src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java

@@ -0,0 +1,10 @@
+package clap.server.adapter.inbound.web.dto.member.request;
+
+import clap.server.common.annotation.validation.password.ValidPassword;
+import jakarta.validation.constraints.NotBlank;
+
+public record UpdateInitialPasswordRequest(
+        @NotBlank @ValidPassword
+        String password
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateInitialPasswordRequest.java

@@ -0,0 +1,10 @@
+package clap.server.adapter.inbound.web.dto.member.request;
+
+import clap.server.common.annotation.validation.password.ValidPassword;
+import jakarta.validation.constraints.NotBlank;
+
+public record UpdatePasswordRequest(
+        @NotBlank @ValidPassword
+        String password
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdatePasswordRequest.java

@@ -24,9 +24,4 @@ public record FilterTeamStatusRequest(
                 taskTitle = taskTitle == null ? "" : taskTitle;
         }
 
-        // 카테고리 유효성 검사
-        public boolean isValid() {
-                // 1차 카테고리가 없으면 2차 카테고리는 선택할 수 없으므로
-                return mainCategoryIds.isEmpty() || !categoryIds.isEmpty();
-        }
 }

src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java

@@ -0,0 +1,11 @@
+package clap.server.adapter.inbound.web.dto.task.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record TerminateTaskRequest(
+        @Schema(description = "종료 사유")
+        @NotBlank
+        String reason
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/task/request/TerminateTaskRequest.java

@@ -2,6 +2,7 @@
 
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import clap.server.domain.model.task.Label;
 
 import java.time.LocalDateTime;
 

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

@@ -3,9 +3,23 @@
 import java.util.List;
 
 public record TeamStatusResponse(
-        List<TeamTaskResponse> members
+        List<TeamTaskResponse> members,
+        int totalInProgressTaskCount,
+        int totalPendingTaskCount,
+        int totalTaskCount
 ) {
+    // 기존 생성자 (3개 파라미터)
+    public TeamStatusResponse(List<TeamTaskResponse> members, int totalInProgressTaskCount, int totalPendingTaskCount) {
+        this(
+                (members == null) ? List.of() : members,
+                totalInProgressTaskCount,
+                totalPendingTaskCount,
+                totalInProgressTaskCount + totalPendingTaskCount
+        );
+    }
+
+    // 추가된 생성자 (List만 받음)
     public TeamStatusResponse(List<TeamTaskResponse> members) {
-        this.members = (members == null) ? List.of() : members;
+        this(members, 0, 0); // 기본값을 사용하여 생성
     }
 }

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

@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.web.dto.task.response;
 
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 import java.time.LocalDateTime;
@@ -10,11 +11,18 @@ public record TeamTaskItemResponse(
         String title,
         String mainCategoryName,
         String categoryName,
+        LabelInfo labelInfo,
         String requesterNickname,
         String requesterImageUrl,
         String requesterDepartment,
         long processorOrder,
         TaskStatus taskStatus,
         LocalDateTime createdAt
 ) {
-}
+    public static record LabelInfo(
+            String labelName,
+            LabelColor labelColor
+    ) {
+    }
+
+}

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

@@ -1,5 +1,6 @@
 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;