OZG-5031 Rename repository function and fix UserProfileGrpcServiceTest

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

@@ -128,7 +128,7 @@ class UserRepository implements PanacheMongoRepository<User> {
 		return find(DELETED_FIELD, true).project(UserIdProjection.class).stream().map(UserIdProjection::getAsString);
 	}
 
-	public Stream<User> findAllUsersByOrganisationsEinheitId(String organisationsEinheitId) {
+	public Stream<User> findAllByOrganisationsEinheitId(String organisationsEinheitId) {
 		return stream(ORGANISATIONS_EINHEIT_IDS_FIELD, organisationsEinheitId);
 	}
 

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

@@ -153,6 +153,6 @@ public class UserService {
 		if (StringUtils.isEmpty(organisationsEinheitId)) {
 			throw new FunctionalException(() -> String.format(MISSING_ORGANISATIONS_EINHEIT_ID_MESSAGE_TEMPLATE, organisationsEinheitId));
 		}
-		return repository.findAllUsersByOrganisationsEinheitId(organisationsEinheitId);
+		return repository.findAllByOrganisationsEinheitId(organisationsEinheitId);
 	}
 }
\ No newline at end of file

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

@@ -571,7 +571,7 @@ class UserRepositoryITCase {
 	}
 
 	@Nested
-	class TestFindAllUsersByOrganisationsEinheitId {
+	class TestFindAllByOrganisationsEinheitId {
 
 		private static final String ORGANISATIONSEINHEIT_ID_1 = UUID.randomUUID().toString();
 		private static final String ORGANISATIONSEINHEIT_ID_2 = UUID.randomUUID().toString();
@@ -602,7 +602,7 @@ class UserRepositoryITCase {
 
 		@Test
 		void shouldFindUsersByOrganisationsEinheitId() {
-			var users = repository.findAllUsersByOrganisationsEinheitId(ORGANISATIONSEINHEIT_ID_1);
+			var users = repository.findAllByOrganisationsEinheitId(ORGANISATIONSEINHEIT_ID_1);
 
 			assertThat(users).usingRecursiveFieldByFieldElementComparator().containsExactlyInAnyOrder(user1, user2);
 		}

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

@@ -204,7 +204,7 @@ class UserRepositoryTest {
 	}
 
 	@Nested
-	class TestFindAllUsersByOrganisationsEinheitId {
+	class TestFindAllByOrganisationsEinheitId {
 
 		@BeforeEach
 		void mock() {
@@ -226,7 +226,7 @@ class UserRepositoryTest {
 		}
 
 		private Stream<User> callRepository() {
-			return userRepository.findAllUsersByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID);
+			return userRepository.findAllByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID);
 		}
 	}
 }

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

@@ -413,13 +413,13 @@ class UserServiceTest {
 		void shouldCallRepository() {
 			callService();
 
-			verify(repository).findAllUsersByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID);
+			verify(repository).findAllByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID);
 		}
 
 		@Test
 		void shouldReturnFoundUsers() {
 			var users = Stream.of(UserTestFactory.create());
-			when(repository.findAllUsersByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID)).thenReturn(users);
+			when(repository.findAllByOrganisationsEinheitId(UserTestFactory.ORGANISTATIONSEINHEITEN_ID)).thenReturn(users);
 
 			var returnedUsers = callService();
 

user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java

@@ -169,6 +169,7 @@ class UserProfileGrpcServiceTest {
 		@BeforeEach
 		void mock() {
 			when(userService.findAllUsersOfOrganisationsEinheit(UserTestFactory.ORGANISTATIONSEINHEITEN_ID)).thenReturn(users);
+			doReturn(response).when(grpcService).buildGrpcGetAllByOrganisationsEinheitIdResponse(users);
 		}
 
 		@Test
@@ -187,8 +188,6 @@ class UserProfileGrpcServiceTest {
 
 		@Test
 		void shouldCallOnNext() {
-			doReturn(response).when(grpcService).buildGrpcGetAllByOrganisationsEinheitIdResponse(users);
-
 			callService();
 
 			verify(streamObserver).onNext(response);