Skip to content

Commit 4b16029

Browse files
hyoseong-Choihyoseong-Choi
committed
CLAP-324 Fix : 통계 서비스 매퍼 수정으로 인한 버그 수정
<footer> - 관련: #405
1 parent 363a973 commit 4b16029

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

‎src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@Request
4040
return switch (statisticsType) {
4141
case REQUEST_BY_PERIOD ->
4242
ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType()));
43-
case PROCESS_BY_PERIOD -> ResponseEntity.ok(findTaskProcessUsecase
44-
.aggregatePeriodTaskProcess(periodType.getType()));
43+
case PROCESS_BY_PERIOD ->
44+
ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskProcess(periodType.getType()));
4545
case REQUEST_BY_CATEGORY ->
4646
ResponseEntity.ok(findTaskProcessUsecase.aggregateCategoryTaskRequest(periodType.getType()));
47-
case PROCESS_BY_MANAGER -> ResponseEntity.ok(findTaskProcessUsecase
48-
.aggregateManagerTaskProcess(periodType.getType()));
47+
case PROCESS_BY_MANAGER ->
48+
ResponseEntity.ok(findTaskProcessUsecase.aggregateManagerTaskProcess(periodType.getType()));
4949
default -> throw new StatisticsException(STATISTICS_BAD_REQUEST);
5050
};
5151
}

‎src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ public List<StatisticsResponse> aggregateManagerTaskProcess(String period) {
3131
@Override
3232
public List<StatisticsResponse> aggregatePeriodTaskProcess(String period) {
3333
if (period.equals("week") || period.equals("month")) {
34-
return StatisticsResponseMapper.toStatisticsResponse( taskStatisticsPolicy.formatDayStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period)));
34+
return StatisticsResponseMapper.toStatisticsResponse(taskStatisticsPolicy.formatStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period)));
3535
}
36-
return StatisticsResponseMapper.toStatisticsResponse(taskDocumentPort.findPeriodTaskProcessByPeriod(period));
36+
return StatisticsResponseMapper.toStatisticsResponse(taskStatisticsPolicy.formatDayStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period)));
3737
}
3838

3939
@Override
4040
public List<StatisticsResponse> aggregatePeriodTaskRequest(String period) {
4141
if (period.equals("week") || period.equals("month")) {
42-
return StatisticsResponseMapper.toStatisticsResponse(taskStatisticsPolicy.formatDayStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period)));
42+
return StatisticsResponseMapper.toStatisticsResponse(taskStatisticsPolicy.formatStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period)));
4343
}
44-
return StatisticsResponseMapper.toStatisticsResponse(taskDocumentPort.findPeriodTaskRequestByPeriod(period));
44+
return StatisticsResponseMapper.toStatisticsResponse(taskStatisticsPolicy.formatDayStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period)));
4545
}
4646
}

