OZG-2653 Tests erweitert

src/test/java/de/itvsh/kop/user/StubUserResource.java

@@ -15,11 +15,19 @@ import org.keycloak.representations.idm.MappingsRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
 import org.keycloak.representations.idm.UserSessionRepresentation;
 
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
 class StubUserResource implements UserResource {
+	private UserRepresentation userRepresentation = UserRepresentationTestFactory.create();
+
+	public StubUserResource(Map<String, List<String>> attributes) {
+		userRepresentation = UserRepresentationTestFactory.createWithAttributes(attributes);
+	}
 
 	@Override
 	public UserRepresentation toRepresentation() {
-		return UserRepresentationTestFactory.create();
+		return userRepresentation;
 	}
 
 	@Override

src/test/java/de/itvsh/kop/user/UserRepresentationTestFactory.java

@@ -3,7 +3,6 @@ package de.itvsh.kop.user;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import org.keycloak.representations.idm.UserRepresentation;
 
@@ -14,7 +13,8 @@ class UserRepresentationTestFactory {
 	static final String FIRST_NAME = Faker.instance().name().firstName();
 	static final String LAST_NAME = Faker.instance().name().lastName();
 	static final String USER_NAME = Faker.instance().buffy().characters();
-	static final String EXTERNAL_ID = UUID.randomUUID().toString();
+	static final String EXTERNAL_ID = "external-id-1-ldap";
+	static final String EXTERNAL_ID_FALLBACK = "external-id-2-keykloak";
 	static final String ROLE = "role";
 	static final long CREATED = Instant.now().toEpochMilli();
 	static final String ORGANSISATIONS_EINHEIT_ID = "0815";
@@ -28,7 +28,7 @@ class UserRepresentationTestFactory {
 		user.setLastName(LAST_NAME);
 		user.setUsername(USER_NAME);
 		user.setCreatedTimestamp(CREATED);
-		user.setId(EXTERNAL_ID);
+		user.setId(EXTERNAL_ID_FALLBACK);
 		user.setAttributes(ATTRIBUTES);
 
 		List<String> clientRoles = List.of(ROLE);
@@ -36,4 +36,10 @@ class UserRepresentationTestFactory {
 
 		return user;
 	}
+
+	static UserRepresentation createWithAttributes(Map<String, List<String>> attributes) {
+		var user = create();
+		user.setAttributes(attributes);
+		return user;
+	}
 }

src/test/java/de/itvsh/kop/user/UserResourceMapperTest.java

@@ -3,7 +3,10 @@ package de.itvsh.kop.user;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Map;
+
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
@@ -49,6 +52,13 @@ class UserResourceMapperTest {
 			assertThat(user.getExternalId()).isEqualTo(UserRepresentationTestFactory.EXTERNAL_ID);
 		}
 
+		@Test
+		void shouldMapExternalIdFallback() {
+			User user = mapper.toKopUser(UserResourceTestFactory.createWithAttributes(Map.of()));
+
+			assertThat(user.getExternalId()).isEqualTo(UserRepresentationTestFactory.EXTERNAL_ID_FALLBACK);
+		}
+
 		@Test
 		void shouldMapFirstName() {
 			User user = mapper.toKopUser(UserResourceTestFactory.create());
@@ -76,5 +86,13 @@ class UserResourceMapperTest {
 
 			assertThat(user.getOrganisationsEinheitIds()).isNotEmpty().contains(UserRepresentationTestFactory.ORGANSISATIONS_EINHEIT_ID);
 		}
+
+		@Test
+		@Disabled
+		void shouldMapRoles() {
+			User user = mapper.toKopUser(UserResourceTestFactory.create());
+
+			assertThat(user.getRoles()).isNotEmpty().contains(UserRepresentationTestFactory.ROLE);
+		}
 	}
 }

src/test/java/de/itvsh/kop/user/UserResourceTestFactory.java

 package de.itvsh.kop.user;
 
+import java.util.List;
+import java.util.Map;
+
 import org.keycloak.admin.client.resource.UserResource;
 
 class UserResourceTestFactory {
 
-	public static UserResource create() {
+	static UserResource create() {
 
 		return new StubUserResource();
 	}
+
+	static UserResource createWithAttributes(Map<String, List<String>> attributes) {
+		return new StubUserResource(attributes);
+	}
 }