From 108190cd6c460af3963680de8eb2be1538d331d4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 24 Sep 2024 09:45:57 +0200
Subject: [PATCH] OZG-5031 Rename repository function and fix
UserProfileGrpcServiceTest
---
.../src/main/java/de/ozgcloud/user/UserRepository.java | 2 +-
.../src/main/java/de/ozgcloud/user/UserService.java | 2 +-
.../src/test/java/de/ozgcloud/user/UserRepositoryITCase.java | 4 ++--
.../src/test/java/de/ozgcloud/user/UserRepositoryTest.java | 4 ++--
.../src/test/java/de/ozgcloud/user/UserServiceTest.java | 4 ++--
.../ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java | 3 +--
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
index df9598eb..7c676750 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserRepository.java
+++ b/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);
}
diff --git a/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java b/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
index 2fd9d63a..b795174f 100644
--- a/user-manager-server/src/main/java/de/ozgcloud/user/UserService.java
+++ b/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
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
index c8bec751..b8bcd5e5 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryITCase.java
+++ b/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);
}
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java
index 3ca1e919..635aaf22 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserRepositoryTest.java
+++ b/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);
}
}
}
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java
index c9f783ae..447bd4c9 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserServiceTest.java
+++ b/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();
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java
index 1dbd5875..330f65ac 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/userprofile/UserProfileGrpcServiceTest.java
+++ b/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);
--
GitLab