CLAP-432 Feat: 회원 정보 조회시 잔여 작업수 필드 추가

<footer> - #565
TaskFlow-CLAP · Feb 14, 2025 · f29d239 · f29d239
1 parent 4c51939
commit f29d239
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/MemberDetailsResponse.java
@@ -21,6 +21,8 @@ public record MemberDetailsResponse(
         @Schema(description = "부서")
         String departmentName,
         @Schema(description = "직무")
-        String departmentRole
+        String departmentRole,
+        @Schema(description = "잔여 작업, 등록이 되지 않은 회원은 Null로 출력됩니다.")
+        Integer remainingTasks
 ) {}
 
diff --git a/...in/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java b/...in/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java
@@ -20,7 +20,9 @@ public record MemberDetailInfoResponse(
         @Schema(description = "직책")
         String departmentRole,
         @Schema(description = "알림 수신 여부")
-        NotificationSettingInfoResponse notificationSettingInfo
+        NotificationSettingInfoResponse notificationSettingInfo,
+        @Schema(description = "진행/검토 작업 수, 담당자가 아닐 경우에는 null입니다.")
+        MemberRemainingTaskCountsResponse remainingTaskCounts
 ) {
     public static record NotificationSettingInfoResponse(
             @Schema(description = "이메일 알림 수신 여부")
@@ -29,6 +31,14 @@ public static record NotificationSettingInfoResponse(
             boolean kakaoWork
     ) {
     }
+
+    public static record MemberRemainingTaskCountsResponse(
+            @Schema(description = "진행중 작업 수")
+            int totalInProgressTaskCount,
+            @Schema(description = "검토중 작업 수")
+            int totalInReviewingTaskCount
+    ) {
+    }
 }
 
 

diff --git a/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java b/src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java
@@ -4,6 +4,7 @@
 import clap.server.adapter.inbound.web.dto.admin.response.MemberDetailsResponse;
 import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse;
 import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.member.MemberInfo;
 
@@ -32,7 +33,15 @@ public static MemberDetailInfoResponse toMemberDetailInfoResponse(Member member)
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartment().getName(),
                 member.getMemberInfo().getDepartmentRole(),
-                toNotificationSettingInfoResponse(member)
+                toNotificationSettingInfoResponse(member),
+                member.getMemberInfo().getRole()!= MemberRole.ROLE_MANAGER ? null : toMemberRemainingTaskCountsResponse(member)
+        );
+    }
+
+    public static MemberDetailInfoResponse.MemberRemainingTaskCountsResponse toMemberRemainingTaskCountsResponse(Member member){
+        return new MemberDetailInfoResponse.MemberRemainingTaskCountsResponse(
+                member.getInProgressTaskCount(),
+                member.getInReviewingTaskCount()
         );
     }
 
@@ -54,7 +63,8 @@ public static MemberDetailsResponse toMemberDetailsResponse(Member member) {
                 member.getMemberInfo().getRole(),
                 member.getMemberInfo().getDepartment().getDepartmentId(),
                 member.getMemberInfo().getDepartment().getName(),
-                member.getMemberInfo().getDepartmentRole()
+                member.getMemberInfo().getDepartmentRole(),
+                member.getInProgressTaskCount() + member.getInReviewingTaskCount()
         );
     }