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 1510fd62c4551445ae56d7fe8aebb3448a5a5f98..7365ebbad3c4554fd3f65b096e9665caec5d0037 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 @@ -8,6 +8,7 @@ import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import de.ozgcloud.alfa.AlfaSpringProperties; import de.ozgcloud.alfa.common.user.CurrentUserService; import de.ozgcloud.alfa.common.user.UserRole; import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus; @@ -17,7 +18,7 @@ class StatisticService { // TODO sebo: dieser Code wird später gelöscht static final String COUNT_WIEDERVORLAGE_NEXT_FRIST_KEY = "countWiedervorlage"; - static final String COUNT_WIEDERVORLAGE_NEXT_FRIST = COUNT_WIEDERVORLAGE_NEXT_FRIST_KEY + ":ClientAttribute.Goofy.nextWiedervorlageFrist"; + static final String COUNT_WIEDERVORLAGE_NEXT_FRIST_TEMPLATE = COUNT_WIEDERVORLAGE_NEXT_FRIST_KEY + ":ClientAttribute.%s.nextWiedervorlageFrist"; // END: code löschen static final List<VorgangStatus> VORGAENGE_STATUS_COUNT_VERWALTUNG_USER = List.of(VorgangStatus.NEU, VorgangStatus.ANGENOMMEN, @@ -31,6 +32,9 @@ class StatisticService { @Autowired private CurrentUserService currentUserService; + @Autowired + private AlfaSpringProperties alfaSpringProperties; + public Statistic getVorgaengeStatistic() { var response = remoteService.getVorgaengeStatistics(List.of(VorgangStatus.ZU_LOESCHEN)); return buildGetVorgaengeStatisticResult(response); @@ -81,7 +85,7 @@ class StatisticService { } List<String> createCountByPathList() { - return List.of(COUNT_WIEDERVORLAGE_NEXT_FRIST); + return List.of(String.format(COUNT_WIEDERVORLAGE_NEXT_FRIST_TEMPLATE, alfaSpringProperties.getApplicationName())); } Statistic buildStatistic(CountVorgangResponse response) { 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 12882febfa0e5a20c466e29a7e2894b861434fbc..be3d02bbab75aad2b9075e5c3800711c83461760 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 @@ -3,6 +3,7 @@ package de.ozgcloud.alfa.statistic; import static de.ozgcloud.alfa.statistic.StatisticRemoteService.*; import static de.ozgcloud.alfa.statistic.StatisticService.*; import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.util.Collections; @@ -18,6 +19,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; +import com.thedeanda.lorem.LoremIpsum; + +import de.ozgcloud.alfa.AlfaSpringProperties; import de.ozgcloud.alfa.common.user.CurrentUserService; import de.ozgcloud.alfa.common.user.UserRole; import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus; @@ -31,6 +35,8 @@ class StatisticServiceTest { private StatisticRemoteService remoteService; @Mock private CurrentUserService currentUserService; + @Mock + private AlfaSpringProperties alfaSpringProperties; @Nested class TestBuildGetVorgaengeStatisticResult { @@ -224,25 +230,28 @@ class StatisticServiceTest { } // TODO sebo: später löschen - @DisplayName("Get statistic") + @DisplayName("Count vorgang") @Nested - class TestGetStatistic { + class TestCountVorgang { private static final int WIEDERVORLAGE_COUNT = 8; private CountVorgangResponse response = CountVorgangResponseTestFactory.createBuilder() .pathCountResult(Map.of(StatisticService.COUNT_WIEDERVORLAGE_NEXT_FRIST_KEY, WIEDERVORLAGE_COUNT)).build(); + private final String applicationName = LoremIpsum.getInstance().getFirstName(); @Test void shouldCallRemoteService() { + when(alfaSpringProperties.getApplicationName()).thenReturn(applicationName); when(remoteService.countVorgang(any())).thenReturn(response); service.countVorgang(); - verify(remoteService).countVorgang(List.of(StatisticService.COUNT_WIEDERVORLAGE_NEXT_FRIST)); + verify(remoteService).countVorgang(List.of(String.format(StatisticService.COUNT_WIEDERVORLAGE_NEXT_FRIST_TEMPLATE, applicationName))); } @Test void shouldBuildStatistic() { + when(alfaSpringProperties.getApplicationName()).thenReturn(applicationName); when(remoteService.countVorgang(any())).thenReturn(response); service.countVorgang(); diff --git a/alfa-service/src/test/resources/application.yml b/alfa-service/src/test/resources/application.yml index 90b792d47554dae05fae77dd26ed00e58bf90ed2..7925f8d6a9baaab13a82ac25aadad73b0760a63b 100644 --- a/alfa-service/src/test/resources/application.yml +++ b/alfa-service/src/test/resources/application.yml @@ -23,7 +23,7 @@ spring: pathmatch: matching-strategy: ant-path-matcher application: - name: Goofy + name: Alfa jackson: deserialization: 'ADJUST_DATES_TO_CONTEXT_TIME_ZONE': false