OZG-3539 OZG-6786 set default user settings for new users

user-manager-server/src/main/java/de/ozgcloud/user/UserService.java

@@ -23,19 +23,22 @@
  */
 package de.ozgcloud.user;
 
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import org.apache.commons.lang3.StringUtils;
 
 import de.ozgcloud.common.logging.OzgCloudLogging;
 import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
 import de.ozgcloud.user.common.errorhandling.TechnicalException;
 import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.settings.UserSettings;
 import io.smallrye.mutiny.Uni;
 import io.smallrye.mutiny.infrastructure.Infrastructure;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 
 @ApplicationScoped
 @OzgCloudLogging
@@ -48,10 +51,17 @@ public class UserService {
 
 	public User save(User user) {
 		findUser(user).ifPresentOrElse(persistedUser -> repository.updateUser(addIdUser(user, persistedUser)),
-				() -> repository.persist(user));
+				() -> saveNewUser(user));
 		return repository.refresh(user);
 	}
 
+	void saveNewUser(User user) {
+		if (Objects.isNull(user.getUserSettings())) {
+			user.setUserSettings(UserSettings.createDefault());
+		}
+		repository.persist(user);
+	}
+
 	public Stream<User> findUsers(FindUserProfilesQuery query) {
 		return repository.findUsers(query.getSearchBy(), query.getLimit());
 	}
@@ -79,8 +89,7 @@ public class UserService {
 	}
 
 	private Optional<User> findUser(User user) {
-		return repository.findByExternalId(user.getExternalId())
-				.or(() -> findByEmail(user.getEmail()));
+		return repository.findByExternalId(user.getExternalId()).or(() -> findByEmail(user.getEmail()));
 	}
 
 	private Optional<User> findByEmail(String email) {

user-manager-server/src/main/java/de/ozgcloud/user/settings/UserSettings.java

@@ -54,4 +54,13 @@ public class UserSettings {
 	public UserSettings(final NotificationsSendFor notificationsSendFor) {
 		this(notificationsSendFor, notificationsSendFor == NotificationsSendFor.ALL, true, true, true);
 	}
+
+	public static UserSettings createDefault() {
+		return UserSettings.builder()
+				.notificationsSendFor(NotificationsSendFor.NONE)
+				.vorgangCreated(false)
+				.vorgangAssignedToUser(true)
+				.postfachNachrichtFromAntragsteller(true)
+				.wiedervorlageOverdue(true).build();
+	}
 }

user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java

@@ -45,6 +45,8 @@ import org.mockito.Spy;
 import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
 import de.ozgcloud.user.common.errorhandling.TechnicalException;
 import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
+import de.ozgcloud.user.settings.NotificationsSendFor;
+import de.ozgcloud.user.settings.UserSettings;
 
 class UserServiceTest {
 
@@ -365,4 +367,36 @@ class UserServiceTest {
 			assertThatNoException().isThrownBy(() -> service.assertInactiveUser(user.build()));
 		}
 	}
+
+	@Nested
+	class TestSaveNewUser {
+
+		@Test
+		void shouldSetDefaultUserSettings() {
+			var user = UserTestFactory.createBuilder().userSettings(null).build();
+
+			service.saveNewUser(user);
+
+			assertThat(user.getUserSettings()).usingRecursiveComparison().isEqualTo(UserSettings.createDefault());
+		}
+
+		@Test
+		void shouldNotSetDefaultUserSettings() {
+			var settings = UserSettings.builder().notificationsSendFor(NotificationsSendFor.ALL).build();
+			var user = createBuilder().userSettings(settings).build();
+
+			service.saveNewUser(user);
+
+			assertThat(user.getUserSettings()).isEqualTo(settings);
+		}
+
+		@Test
+		void shouldPersistUser() {
+			var user = UserTestFactory.create();
+
+			service.saveNewUser(user);
+
+			verify(repository).persist(user);
+		}
+	}
 }
\ No newline at end of file

user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTest.java

@@ -24,4 +24,15 @@ class UserSettingsTest {
 		}
 	}
 
+	@Nested
+	class TestCreateDefault {
+
+		@Test
+		void shouldHaveDefaultSettings() {
+			assertThat(UserSettings.createDefault()).usingRecursiveComparison().isEqualTo(
+					UserSettings.builder().notificationsSendFor(NotificationsSendFor.NONE).vorgangCreated(false).vorgangAssignedToUser(true)
+							.postfachNachrichtFromAntragsteller(true).wiedervorlageOverdue(true).build());
+		}
+
+	}
 }
\ No newline at end of file