Merge branch 'master' of git.ozg-sh.de:mgm/goofy

goofy-server/src/main/java/de/itvsh/goofy/RootController.java

@@ -60,6 +60,8 @@ public class RootController {
 	static final String REL_DOWNLOAD_TOKEN = "downloadToken";
 	static final String REL_CURRENT_USER = "currentUser";
 
+	static final String USER_PROFILE_SEARCH_DELETED_PARAM = "deleted";
+
 	@Autowired(required = false)
 	public BuildProperties buildProperties;
 	@Autowired
@@ -81,7 +83,11 @@ public class RootController {
 						linkTo(RootController.class).withSelfRel(),
 						linkTo(VorgangController.class).withRel(REL_VORGAENGE),
 						linkTo(DownloadTokenController.class).withRel(REL_DOWNLOAD_TOKEN),
-						Link.of(userManagerUrlProvider.getUserProfileSearchTemplate(), REL_SEARCH_USER))
+						Link.of(userManagerUrlProvider.getUserProfileSearchTemplate()
+										.queryParam(USER_PROFILE_SEARCH_DELETED_PARAM, false)
+										.build(false)
+										.toUriString(),
+								REL_SEARCH_USER))
 				.ifMatch(this::hasRoleAndSearchServerAvailable).addLinks(
 						buildVorgangListByPageLink(REL_SEARCH, Optional.empty()));
 

goofy-server/src/main/java/de/itvsh/goofy/common/user/UserManagerUrlProvider.java

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import de.itvsh.goofy.postfach.PostfachMail;
+import org.springframework.web.util.UriComponentsBuilder;
 
 //FIXME add missing tests
 @Service
@@ -53,8 +54,8 @@ public class UserManagerUrlProvider {
 		return userManagerProperties.getInternalurl() + userManagerProperties.getProfileTemplate();
 	}
 
-	public String getUserProfileSearchTemplate() {
-		return userManagerProperties.getUrl() + userManagerProperties.getSearchTemplate();
+	public UriComponentsBuilder getUserProfileSearchTemplate() {
+		return UriComponentsBuilder.fromUriString(userManagerProperties.getUrl() + userManagerProperties.getSearchTemplate());
 	}
 
 	/** @deprecated for migration only */

goofy-server/src/test/java/de/itvsh/goofy/RootControllerTest.java

@@ -54,6 +54,7 @@ import de.itvsh.goofy.common.user.UserProfileTestFactory;
 import de.itvsh.goofy.common.user.UserRemoteService;
 import de.itvsh.goofy.common.user.UserRole;
 import de.itvsh.goofy.system.SystemStatusService;
+import org.springframework.web.util.UriComponentsBuilder;
 
 class RootControllerTest {
 
@@ -79,7 +80,8 @@ class RootControllerTest {
 
 		when(currentUserService.getUserId()).thenReturn(UserId.from("42"));
 		when(internalUserIdService.getUserId(any())).thenReturn(Optional.empty());
-		when(userManagerUrlProvider.getUserProfileSearchTemplate()).thenReturn("UserProfileSearchTemplateDummy/$");
+		when(userManagerUrlProvider.getUserProfileSearchTemplate()).thenReturn(
+				UriComponentsBuilder.fromUriString("UserProfileSearchTemplateDummy/$"));
 	}
 
 	@DisplayName("Links for user")
@@ -310,6 +312,25 @@ class RootControllerTest {
 				}
 			}
 		}
+
+		@DisplayName("User profile search")
+		@Nested
+		class TestUserProfileSearch {
+
+			@BeforeEach
+			void init() {
+				when(currentUserService.hasRole(UserRole.VERWALTUNG_USER)).thenReturn(true);
+				when(userManagerUrlProvider.getUserProfileSearchTemplate()).thenReturn(
+						UriComponentsBuilder.fromUriString("/api/userProfiles/?searchBy={searchBy}"));
+			}
+
+			@Test
+			void shouldAlwaysSearchForNotDeletedUserProfiles() {
+				var model = controller.getRootResource();
+				assertThat(model.getLink(RootController.REL_SEARCH_USER)).isPresent().get().extracting(Link::getHref).isEqualTo(
+						"/api/userProfiles/?searchBy={searchBy}&deleted=false");
+			}
+		}
 	}
 
 	@DisplayName("Root resource")
@@ -320,7 +341,8 @@ class RootControllerTest {
 		void initTest() {
 			when(currentUserService.getUserId()).thenReturn(UserId.from("42"));
 			when(internalUserIdService.getUserId(any())).thenReturn(Optional.empty());
-			when(userManagerUrlProvider.getUserProfileSearchTemplate()).thenReturn("UserProfileSearchTemplateDummy/$");
+			when(userManagerUrlProvider.getUserProfileSearchTemplate()).thenReturn(
+					UriComponentsBuilder.fromUriString("UserProfileSearchTemplateDummy/$"));
 		}
 
 		@Test