diff --git a/monicar-control-center/src/main/java/org/controlcenter/alarm/application/AlarmService.java b/monicar-control-center/src/main/java/org/controlcenter/alarm/application/AlarmService.java index 87d62ef..b0d866f 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/alarm/application/AlarmService.java +++ b/monicar-control-center/src/main/java/org/controlcenter/alarm/application/AlarmService.java @@ -157,19 +157,6 @@ public void sendAll(SendAlarm sendAlarm) { public List getAlarmStatusCounts() { List rawData = alarmJpaRepository.findStatusCounts(); return rawData.stream() - .map(arr -> new AlarmStatusStatsResponse( - convertToKoreanName(arr.getName()), - arr.getCount() - )).toList(); - } - - // AlarmStatus -> 한글명 맵핑 - private String convertToKoreanName(AlarmStatus status) { - return switch (status) { - case REQUIRED -> "점검요구"; - case SCHEDULED -> "점검예정"; - case INPROGRESS -> "점검진행중"; - case COMPLETED -> "점검완료"; - }; + .map(AlarmStatusStatsResponse::from).toList(); } } diff --git a/monicar-control-center/src/main/java/org/controlcenter/alarm/domain/AlarmStatusStats.java b/monicar-control-center/src/main/java/org/controlcenter/alarm/domain/AlarmStatusStats.java index 4a3fa42..c7fb036 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/alarm/domain/AlarmStatusStats.java +++ b/monicar-control-center/src/main/java/org/controlcenter/alarm/domain/AlarmStatusStats.java @@ -6,6 +6,6 @@ @Getter @AllArgsConstructor public class AlarmStatusStats { - private AlarmStatus name; // "점검요구", "점검예정", ... + private AlarmStatus status; private long count; } diff --git a/monicar-control-center/src/main/java/org/controlcenter/alarm/presentation/dto/AlarmStatusStatsResponse.java b/monicar-control-center/src/main/java/org/controlcenter/alarm/presentation/dto/AlarmStatusStatsResponse.java index cb3e556..cb86601 100644 --- a/monicar-control-center/src/main/java/org/controlcenter/alarm/presentation/dto/AlarmStatusStatsResponse.java +++ b/monicar-control-center/src/main/java/org/controlcenter/alarm/presentation/dto/AlarmStatusStatsResponse.java @@ -1,17 +1,18 @@ package org.controlcenter.alarm.presentation.dto; +import org.controlcenter.alarm.domain.AlarmStatus; import org.controlcenter.alarm.domain.AlarmStatusStats; import lombok.Builder; @Builder public record AlarmStatusStatsResponse( - String name, + AlarmStatus status, long count ) { public static AlarmStatusStatsResponse from(AlarmStatusStats alarmStatusStats) { return AlarmStatusStatsResponse.builder() - .name(String.valueOf(alarmStatusStats.getName())) + .status(alarmStatusStats.getStatus()) .count(alarmStatusStats.getCount()) .build(); }