‎src/main/java/clap/server/domain/model/log/MemberLog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static MemberLog createMemberLog(HttpServletRequest request, int statusCo
2424
.statusCode(statusCode)
2525
.customStatusCode(customCode != null ? customCode : "")
2626
.requestBody(requestBody)
27-
.responseBody(responseBody != null ? responseBody.toString() : logStatus.getDescription() + " 실패")
27+
.responseBody(responseBody != null ? responseBody.toString() : logStatus.getDescription())
2828
.requestAt(LocalDateTime.now())
2929
.logStatus(logStatus)
3030
.member(member)

‎src/test/java/clap/server/application/statistics/FindTaskProcessServiceTest.java‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,64 @@ class FindTaskProcessServiceTest {
2828
@InjectMocks
2929
private FindTaskProcessService findTaskProcessService;
3030

31+
@Test
32+
@DisplayName("기간별 요청량")
33+
void aggregatePeriodTaskRequest() {
34+
//given
35+
Map<String, Long> statistics = new TreeMap<>();
36+
statistics.put("2025-02-03", 8L);
37+
statistics.put("2025-02-04", 7L);
38+
statistics.put("2025-02-05", 6L);
39+
40+
when(taskDocumentPort.findPeriodTaskRequestByPeriod(eq("week"))).thenReturn(statistics);
41+
42+
Map<String, Long> formattedStatistics = new TreeMap<>();
43+
formattedStatistics.put("2월 3일", 8L);
44+
formattedStatistics.put("2월 4일", 7L);
45+
formattedStatistics.put("2월 5일", 6L);
46+
when(taskStatisticsPolicy.formatStatistics(statistics)).thenReturn(formattedStatistics);
47+
48+
//when
49+
List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskRequest("week");
50+
51+
//then
52+
assertThat(week.get(0).key()).isEqualTo("2월 3일");
53+
assertThat(week.get(0).count()).isEqualTo(8L);
54+
assertThat(week.get(1).key()).isEqualTo("2월 4일");
55+
assertThat(week.get(1).count()).isEqualTo(7L);
56+
assertThat(week.get(2).key()).isEqualTo("2월 5일");
57+
assertThat(week.get(2).count()).isEqualTo(6L);
58+
}
59+
60+
@Test
61+
@DisplayName("기간별 처리량")
62+
void aggregatePeriodTaskProcess() {
63+
//given
64+
Map<String, Long> statistics = new TreeMap<>();
65+
statistics.put("2025-02-03", 8L);
66+
statistics.put("2025-02-04", 7L);
67+
statistics.put("2025-02-05", 6L);
68+
69+
when(taskDocumentPort.findPeriodTaskProcessByPeriod(eq("week"))).thenReturn(statistics);
70+
71+
Map<String, Long> formattedStatistics = new TreeMap<>();
72+
formattedStatistics.put("2월 3일", 8L);
73+
formattedStatistics.put("2월 4일", 7L);
74+
formattedStatistics.put("2월 5일", 6L);
75+
when(taskStatisticsPolicy.formatStatistics(statistics)).thenReturn(formattedStatistics);
76+
77+
//when
78+
List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskProcess("week");
79+
80+
//then
81+
assertThat(week.get(0).key()).isEqualTo("2월 3일");
82+
assertThat(week.get(0).count()).isEqualTo(8L);
83+
assertThat(week.get(1).key()).isEqualTo("2월 4일");
84+
assertThat(week.get(1).count()).isEqualTo(7L);
85+
assertThat(week.get(2).key()).isEqualTo("2월 5일");
86+
assertThat(week.get(2).count()).isEqualTo(6L);
87+
}
88+
3189
@Test
3290
@DisplayName("카테고리별 요청량")
3391
void aggregateCategoryTaskRequest() {
@@ -73,62 +131,4 @@ void aggregateManagerTaskProcess() {
73131
assertThat(week.get(2).key()).isEqualTo("tony.tsx");
74132
assertThat(week.get(2).count()).isEqualTo(7L);
75133
}
76-
77-
@Test
78-
@DisplayName("기간별 처리량")
79-
void aggregatePeriodTaskProcess() {
80-
//given
81-
Map<String, Long> statistics = new TreeMap<>();
82-
statistics.put("2025-02-01", 8L);
83-
statistics.put("2025-01-30", 7L);
84-
statistics.put("2025-01-31", 6L);
85-
86-
when(taskDocumentPort.findPeriodTaskProcessByPeriod(eq("week"))).thenReturn(statistics);
87-
88-
Map<String, Long> formattedStatistics = new TreeMap<>();
89-
formattedStatistics.put("2월 1일", 8L);
90-
formattedStatistics.put("1월 30일", 7L);
91-
formattedStatistics.put("1월 31일", 6L);
92-
when(taskStatisticsPolicy.formatStatistics(statistics)).thenReturn(formattedStatistics);
93-
94-
//when
95-
List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskProcess("week");
96-
97-
//then
98-
assertThat(week.get(0).key()).isEqualTo("1월 30일");
99-
assertThat(week.get(0).count()).isEqualTo(7L);
100-
assertThat(week.get(1).key()).isEqualTo("1월 31일");
101-
assertThat(week.get(1).count()).isEqualTo(6L);
102-
assertThat(week.get(2).key()).isEqualTo("2월 1일");
103-
assertThat(week.get(2).count()).isEqualTo(8L);
104-
}
105-
106-
@Test
107-
@DisplayName("기간별 요청량")
108-
void aggregatePeriodTaskRequest() {
109-
//given
110-
Map<String, Long> statistics = new TreeMap<>();
111-
statistics.put("2025-02-01", 8L);
112-
statistics.put("2025-01-30", 7L);
113-
statistics.put("2025-01-31", 6L);
114-
115-
when(taskDocumentPort.findPeriodTaskRequestByPeriod(eq("week"))).thenReturn(statistics);
116-
117-
Map<String, Long> formattedStatistics = new TreeMap<>();
118-
formattedStatistics.put("2월 1일", 8L);
119-
formattedStatistics.put("1월 30일", 7L);
120-
formattedStatistics.put("1월 31일", 6L);
121-
when(taskStatisticsPolicy.formatStatistics(statistics)).thenReturn(formattedStatistics);
122-
123-
//when
124-
List<StatisticsResponse> week = findTaskProcessService.aggregatePeriodTaskRequest("week");
125-
126-
//then
127-
assertThat(week.get(0).key()).isEqualTo("1월 30일");
128-
assertThat(week.get(0).count()).isEqualTo(7L);
129-
assertThat(week.get(1).key()).isEqualTo("1월 31일");
130-
assertThat(week.get(1).count()).isEqualTo(6L);
131-
assertThat(week.get(2).key()).isEqualTo("2월 1일");
132-
assertThat(week.get(2).count()).isEqualTo(8L);
133-
}
134134
}

0 commit comments

Comments
 (0)