Skip to content

Commit 2bcb8f0

Browse files
committed
CLAP-256 전체 작업수 계산 로직 개선
1 parent edca909 commit 2bcb8f0

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

src/main/java/clap/server/application/service/task/TeamStatusService.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,17 @@ public TeamStatusResponse getTeamStatus(Long memberId, FilterTeamStatusRequest f
3333
@Transactional(readOnly = true)
3434
public TeamStatusResponse filterTeamStatus(FilterTeamStatusRequest filter) {
3535
List<TeamTaskResponse> members = loadTaskPort.findTeamStatus(null, filter);
36+
3637
if (members == null) {
3738
members = List.of();
3839
}
39-
return new TeamStatusResponse(members);
40+
41+
// 전체 팀의 진행 중 & 검토 중 작업 수 계산
42+
int totalInProgressTaskCount = members.stream().mapToInt(TeamTaskResponse::inProgressTaskCount).sum();
43+
int totalInReviewingTaskCount = members.stream().mapToInt(TeamTaskResponse::inReviewingTaskCount).sum();
44+
45+
return new TeamStatusResponse(members, totalInProgressTaskCount, totalInReviewingTaskCount);
4046
}
4147

48+
4249
}

src/main/resources/env.properties

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
DATABASE_HOST=localhost
3+
DATABASE_PORT=3306
4+
DATABASE_NAME=taskflow
5+
DATABASE_USERNAME=root
6+
DATABASE_PASSWORD=km7971na
7+
8+
KAKAO_REGION=kr-central-2
9+
KAKAO_OBJECT_STORAGE_ENDPOINT=https://objectstorage.kr-central-2.kakaocloud.com
10+
KAKAO_OBJECT_STORAGE_ACCESS_KEY=253474a41cb447f4ad3c38e0ed9963c4
11+
KAKAO_OBJECT_STORAGE_SECRET_KEY=74861656e46845488ec4357f155fa3ed
12+
KAKAO_OBJECT_STORAGE_BUCKET_NAME=taskflow
13+
KAKAO_PROJECT_ID=34481374c1ee4bbb8745df43e4c13fff
14+
15+
16+
TASKFLOW_SERVICE_SERVER=210.109.59.9:9090
17+
18+
SWAGGER_SERVER_URL=http://210.109.59.9:9090
19+
20+
21+
KAKAOWORK_WEBHOOK_URL=https://api.kakaowork.com/v1/messages.send_by_email
22+
KAKAOWORK_WEBHOOK_AUTH=Bearer 1b01becc.a7f10da76d2e4038948771107cfe5c1d
23+
AGIT_WEBHOOK_URL=https://agit.io/webhook/a342181d-fb18-4eb0-a99a-30f4fb5b14b1
24+
MAIL_USERNAME=leegd120@gmail.com
25+
MAIL_PASSWORD=znlictzarqurxlla
26+
27+
JIRA_BASE_URL=https://gachon-clap.atlassian.net/
28+
JIRA_API_KEY=ATATT3xFfGF0Y1TU8ydsORKL7aKLur-FQ4xppSEWLlhMyZE4Jx1zGA-2kvcxDj-A1ahlFVrZ6fVTsqesUT7QZhEoaiyFiq48oQ-hGVoXe-oZxg3civZcxJ4JNDDOgv26IjBAP39VsX3CjF7gfptNGX-iHz5f5_AXs4vlLT4SaQY5XB-Yk66DH0A=11BEF509
29+
JIRA_USER_EMAIL=joowojr@gmail.com
30+
PAT_TOKEN=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
31+

0 commit comments

Comments
 (0)