Skip to content

Commit 1722873

Browse files
committed
CLAP-441 Refactor: 회원의 잔여 작업을 계산하는 메서드 추가
#578
1 parent 9184b45 commit 1722873

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/main/java/clap/server/application/mapper/response/MemberResponseMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ public static MemberDetailsResponse toMemberDetailsResponse(Member member) {
6464
member.getMemberInfo().getDepartment().getDepartmentId(),
6565
member.getMemberInfo().getDepartment().getName(),
6666
member.getMemberInfo().getDepartmentRole(),
67-
member.getStatus().equals(MemberStatus.PENDING) || member.getStatus().equals(MemberStatus.APPROVAL_REQUEST) ? null:
68-
member.getInProgressTaskCount() + member.getInReviewingTaskCount()
67+
member.getRemainingTasks()
6968
);
7069
}
7170

src/main/java/clap/server/domain/model/member/Member.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,12 @@ public void decrementInProgressTaskCount() {
123123
public void decrementInReviewingTaskCount() {
124124
this.inReviewingTaskCount--;
125125
}
126+
127+
public Integer getRemainingTasks(){
128+
// 최종 회원 등록 전의 경우
129+
if(this.getStatus().equals(MemberStatus.PENDING) || this.getStatus().equals(MemberStatus.APPROVAL_REQUEST)){
130+
return null;
131+
}
132+
else return this.getInProgressTaskCount() + this.getInReviewingTaskCount();
133+
}
126134
}

0 commit comments

Comments
 (0)