Refactor age query logic to use LocalDate for improved clarity and accuracy

Author: krharum

apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/utils/OpenSearchPersonQueryUtils.java

@@ -39,18 +39,18 @@ public class OpenSearchPersonQueryUtils {
 
     public static void addAlderQuery(BoolQueryBuilder queryBuilder, SearchRequest request) {
 
-        var thisYear = LocalDate.now().getYear();
+        var now = LocalDate.now();
         if (nonNull(request.getPersonRequest().getAlderFom()) || nonNull(request.getPersonRequest().getAlderTom())) {
             queryBuilder.must(QueryBuilders.boolQuery()
                     .must(nestedMatchQuery("hentPerson.foedselsdato", METADATA_HISTORISK, false))
                     .must(QueryBuilders.nestedQuery("hentPerson.foedselsdato",
                             QueryBuilders.boolQuery().must(
-                                    rangeQuery("hentPerson.foedselsdato.foedselsaar",
+                                    rangeQuery("hentPerson.foedselsdato.foedselsdato",
                                             Optional.ofNullable(request.getPersonRequest().getAlderTom())
-                                                    .map(alderTom -> thisYear - alderTom)
+                                                    .map(now::minusYears)
                                                     .orElse(null),
                                             Optional.ofNullable(request.getPersonRequest().getAlderFom())
-                                                    .map(alderFom -> thisYear - alderFom)
+                                                    .map(now::minusYears)
                                                     .orElse(null))), ScoreMode.Avg)));
         }
     }

apps/dolly-search-service/src/main/java/no/nav/testnav/dollysearchservice/utils/OpenSearchQueryUtils.java

@@ -15,7 +15,7 @@ public class OpenSearchQueryUtils {
     public static final String NAVSPERSONIDENTIFIKATOR = "hentPerson.navspersonidentifikator";
     public static final String CONCAT = "%s.%s";
 
-    public static QueryBuilder rangeQuery(String field, Integer value1, Integer value2) {
+    public static QueryBuilder rangeQuery(String field, Object value1, Object value2) {
 
         return QueryBuilders.rangeQuery(field).from(value1).to(value2);
     }