diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettings.java b/user-manager-server/src/main/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettings.java
index 49612f216830ef26eba1e75552499fc82aef029e..2115e9f7233a64d7f7179c4098cedf3136576296 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettings.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettings.java
@@ -22,7 +22,7 @@ public class M001_SetNewAndMigrateUserSettings {
static final String VORGANG_CREATED_FIELD = "vorgangCreated";
static final String VORGANG_ASSIGNED_TO_USER_FIELD = "vorgangAssignedToUser";
static final String POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD = "postfachNachrichtFromAntragsteller";
- static final String WIEDERVORLAGE_OVERDUE_FIELD = "wiedervorlageOverdue";
+ static final String WIEDERVORLAGE_DUE_TODAY = "wiedervorlageDueToday";
private final MongoDatabase mongoDatabase;
@@ -42,7 +42,7 @@ public class M001_SetNewAndMigrateUserSettings {
VORGANG_CREATED_FIELD, true,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true)))));
+ WIEDERVORLAGE_DUE_TODAY, true)))));
}
private void migrateNotificationsSendForNONE(MongoCollection<Document> userCollection) {
@@ -53,7 +53,7 @@ public class M001_SetNewAndMigrateUserSettings {
VORGANG_CREATED_FIELD, false,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true)))));
+ WIEDERVORLAGE_DUE_TODAY, true)))));
}
private void migrateEmptySettings(MongoCollection<Document> userCollection) {
@@ -64,7 +64,7 @@ public class M001_SetNewAndMigrateUserSettings {
VORGANG_CREATED_FIELD, false,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true)))));
+ WIEDERVORLAGE_DUE_TODAY, true)))));
}
@RollbackExecution
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
index 112258b7c08abc6bb258579d22a2318ed9dd5198..f951133352e78f346a2c1c7fa8003f7acdb298ad 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
+++ b/user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java
@@ -35,16 +35,12 @@ import lombok.Setter;
public class UserSettings {
public static final String NOTIFICATIONS_SEND_FOR_FIELD = "notificationsSendFor";
- public static final String VORGANG_CREATED_FIELD = "vorgangCreated";
- public static final String VORGANG_ASSIGNED_TO_USER_FIELD = "vorgangAssignedToUser";
- public static final String POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD = "postfachNachrichtFromAntragsteller";
- public static final String WIEDERVORLAGE_OVERDUE_FIELD = "wiedervorlageOverdue";
private NotificationsSendFor notificationsSendFor;
private boolean vorgangCreated;
private boolean vorgangAssignedToUser;
private boolean postfachNachrichtFromAntragsteller;
- private boolean wiedervorlageOverdue;
+ private boolean wiedervorlageDueToday;
public UserSettings(NotificationsSendFor notificationsSendFor) {
this(notificationsSendFor, notificationsSendFor == NotificationsSendFor.ALL, true, true, true);
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettingsITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettingsITCase.java
index 4908297ee0722c72eda79cbabe810df09c3a823b..74d41488932179652cc8ea6f634e3db48b405904 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettingsITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/migration/M001_SetNewAndMigrateUserSettingsITCase.java
@@ -62,7 +62,7 @@ class M001_SetNewAndMigrateUserSettingsITCase {
VORGANG_CREATED_FIELD, true,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true))));
+ WIEDERVORLAGE_DUE_TODAY, true))));
}
@Test
@@ -76,7 +76,7 @@ class M001_SetNewAndMigrateUserSettingsITCase {
VORGANG_CREATED_FIELD, false,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true))));
+ WIEDERVORLAGE_DUE_TODAY, true))));
}
@Test
@@ -90,6 +90,6 @@ class M001_SetNewAndMigrateUserSettingsITCase {
VORGANG_CREATED_FIELD, false,
VORGANG_ASSIGNED_TO_USER_FIELD, true,
POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER_FIELD, true,
- WIEDERVORLAGE_OVERDUE_FIELD, true))));
+ WIEDERVORLAGE_DUE_TODAY, true))));
}
}
\ No newline at end of file
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
index f46eafb7f7832577f64ffe395dab72158741bea2..55bd8e785d6d95e3e5881acbdd5ca4fe78d9fb26 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsServiceTest.java
@@ -79,13 +79,13 @@ class UserSettingsServiceTest {
UserSettings::isVorgangCreated,
UserSettings::isVorgangAssignedToUser,
UserSettings::isPostfachNachrichtFromAntragsteller,
- UserSettings::isWiedervorlageOverdue)
+ UserSettings::isWiedervorlageDueToday)
.containsExactly(
NotificationsSendFor.ALL,
true,
UserSettingsTestFactory.VORGANG_ASSIGNED_TO_USER,
UserSettingsTestFactory.POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER,
- UserSettingsTestFactory.WIEDERVORLAGE_OVERDUE);
+ UserSettingsTestFactory.WIEDERVORLAGE_DUE_TODAY);
}
@Test
@@ -99,13 +99,13 @@ class UserSettingsServiceTest {
UserSettings::isVorgangCreated,
UserSettings::isVorgangAssignedToUser,
UserSettings::isPostfachNachrichtFromAntragsteller,
- UserSettings::isWiedervorlageOverdue)
+ UserSettings::isWiedervorlageDueToday)
.containsExactly(
NotificationsSendFor.NONE,
false,
UserSettingsTestFactory.VORGANG_ASSIGNED_TO_USER,
UserSettingsTestFactory.POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER,
- UserSettingsTestFactory.WIEDERVORLAGE_OVERDUE);
+ UserSettingsTestFactory.WIEDERVORLAGE_DUE_TODAY);
}
}
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTest.java
index f017b39bb68b5c89d24450ca9a1be6c0ff8573d1..edf950c5917f4bcb5c938cef3be3d503e3f19114 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTest.java
@@ -38,7 +38,7 @@ class UserSettingsTest {
void shouldHaveDefaultSettings() {
assertThat(UserSettings.createDefault()).usingRecursiveComparison().isEqualTo(
UserSettings.builder().notificationsSendFor(NotificationsSendFor.NONE).vorgangCreated(false).vorgangAssignedToUser(true)
- .postfachNachrichtFromAntragsteller(true).wiedervorlageOverdue(true).build());
+ .postfachNachrichtFromAntragsteller(true).wiedervorlageDueToday(true).build());
}
}
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
index db31c9ee8a14ce97b014ee3ac1edfce64c311f6a..2177b88c7ccf559e7c00a326ce819656ad064d60 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
@@ -29,7 +29,7 @@ public class UserSettingsTestFactory {
public static final boolean VORGANG_CREATED = false;
public static final boolean VORGANG_ASSIGNED_TO_USER = true;
public static final boolean POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER = true;
- public static final boolean WIEDERVORLAGE_OVERDUE = true;
+ public static final boolean WIEDERVORLAGE_DUE_TODAY = true;
public static UserSettings create() {
return createBuilder().build();
@@ -41,6 +41,6 @@ public class UserSettingsTestFactory {
.vorgangCreated(VORGANG_CREATED)
.vorgangAssignedToUser(VORGANG_ASSIGNED_TO_USER)
.postfachNachrichtFromAntragsteller(POSTFACH_NACHRICHT_FROM_ANTRAGSTELLER)
- .wiedervorlageOverdue(WIEDERVORLAGE_OVERDUE);
+ .wiedervorlageDueToday(WIEDERVORLAGE_DUE_TODAY);
}
}
\ No newline at end of file