From f44c4bc584562c148491fa4354dd7242e2b51cec Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 21 Feb 2024 18:08:41 +0100
Subject: [PATCH] OZG-4994 OZG-5066 rename constants
---
.../de/ozgcloud/alfa/statistic/StatisticService.java | 12 ++++++------
.../alfa/statistic/StatisticServiceTest.java | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
index cc5597906f..44c747d045 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticService.java
@@ -16,10 +16,10 @@ import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
@Service
class StatisticService {
- static final List<VorgangStatus> VORGAENGE_STATUS_COUNT_VERWALTUNG_USER = List.of(VorgangStatus.NEU, VorgangStatus.ANGENOMMEN,
+ static final List<VorgangStatus> COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER = List.of(VorgangStatus.NEU, VorgangStatus.ANGENOMMEN,
VorgangStatus.IN_BEARBEITUNG, VorgangStatus.BESCHIEDEN, VorgangStatus.ABGESCHLOSSEN, VorgangStatus.VERWORFEN, VorgangStatus.ZU_LOESCHEN);
- static final List<VorgangStatus> VORGAENGE_STATUS_COUNT_POSTSTELLE_USER = Collections.emptyList();
- static final List<VorgangStatus> VORGAENGE_STATUS_COUNT_EINHEITLICHER_ANSPRECHPARTNER = Collections.emptyList();
+ static final List<VorgangStatus> COUNT_BY_VORGANG_STATUS_POSTSTELLE_USER = Collections.emptyList();
+ static final List<VorgangStatus> COUNT_BY_VORGANG_EINHEITLICHER_ANSPRECHPARTNER = Collections.emptyList();
@Autowired
private StatisticRemoteService remoteService;
@@ -37,13 +37,13 @@ class StatisticService {
List<VorgangStatus> getCountByVorgangStatusList() {
if (currentUserService.hasRole(UserRole.VERWALTUNG_USER)) {
- return VORGAENGE_STATUS_COUNT_VERWALTUNG_USER;
+ return COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER;
}
if (currentUserService.hasRole(UserRole.VERWALTUNG_POSTSTELLE)) {
- return VORGAENGE_STATUS_COUNT_POSTSTELLE_USER;
+ return COUNT_BY_VORGANG_STATUS_POSTSTELLE_USER;
}
if (currentUserService.hasRole(UserRole.EINHEITLICHER_ANSPRECHPARTNER)) {
- return VORGAENGE_STATUS_COUNT_EINHEITLICHER_ANSPRECHPARTNER;
+ return COUNT_BY_VORGANG_EINHEITLICHER_ANSPRECHPARTNER;
}
return Collections.emptyList();
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
index edb8c2f864..a33db5f81c 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticServiceTest.java
@@ -152,7 +152,7 @@ class StatisticServiceTest {
var result = service.getCountByVorgangStatusList();
- assertThat(result).containsAll(VORGAENGE_STATUS_COUNT_VERWALTUNG_USER);
+ assertThat(result).containsAll(COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER);
}
@Test
@@ -162,7 +162,7 @@ class StatisticServiceTest {
var result = service.getCountByVorgangStatusList();
- assertThat(result).containsAll(VORGAENGE_STATUS_COUNT_POSTSTELLE_USER);
+ assertThat(result).containsAll(COUNT_BY_VORGANG_STATUS_POSTSTELLE_USER);
}
@Test
@@ -173,7 +173,7 @@ class StatisticServiceTest {
var result = service.getCountByVorgangStatusList();
- assertThat(result).containsAll(VORGAENGE_STATUS_COUNT_EINHEITLICHER_ANSPRECHPARTNER);
+ assertThat(result).containsAll(COUNT_BY_VORGANG_EINHEITLICHER_ANSPRECHPARTNER);
}
@Test
@@ -194,20 +194,20 @@ class StatisticServiceTest {
@BeforeEach
void beforeEach() {
when(remoteService.buildCountByStatusResultName(any())).thenCallRealMethod();
- doReturn(VORGAENGE_STATUS_COUNT_VERWALTUNG_USER).when(service).getCountByVorgangStatusList();
+ doReturn(COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER).when(service).getCountByVorgangStatusList();
}
@Test
void shouldCallRemoteService() {
service.getVorgaengeStatistic();
- verify(remoteService).getVorgaengeStatistics(VORGAENGE_STATUS_COUNT_VERWALTUNG_USER);
+ verify(remoteService).getVorgaengeStatistics(COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER);
}
@Test
void shouldBuildResult() {
var response = Map.of(COUNT_WIEDERVORLAGE_NEXT_FRIST_RESULT_NAME, StatisticResultTestFactory.create());
- when(remoteService.getVorgaengeStatistics(VORGAENGE_STATUS_COUNT_VERWALTUNG_USER)).thenReturn(response);
+ when(remoteService.getVorgaengeStatistics(COUNT_BY_VORGANG_STATUS_VERWALTUNG_USER)).thenReturn(response);
service.getVorgaengeStatistic();
--
GitLab