Oppdatert adressesøk II

navikt · Jan 24, 2025 · c10f747 · c10f747
1 parent 2e0885d
commit c10f747
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...rch-service/src/main/java/no/nav/testnav/dollysearchservice/config/ApplicationConfig.java b/...rch-service/src/main/java/no/nav/testnav/dollysearchservice/config/ApplicationConfig.java
@@ -1,14 +1,14 @@
 package no.nav.testnav.dollysearchservice.config;
 
 import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
-import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
+import no.nav.testnav.libs.servletsecurity.jwt.SecureOAuth2ServerToServerAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Configuration
 @Import({
         ApplicationCoreConfig.class,
-        SecureOAuth2ServerToServerConfiguration.class
+        SecureOAuth2ServerToServerAutoConfiguration.class
 })
 public class ApplicationConfig {
 

diff --git a/...ice/src/main/java/no/nav/testnav/dollysearchservice/utils/OpenSearchPersonQueryUtils.java b/...ice/src/main/java/no/nav/testnav/dollysearchservice/utils/OpenSearchPersonQueryUtils.java
@@ -27,6 +27,7 @@ public class OpenSearchPersonQueryUtils {
     private static final String MATRIKKELADRESSE = "matrikkeladresse";
     private static final String KOMMUNENUMMER = "kommunenummer";
     private static final String POSTNUMMER = "postnummer";
+    private static final String BYDELSNUMMER = "bydelsnummer";
     private static final String FOLKEREGISTERIDENTIFIKATOR = "hentPerson.folkeregisteridentifikator";
     private static final String NAVSPERSONIDENTIFIKATOR = "hentPerson.navspersonidentifikator";
     private static final String CONCAT = "%s.%s";
@@ -174,7 +175,6 @@ public static BoolQueryBuilder addAdresseQuery(String field, String value) {
                 .should(nestedMatchQuery(KONTAKTADRESSE, CONCAT.formatted(VEGADRESSE, field), value));
     }
 
-
     public static void addAdressePostnrQuery(BoolQueryBuilder queryBuilder, SearchRequest request) {
 
         Optional.ofNullable(request.getPersonRequest().getAdresse())
@@ -188,11 +188,10 @@ public static void addAdressePostnrQuery(BoolQueryBuilder queryBuilder, SearchRe
     public static void addAdresseBydelsnrQuery(BoolQueryBuilder queryBuilder, SearchRequest request) {
 
         Optional.ofNullable(request.getPersonRequest().getAdresse())
-                .filter(boadresse -> isNotBlank(boadresse.getBydelsnummer()))
-                .ifPresent(boadresse ->
-                        queryBuilder.must(QueryBuilders.nestedQuery("hentPerson.bostedsadresse.vegadresse",
-                                QueryBuilders.boolQuery().must(matchQuery("hentPerson.bostedsadresse.vegadresse.bydelsnummer",
-                                        boadresse.getBydelsnummer())), ScoreMode.Avg)));
+                .filter(adresse -> isNotBlank(adresse.getBydelsnummer()))
+                .ifPresent(adresse ->
+                                queryBuilder.must(addAdresseQuery(BYDELSNUMMER, adresse.getBydelsnummer())
+                                ));
     }
 
     public static void addHarAdresseBydelsnrQuery(BoolQueryBuilder queryBuilder, SearchRequest request) {

diff --git a/apps/dolly-search-service/src/main/resources/application-local.yml b/apps/dolly-search-service/src/main/resources/application-local.yml
@@ -1,5 +1,5 @@
-AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
 TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
 
 spring: