From bfa821443ac7e7c8fb17a2acd4ac6b22c8f3bc45 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 21 Feb 2024 13:53:53 +0100
Subject: [PATCH] OZG-4994 OZG-5066 fix code after merge process
---
.../de/ozgcloud/alfa/statistic/StatisticMapper.java | 3 ---
.../alfa/statistic/StatisticRemoteService.java | 3 +--
.../alfa/statistic/StatisticRemoteServiceTest.java | 12 ++++++++++--
.../alfa/statistic/StatisticServiceTest.java | 2 --
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
index 874536f0bb..cb23df8599 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticMapper.java
@@ -6,9 +6,6 @@ import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
import org.mapstruct.ReportingPolicy;
-import de.ozgcloud.vorgang.statistic.GrpcByStatusResult;
-import de.ozgcloud.vorgang.statistic.GrpcPathCountResult;
-import de.ozgcloud.vorgang.statistic.GrpcVorgangCountResponse;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResult;
@Mapper(unmappedTargetPolicy = ReportingPolicy.WARN,
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
index 6feb647828..cd508d6198 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/StatisticRemoteService.java
@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.alfa.AlfaProperties;
import de.ozgcloud.alfa.common.GrpcUtil;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
-import de.ozgcloud.vorgang.statistic.GrpcVorgangCountRequest;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.GroupMethod;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.Operator;
@@ -68,7 +67,7 @@ class StatisticRemoteService {
GrpcVorgangStatisticQuery buildCountWiedervorlageNextFristQuery() {
return GrpcVorgangStatisticQuery.newBuilder()
.setResultName(COUNT_WIEDERVORLAGE_NEXT_FRIST_RESULT_NAME)
- .setPath(WIEDERVORLAGE_NEXT_FRIST_PATH)
+ .setPath(String.format(WIEDERVORLAGE_NEXT_FRIST_PATH_TEMPLATE, alfaProperties.getApplicationName()))
.setGroupMethod(GroupMethod.COUNT)
.setOperator(Operator.UNEQUAL)
.build();
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
index 2f43563a33..5716d65c21 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/statistic/StatisticRemoteServiceTest.java
@@ -9,6 +9,7 @@ import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -22,7 +23,7 @@ import com.thedeanda.lorem.LoremIpsum;
import de.ozgcloud.alfa.AlfaProperties;
import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus;
-import de.ozgcloud.vorgang.statistic.GrpcVorgangCountResponse;
+import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.GroupMethod;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticQuery.Operator;
import de.ozgcloud.vorgang.statistic.GrpcVorgangStatisticResponse;
@@ -105,6 +106,13 @@ class StatisticRemoteServiceTest {
@Nested
class TestBuildCountWiedervorlageNextFristQuery {
+ private final String applicationName = LoremIpsum.getInstance().getFirstName();
+
+ @BeforeEach
+ void init() {
+ when(alfaProperties.getApplicationName()).thenReturn(applicationName);
+ }
+
@Test
void shouldBuildQuery() {
var query = service.buildCountWiedervorlageNextFristQuery();
@@ -117,7 +125,7 @@ class StatisticRemoteServiceTest {
GrpcVorgangStatisticQuery::getGroupMethod)
.contains(
COUNT_WIEDERVORLAGE_NEXT_FRIST_RESULT_NAME,
- WIEDERVORLAGE_NEXT_FRIST_PATH,
+ String.format(StatisticRemoteService.WIEDERVORLAGE_NEXT_FRIST_PATH_TEMPLATE, applicationName),
Operator.UNEQUAL,
GroupMethod.COUNT
);
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 e50e3e397b..edb8c2f864 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
@@ -16,8 +16,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import com.thedeanda.lorem.LoremIpsum;
-
import de.ozgcloud.alfa.AlfaProperties;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserRole;
--
GitLab