From 089b1006720de8764ac604cd6aa3e1a2fea3f706 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 21 Feb 2024 22:26:07 +0100
Subject: [PATCH] OZG-4994 OZG-5061 rename
---
.../de/ozgcloud/alfa/statistic/Statistic.java | 2 +-
.../statistic/StatisticRemoteService.java | 12 +++++-----
.../alfa/statistic/StatisticService.java | 2 +-
.../statistic/StatisticRemoteServiceTest.java | 22 +++++++++----------
.../alfa/statistic/StatisticServiceTest.java | 6 ++---
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
index 7c043bc059..855d2ef1c5 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/statistic/Statistic.java
@@ -12,5 +12,5 @@ public class Statistic {
private ByStatus byStatus;
private int wiedervorlagen;
private boolean existsWiedervorlageOverdue;
- private int unreadMessages;
+ private int ungeleseneNachrichten;
}
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 95b0494fd7..1dfefe1f5a 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
@@ -25,11 +25,11 @@ class StatisticRemoteService {
static final String COUNT_VORGANG_STATUS_RESULT_NAME_FORMAT = "countVorgangStatus_%s";
static final String COUNT_WIEDERVORLAGE_NEXT_FRIST_RESULT_NAME = "countWiedervorlage";
static final String EXISTS_WIEDERVORLAGE_OVERDUE_RESULT_NAME = "existsWiedervorlageOverdue";
- static final String COUNT_VORGAENGE_WITH_UNREAD_MESSAGES_RESULT_NAME = "countVorgaengeWithUnreadMessages";
+ static final String COUNT_VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_RESULT_NAME = "countVorgaengeWithUngeleseneNachrichten";
static final String STATUS_PATH = "Vorgang.status";
static final String WIEDERVORLAGE_NEXT_FRIST_PATH_TEMPLATE = "ClientAttribute.%s.nextWiedervorlageFrist";
- static final String VORGAENGE_WITH_UNREAD_MESSAGES_PATH = "ClientAttribute.OzgCloud_NachrichtenManager.hasNewPostfachNachricht";
+ static final String VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_PATH = "ClientAttribute.OzgCloud_NachrichtenManager.hasNewPostfachNachricht";
static final String OPERAND_TODAY_DATE = "today()";
@@ -45,7 +45,7 @@ class StatisticRemoteService {
.addAllQuery(buildCountByStatusQueries(countByVorgangStatus))
.addQuery(buildCountWiedervorlageNextFristQuery())
.addQuery(buildExistsWiedervorlageOverdueQuery())
- .addQuery(buildCountVorgaengeWithUnreadMessagesQuery())
+ .addQuery(buildCountVorgaengeWithUngeleseneNachrichtenQuery())
.build();
var grpcResponse = statisticServiceStub.getVorgangStatistic(grpcRequest);
@@ -97,10 +97,10 @@ class StatisticRemoteService {
.collect(Collectors.toMap(StatisticResult::getName, Function.identity()));
}
- public GrpcVorgangStatisticQuery buildCountVorgaengeWithUnreadMessagesQuery() {
+ public GrpcVorgangStatisticQuery buildCountVorgaengeWithUngeleseneNachrichtenQuery() {
return GrpcVorgangStatisticQuery.newBuilder()
- .setResultName(COUNT_VORGAENGE_WITH_UNREAD_MESSAGES_RESULT_NAME)
- .setPath(VORGAENGE_WITH_UNREAD_MESSAGES_PATH)
+ .setResultName(COUNT_VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_RESULT_NAME)
+ .setPath(VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_PATH)
.setGroupMethod(GroupMethod.COUNT)
.setOperator(Operator.UNEQUAL)
.build();
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 82ad349372..6b88ba78d6 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
@@ -48,7 +48,7 @@ class StatisticService {
return Statistic.builder()
.existsWiedervorlageOverdue(getBooleanResult(response, StatisticRemoteService.EXISTS_WIEDERVORLAGE_OVERDUE_RESULT_NAME))
.wiedervorlagen(getIntResult(response, StatisticRemoteService.COUNT_WIEDERVORLAGE_NEXT_FRIST_RESULT_NAME))
- .unreadMessages(getIntResult(response, StatisticRemoteService.COUNT_VORGAENGE_WITH_UNREAD_MESSAGES_RESULT_NAME))
+ .ungeleseneNachrichten(getIntResult(response, StatisticRemoteService.COUNT_VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_RESULT_NAME))
.byStatus(ByStatus.builder()
.neu(getIntResult(response, remoteService.buildCountByStatusResultName(VorgangStatus.NEU)))
.abgeschlossen(getIntResult(response, remoteService.buildCountByStatusResultName(VorgangStatus.ABGESCHLOSSEN)))
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 d65fb73e49..508989af61 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
@@ -193,8 +193,8 @@ class StatisticRemoteServiceTest {
class TestGetVorgaengeStatistics {
private final GrpcVorgangStatisticResponse response = GrpcVorgangStatisticResponseTestFactory.create();
- private final GrpcVorgangStatisticQuery countVorgaengeWithUnreadMessagesQuery = GrpcVorgangStatisticQueryTestFactory.createBuilder()
- .setResultName("unread messages").build();
+ private final GrpcVorgangStatisticQuery countVorgaengeWithUngeleseneNachrichtenQuery = GrpcVorgangStatisticQueryTestFactory.createBuilder()
+ .setResultName("ungelesene nachrichten").build();
private final GrpcVorgangStatisticQuery existsWiedervorlageOverdueQuery = GrpcVorgangStatisticQueryTestFactory.createBuilder()
.setResultName("exists overdue").build();
@@ -206,7 +206,7 @@ class StatisticRemoteServiceTest {
when(serviceStub.getVorgangStatistic(any())).thenReturn(response);
doReturn(existsWiedervorlageOverdueQuery).when(service).buildExistsWiedervorlageOverdueQuery();
- doReturn(countVorgaengeWithUnreadMessagesQuery).when(service).buildCountVorgaengeWithUnreadMessagesQuery();
+ doReturn(countVorgaengeWithUngeleseneNachrichtenQuery).when(service).buildCountVorgaengeWithUngeleseneNachrichtenQuery();
}
@Test
@@ -245,18 +245,18 @@ class StatisticRemoteServiceTest {
}
@Test
- void shouldCallBuildCountVorgaengeWithUnreadMessagesQuery() {
+ void shouldCallBuildCountVorgaengeWithUngeleseneNachrichtenQuery() {
service.getVorgaengeStatistics(STATUSES_TO_COUNT);
- verify(service).buildCountVorgaengeWithUnreadMessagesQuery();
+ verify(service).buildCountVorgaengeWithUngeleseneNachrichtenQuery();
}
@Test
- void shouldAddCountVorgaengeWithUnreadMessagesQuery() {
+ void shouldAddCountVorgaengeWithUngeleseneNachrichtenQuery() {
service.getVorgaengeStatistics(STATUSES_TO_COUNT);
verify(serviceStub).getVorgangStatistic(grpcRequestCaptor.capture());
- assertThat(grpcRequestCaptor.getValue().getQueryList()).contains(countVorgaengeWithUnreadMessagesQuery);
+ assertThat(grpcRequestCaptor.getValue().getQueryList()).contains(countVorgaengeWithUngeleseneNachrichtenQuery);
}
}
@@ -298,20 +298,20 @@ class StatisticRemoteServiceTest {
}
@Nested
- class TestBuildCountVorgaengeWithUnreadMessagesQuery {
+ class TestBuildCountVorgaengeWithUngeleseneNachrichtenQuery {
@Test
void shouldHaveResultName() {
var query = callService();
- assertThat(query.getResultName()).isEqualTo(COUNT_VORGAENGE_WITH_UNREAD_MESSAGES_RESULT_NAME);
+ assertThat(query.getResultName()).isEqualTo(COUNT_VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_RESULT_NAME);
}
@Test
void shouldHavePath() {
var query = callService();
- assertThat(query.getPath()).isEqualTo(VORGAENGE_WITH_UNREAD_MESSAGES_PATH);
+ assertThat(query.getPath()).isEqualTo(VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_PATH);
}
@Test
@@ -329,7 +329,7 @@ class StatisticRemoteServiceTest {
}
private GrpcVorgangStatisticQuery callService() {
- return service.buildCountVorgaengeWithUnreadMessagesQuery();
+ return service.buildCountVorgaengeWithUngeleseneNachrichtenQuery();
}
}
}
\ No newline at end of file
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 817623e451..e35e1de7fe 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
@@ -140,11 +140,11 @@ class StatisticServiceTest {
}
@Test
- void shouldContainUnreadMessages() {
+ void shouldContainUngeleseneNachrichten() {
var statistic = service.buildGetVorgaengeStatisticResult(
- Map.of(COUNT_VORGAENGE_WITH_UNREAD_MESSAGES_RESULT_NAME, StatisticResultTestFactory.create()));
+ Map.of(COUNT_VORGAENGE_WITH_UNGELESENE_NACHRICHTEN_RESULT_NAME, StatisticResultTestFactory.create()));
- assertThat(statistic.getUnreadMessages()).isEqualTo(StatisticResultTestFactory.INT_VALUE);
+ assertThat(statistic.getUngeleseneNachrichten()).isEqualTo(StatisticResultTestFactory.INT_VALUE);
}
}
--
GitLab