OZG-2737 fix user search url in RootController. Added user-url-template

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

@@ -38,8 +38,6 @@ public class RootController {
 	public BuildProperties buildProperties;
 	@Autowired
 	private CurrentUserService currentUserService;
-	@Value("${kop.user-manager.search-url-template}")
-	private String userSearchUrl;
 
 	@Value("${kop.user-manager.url:}")
 	private String userManagerUrl;
@@ -47,13 +45,17 @@ public class RootController {
 	@Value("${kop.user-manager.profile-template:}")
 	private String userProfileTemplate;
 
+	@Value("${kop.user-manager.search-template:}")
+	private String userSearchTemplate;
+
 	@GetMapping
 	public EntityModel<RootResource> getRootResource() {
+		var userManagerSearchUrl = userManagerUrl + userSearchTemplate;
 		var model = ModelBuilder.fromEntity(new RootResource())
 				.ifMatch(this::hasRole).addLinks(
 						linkTo(RootController.class).withSelfRel(),
 						linkTo(VorgangController.class).withRel(REL_VORGAENGE),
-						Link.of(userSearchUrl, REL_SEARCH_USER),
+						Link.of(userManagerSearchUrl, REL_SEARCH_USER),
 						linkTo(DownloadTokenController.class).withRel(REL_DOWNLOAD_TOKEN),
 						buildVorgangListByPageLink(REL_SEARCH, Optional.empty()))
 				.ifMatch(this::hasVerwaltungRole).addLinks(

goofy-server/src/main/java/de/itvsh/goofy/common/UrlProvider.java

@@ -24,7 +24,7 @@ public class UrlProvider implements ApplicationContextAware {
 		Preconditions.checkNotNull(applicationContext, "ApplicationContext not initialized");
 
 		var template = applicationContext.getEnvironment().getProperty(key);
-		Preconditions.checkNotNull(template, "URl template is not configured, please add it to the application.yml using the key %s", key);
+		Preconditions.checkNotNull(template, "Url template is not configured, please add it to the application.yml using the key %s", key);
 
 		return String.format(template, val);
 	}

goofy-server/src/main/resources/application-e2e.yml

@@ -8,3 +8,4 @@ kop:
       url: classpath:files/LandesnetzInfo.html
   user-manager:
     url: http://localhost:9092
+    user-url-template: http://localhost:9092/api/userProfiles/%s
\ No newline at end of file

goofy-server/src/main/resources/application.yml

@@ -74,5 +74,5 @@ kop:
       postfachNachrichtAttachment: 3MB
       wiedervorlageAttachment: 40MB
   user-manager:
-    search-url-template: /api/userProfiles/?searchBy={searchBy}
+    search-template: /api/userProfiles/?searchBy={searchBy}
     profile-template: /api/userProfiles/%s
\ No newline at end of file

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

@@ -33,6 +33,7 @@ import de.itvsh.goofy.common.user.UserTestFactory;
 class RootControllerTest {
 
 	private static final String SEARCH_BY = "/test?searchBy={searchBy}";
+	private static final String USERMANAGER_URL = "http://localhost:8080";
 
 	private final String PATH = "/api";
 
@@ -52,7 +53,8 @@ class RootControllerTest {
 
 		when(currentUserService.getUserId()).thenReturn(UserTestFactory.ID);
 
-		ReflectionTestUtils.setField(controller, "userSearchUrl", SEARCH_BY);
+		ReflectionTestUtils.setField(controller, "userSearchTemplate", SEARCH_BY);
+		ReflectionTestUtils.setField(controller, "userManagerUrl", USERMANAGER_URL);
 	}
 
 	@DisplayName("Links for user")
@@ -96,7 +98,7 @@ class RootControllerTest {
 				var model = controller.getRootResource();
 
 				assertThat(model.getLink(RootController.REL_SEARCH_USER)).isPresent().get().extracting(Link::getHref)
-						.isEqualTo(SEARCH_BY);
+						.isEqualTo(USERMANAGER_URL + SEARCH_BY);
 			}
 
 			@Test

goofy-server/src/test/resources/application-itcase.yml

@@ -3,6 +3,11 @@ logging:
     ROOT: ERROR
     
 kop:
+  user-manager:
+    url: http://localhost:9091
+    search-template: /api/userProfiles/?searchBy={searchBy}
+    profile-template: /api/userProfiles/%s
+    user-url-template: http://localhost:9091/api/userProfiles/%s
   upload:
     maxFileSize:
       postfachNachrichtAttachment: 3MB

goofy-server/src/test/resources/application.yml

@@ -13,8 +13,10 @@ kop:
       secret: quatsch
       validity: 60000
   user-manager:
+    url: http://localhost:9091
+    search-template: /api/userProfiles/?searchBy={searchBy}
+    profile-template: /api/userProfiles/%s
     user-url-template: http://localhost:9091/api/userProfiles/%s
-    search-url-template: http://localhost:9091/api/userProfiles/?searchBy={searchBy}
       
 goofy:
   production: false
\ No newline at end of file