OZG-4994 OZG-5066 fix code after merge process

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,

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();

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
 					);

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;