Korjattu hakukohteiden search-rajapintaa

Opetushallitus · Dec 10, 2024 · 5ae532b · 5ae532b
1 parent 98a69a4
commit 5ae532b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/fi/vm/sade/valinta/kooste/external/resource/HttpClient.java b/src/main/java/fi/vm/sade/valinta/kooste/external/resource/HttpClient.java
@@ -34,6 +34,17 @@ public HttpClient(java.net.http.HttpClient client, Gson gson) {
     this.gson = gson;
   }
 
+  public CompletableFuture<String> getString(String url, Duration timeout) {
+    HttpRequest request =
+            buildWithCallerIdAndCsrfHeaders(HttpRequest.newBuilder(URI.create(url)))
+                    .header("Accept", "application/json")
+                    .GET()
+                    .timeout(timeout)
+                    .build();
+    return this.makeRequest(request, null)
+            .thenApply(this::parseTxt);
+  }
+
   public <O> CompletableFuture<O> getJson(String url, Duration timeout, Type outputType) {
     return this.getJson(url, timeout, outputType, null);
   }

diff --git a/src/main/java/fi/vm/sade/valinta/kooste/tarjontaservice/TarjontaServiceResource.java b/src/main/java/fi/vm/sade/valinta/kooste/tarjontaservice/TarjontaServiceResource.java
@@ -24,7 +24,6 @@
 
 @RestController("TarjontaServiceResource")
 @RequestMapping("/resources/tarjonta-service")
-// @PreAuthorize("isAuthenticated()")
 @Tag(
     name = "/tarjonta-service",
     description = "Proxy-rajapinnat vanhan tarjonnan tietojen hakemiseen")
@@ -135,11 +134,11 @@ public CompletableFuture<ResultV1RDTO<List<HakuV1RDTO>>> find(
         new com.google.gson.reflect.TypeToken<ResultV1RDTO<List<HakuV1RDTO>>>() {}.getType());
   }
 
-  @GetMapping(value = "/search", produces = MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8")
+  @GetMapping(value = "/rest/v1/hakukohde/search", produces = MediaType.APPLICATION_JSON_VALUE + ";charset=UTF-8")
   @Operation(
       summary = "Palauttaa listan hakukohteista annetuilla parametreilla",
       description = "Palauttaa listan hakukohteista annetuilla parametreilla.")
-  public CompletableFuture<ResultV1RDTO<HakutuloksetV1RDTO<HakukohdeHakutulosV1RDTO>>> search(
+  public CompletableFuture<String> search(
       @RequestParam(value = "searchTerms", required = false) String searchTerms,
       @RequestParam(value = "hakukohteenNimiUri", required = false) String hakukohteenNimiUri,
       @RequestParam(value = "organisationOid", required = false) List<String> organisationOids,
@@ -198,10 +197,8 @@ public CompletableFuture<ResultV1RDTO<HakutuloksetV1RDTO<HakukohdeHakutulosV1RDT
             .toUri()
             .getQuery();
 
-    return this.tarjontaClient.<ResultV1RDTO<HakutuloksetV1RDTO<HakukohdeHakutulosV1RDTO>>>getJson(
+    return this.tarjontaClient.getString(
         urlConfiguration.url("tarjonta-service.hakukohde.search") + "?" + queryString,
-        Duration.ofMinutes(5),
-        new com.google.gson.reflect.TypeToken<
-            ResultV1RDTO<HakutuloksetV1RDTO<HakukohdeHakutulosV1RDTO>>>() {}.getType());
+        Duration.ofMinutes(5));
   }
 }