From 8d132860cac18a5d2527ce29a428d6f1af67154d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 25 Sep 2024 12:07:12 +0200
Subject: [PATCH] OZG-5031 Fix naming of GrpcUserSettings
---
.../src/main/protobuf/userprofile.model.proto | 2 +-
.../java/de/ozgcloud/user/settings/UserSettingsMapper.java | 1 +
.../ozgcloud/user/settings/GrpcUserSettingsTestFactory.java | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/user-manager-interface/src/main/protobuf/userprofile.model.proto b/user-manager-interface/src/main/protobuf/userprofile.model.proto
index 910054b1..129fa0be 100644
--- a/user-manager-interface/src/main/protobuf/userprofile.model.proto
+++ b/user-manager-interface/src/main/protobuf/userprofile.model.proto
@@ -42,7 +42,7 @@ message GrpcUserSettings {
bool vorgangCreated = 2;
bool vorgangAssignedToUser = 3;
bool postfachNachrichtFromAntragsteller = 4;
- bool wiedervorlageOverdue = 5;
+ bool wiedervorlageDueToday = 5;
}
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsMapper.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsMapper.java
index 329078be..2b651bd2 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsMapper.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettingsMapper.java
@@ -17,6 +17,7 @@ public interface UserSettingsMapper {
@Mapping(target = "unknownFields", ignore = true)
@Mapping(target = "allFields", ignore = true)
@Mapping(target = "notificationsSendForAll", source = "notificationsSendFor")
+ @Mapping(target = "wiedervorlageDueToday", source = "wiedervorlageOverdue")
GrpcUserSettings toGrpc(UserSettings userSettings);
default boolean map(NotificationsSendFor sendFor) {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/settings/GrpcUserSettingsTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/GrpcUserSettingsTestFactory.java
index 39e625f6..cd3f103c 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/settings/GrpcUserSettingsTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/GrpcUserSettingsTestFactory.java
@@ -31,7 +31,7 @@ public class GrpcUserSettingsTestFactory {
public static final boolean VORGANG_CREATED = UserSettingsTestFactory.VORGANG_CREATED;
public static final boolean VORGANG_ASSIGNED_TO_USER = UserSettingsTestFactory.VORGANG_ASSIGNED_TO_USER;
public static final boolean POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER = UserSettingsTestFactory.POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER;
- public static final boolean WIEDERVORLAGE_OVERDUE = UserSettingsTestFactory.WIEDERVORLAGE_OVERDUE;
+ public static final boolean WIEDERVORLAGE_DUE_TODAY = UserSettingsTestFactory.WIEDERVORLAGE_OVERDUE;
public static GrpcUserSettings create() {
return createBuilder().build();
@@ -43,6 +43,6 @@ public class GrpcUserSettingsTestFactory {
.setVorgangCreated(VORGANG_CREATED)
.setVorgangAssignedToUser(VORGANG_ASSIGNED_TO_USER)
.setPostfachNachrichtFromAntragsteller(POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER)
- .setWiedervorlageOverdue(WIEDERVORLAGE_OVERDUE);
+ .setWiedervorlageDueToday(WIEDERVORLAGE_DUE_TODAY);
}
}
\ No newline at end of file
--
GitLab