feature: Add RsInstdataKdi and Kelvin AAP request DTO to BestillingDokument for enhanced data handling #deploy-test-dolly-backend #deploy-dolly-search-service

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/opensearch/BestillingDokument.java

@@ -19,6 +19,8 @@
 import no.nav.dolly.domain.resultset.inntektsmeldingstub.RsInntektsmelding;
 import no.nav.dolly.domain.resultset.inntektstub.InntektMultiplierWrapper;
 import no.nav.dolly.domain.resultset.inst.RsInstdata;
+import no.nav.dolly.domain.resultset.inst.RsInstdataKdi;
+import no.nav.dolly.domain.resultset.kelvinaap.RsKelvinAapRequestDTO;
 import no.nav.dolly.domain.resultset.kontoregister.BankkontoData;
 import no.nav.dolly.domain.resultset.krrstub.RsDigitalKontaktdata;
 import no.nav.dolly.domain.resultset.medl.RsMedl;
@@ -48,6 +50,8 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class BestillingDokument implements Persistable<Long> {
 
+    // Legg til system som skal indekseres for soek vha OpenSearch
+
     @Id
     private Long id;
 
@@ -60,6 +64,8 @@ public class BestillingDokument implements Persistable<Long> {
     private RsMedl medl;
 
     private List<RsInstdata> instdata;
+
+    private RsInstdataKdi instdataKdi;
 
     private List<RsAareg> aareg;
 
@@ -107,6 +113,8 @@ public class BestillingDokument implements Persistable<Long> {
 
     private RsNomData nomdata;
 
+    private RsKelvinAapRequestDTO kelvinAap;
+
     @Transient
     @JsonIgnore
     private boolean ignore;

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

@@ -45,6 +45,7 @@ public static void addFagsystemQuery(BoolQuery.Builder queryBuilder, ElasticType
             case INNTK -> mustExistQuery(queryBuilder, "inntektstub");
             case INNTKMELD -> mustExistQuery(queryBuilder, "inntektsmelding");
             case INSTDATA -> mustExistQuery(queryBuilder, "instdata");
+            case INSTDATA_KDI -> mustExistQuery(queryBuilder, "instdataKdi");
             case KELVIN_AAP -> mustExistQuery(queryBuilder, "kelvinAap");
             case KRRSTUB -> mustExistQuery(queryBuilder, "krrstub");
             case MEDL -> mustExistQuery(queryBuilder, "medl");

libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/dollysearchservice/v1/ElasticTyper.java

@@ -26,6 +26,7 @@ public enum ElasticTyper {
     INNTK("Inntektskomponenten/stub (INNTK)", false),
     INNTKMELD("Inntektsmelding (ALTINN/JOARK)", true),
     INSTDATA("Institusjonsopphold", true),
+    INSTDATA_KDI("Institusjonsopphold fengsel (KDI)", true),
     KELVIN_AAP("Kelvin AAP-ytelse", false),
     KRRSTUB("Kontakt- og reservasjonsregister-stub", false),
     MEDL("Medlemskap (MEDL)", false),