Feature/open search ny start (#3323)

Elastic/opensearch funksjonalitet lagt til

apps/dolly-backend/README.md

@@ -40,3 +40,9 @@ DOCKER_HOST=unix://${HOME}/.colima/default/docker.sock
 TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
 TESTCONTAINERS_RYUK_DISABLED=true
 ```
+
+For å kjøre lokalt med elastic search:
+
+```
+docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" --name opensearch-node -d opensearchproject/opensearch:latest
+```

apps/dolly-backend/build.gradle

@@ -19,12 +19,12 @@ jacocoTestReport {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
         property "sonar.dynamicAnalysis", "reuseReports"
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.login", System.getenv("SONAR_TOKEN")
+        property "sonar.token", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
         property "sonar.projectKey", "testnav-dolly-backend"
@@ -65,14 +65,13 @@ repositories {
 
 dependencies {
 
-    implementation platform('org.testcontainers:testcontainers-bom:1.19.1')
-
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-security'
     implementation 'no.nav.testnav.libs:servlet-insecure-security'
     implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:database'
     implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
     implementation 'no.nav.testnav.libs:reactive-core'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
@@ -92,6 +91,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.retry:spring-retry:2.0.0'
 
+    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+    implementation 'org.opensearch.client:spring-data-opensearch:1.2.0'
+
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'com.github.ben-manes.caffeine:caffeine'
@@ -107,13 +109,16 @@ dependencies {
     implementation 'org.apache.poi:poi-ooxml:5.2.3'
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation 'org.opensearch:opensearch-testcontainers:2.0.0'
+
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
     testImplementation 'com.h2database:h2'
     testImplementation 'io.projectreactor:reactor-test:3.5.3'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
     testImplementation 'org.bitbucket.b_c:jose4j:0.9.3'
+
     implementation 'net.java.dev.jna:jna:5.13.0'
 
     annotationProcessor 'org.projectlombok:lombok'

apps/dolly-backend/config.test.yml

@@ -71,6 +71,9 @@ spec:
       enabled: true
       tenant: nav.no
   image: {{image}}
+  openSearch:
+    instance: bestillinger-dev
+    access: admin
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: dev

apps/dolly-backend/config.yml

@@ -78,6 +78,9 @@ spec:
       enabled: true
       tenant: nav.no
   image: {{image}}
+  openSearch:
+    instance: bestillinger
+    access: admin
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod

apps/dolly-backend/settings.gradle

@@ -11,6 +11,7 @@ includeBuild '../../libs/servlet-insecure-security'
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/database'
 includeBuild '../../libs/data-transfer-objects'
+includeBuild '../../libs/data-transfer-search-objects'
 includeBuild '../../.github/workflows'
 
 gradleEnterprise {

apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

@@ -2,8 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class})
 public class DollyBackendApplicationStarter {
     public static void main(String[] args) {
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/ArbeidsplassenCVClient.java

@@ -12,7 +12,7 @@
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.util.CallIdUtil;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/dto/PAMCVDTO.java

@@ -6,7 +6,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/mapper/ArbeidsplassenCVRequestMappingStrategy.java

@@ -7,7 +7,7 @@
 import no.nav.dolly.bestilling.arbeidsplassencv.dto.PAMCVDTO;
 import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
+import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/domain/Inntekt.java

@@ -5,6 +5,9 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDate;
 
@@ -22,7 +25,10 @@ public enum InntektType {LOENNSINNTEKT, YTELSE_FRA_OFFENTLIGE, PENSJON_ELLER_TRY
 
     private InntektType inntektstype;
     private Double beloep;
+
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDate startOpptjeningsperiode;
+    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
     private LocalDate sluttOpptjeningsperiode;
     private Boolean inngaarIGrunnlagForTrekk;
     private Boolean utloeserArbeidsgiveravgift;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterClient.java

@@ -11,9 +11,9 @@
 import no.nav.dolly.domain.resultset.dolly.DollyPerson;
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumer.java

@@ -8,10 +8,10 @@
 import no.nav.dolly.bestilling.kontoregisterservice.command.KontoregisterPostCommand;
 import no.nav.dolly.config.Consumers;
 import no.nav.dolly.metrics.Timed;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterDeleteCommand.java

@@ -2,8 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.SlettKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.SlettKontoRequestDTO;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterGetCommand.java

@@ -2,9 +2,9 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.HentKontoResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.HentKontoResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/command/KontoregisterPostCommand.java

@@ -2,8 +2,8 @@
 
 import lombok.RequiredArgsConstructor;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.KontoregisterResponseDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.KontoregisterResponseDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrNorskMappingStrategy.java

@@ -5,8 +5,8 @@
 import ma.glasnost.orika.MappingContext;
 import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrNorskDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.stereotype.Component;
 

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kontoregisterservice/mapper/BankkontonrUtlandskMappingStrategy.java

@@ -6,9 +6,9 @@
 import no.nav.dolly.bestilling.kontoregisterservice.util.BankkontoGenerator;
 import no.nav.dolly.bestilling.kontoregisterservice.util.KontoregisterLandkode;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.BankkontonrUtlandDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.OppdaterKontoRequestDTO;
-import no.nav.testnav.libs.dto.kontoregisterservice.v1.UtenlandskKontoDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.OppdaterKontoRequestDTO;
+import no.nav.testnav.libs.data.kontoregister.v1.UtenlandskKontoDTO;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/PdlDataConsumer.java

@@ -16,10 +16,10 @@
 import no.nav.dolly.config.Consumers;
 import no.nav.dolly.metrics.Timed;
 import no.nav.dolly.util.JacksonExchangeStrategyUtil;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataCheckIdentCommand.java

@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.AvailibilityResponseDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.AvailibilityResponseDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataHentCommand.java

@@ -4,7 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOppdateringCommand.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.pdldata.dto.PdlResponse;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonUpdateRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonUpdateRequestDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pdldata/command/PdlDataOpprettingCommand.java

@@ -5,7 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.pdldata.dto.PdlResponse;
 import no.nav.dolly.util.WebClientFilter;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.BestillingRequestDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.BestillingRequestDTO;
 import no.nav.testnav.libs.securitycore.config.UserConstant;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java

@@ -34,10 +34,10 @@
 import no.nav.dolly.service.TransaksjonMappingService;
 import no.nav.dolly.util.IdentTypeUtil;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullPersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.PersonDTO;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.RelasjonType;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullPersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.PersonDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.RelasjonType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSivilstandWrapper.java

@@ -4,7 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO;
 
 import java.util.ArrayList;
 import java.util.List;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/mapper/PensjonSamboerMappingStrategy.java

@@ -6,7 +6,7 @@
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSamboerRequest;
 import no.nav.dolly.bestilling.pensjonforvalter.domain.PensjonSivilstandWrapper;
 import no.nav.dolly.mapper.MappingStrategy;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.SivilstandDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.SivilstandDTO;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDate;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceClient.java

@@ -15,7 +15,7 @@
 import no.nav.dolly.errorhandling.ErrorStatusDecoder;
 import no.nav.dolly.exceptions.DollyFunctionalException;
 import no.nav.dolly.util.TransactionHelperService;
-import no.nav.testnav.libs.dto.pdlforvalter.v1.FullmaktDTO;
+import no.nav.testnav.libs.data.pdlforvalter.v1.FullmaktDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.StringUtil;
 import org.springframework.stereotype.Service;
@@ -102,7 +102,7 @@ private Map<String, Set<String>> getHendelseIder(boolean isOrdre, BestillingProg
 
         } catch (JsonProcessingException e) {
 
-            throw new DollyFunctionalException("Feilet å hente hendelseId fra opprettinng.", e);
+            throw new DollyFunctionalException("Feilet å hente hendelseId fra oppretting.", e);
         }
     }