Add MalBestilling functionality

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

@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}

apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java

@@ -17,6 +17,7 @@
 public class CachingConfig {
 
     public static final String CACHE_BESTILLING = "bestilling";
+    public static final String CACHE_BESTILLING_MAL = "bestilling-mal";
     public static final String CACHE_BRUKER = "bruker";
     public static final String CACHE_GRUPPE = "gruppe";
     public static final String CACHE_HELSEPERSONELL = "helsepersonell";
@@ -25,6 +26,7 @@ public class CachingConfig {
     @Profile({ "dev", "prod" })
     public CacheManager cacheManager(Caffeine caffeine) {
         var caffeineCacheManager = new CaffeineCacheManager(CACHE_BESTILLING,
+                CACHE_BESTILLING_MAL,
                 CACHE_BRUKER,
                 CACHE_GRUPPE,
                 CACHE_HELSEPERSONELL

apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/Bruker.java

@@ -1,5 +1,6 @@
 package no.nav.dolly.domain.jpa;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -36,6 +37,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Table(name = "BRUKER")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Bruker implements Serializable {
 
     @Id

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsBestillingStatus.java

@@ -1,32 +1,12 @@
 package no.nav.dolly.domain.resultset.entity.bestilling;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import no.nav.dolly.domain.resultset.RsStatusRapport;
-import no.nav.dolly.domain.resultset.aareg.RsAareg;
-import no.nav.dolly.domain.resultset.arenaforvalter.Arenadata;
-import no.nav.dolly.domain.resultset.breg.RsBregdata;
-import no.nav.dolly.domain.resultset.dokarkiv.RsDokarkiv;
 import no.nav.dolly.domain.resultset.entity.bruker.RsBrukerUtenFavoritter;
-import no.nav.dolly.domain.resultset.histark.RsHistark;
-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.kontoregister.BankkontoData;
-import no.nav.dolly.domain.resultset.krrstub.RsDigitalKontaktdata;
-import no.nav.dolly.domain.resultset.medl.RsMedl;
-import no.nav.dolly.domain.resultset.pdldata.PdlPersondata;
-import no.nav.dolly.domain.resultset.pensjon.PensjonData;
-import no.nav.dolly.domain.resultset.sigrunstub.RsLignetInntekt;
-import no.nav.dolly.domain.resultset.sigrunstub.RsPensjonsgivendeForFolketrygden;
-import no.nav.dolly.domain.resultset.skjerming.RsSkjerming;
-import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
-import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging;
-import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson;
-import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -39,7 +19,6 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
 @Builder
 public class RsBestillingStatus {
 
@@ -58,7 +37,7 @@ public class RsBestillingStatus {
     private Long opprettetFraId;
     private Long opprettetFraGruppeId;
     private Long gjenopprettetFraIdent;
-    private RsBestilling bestilling;
+    private JsonNode bestilling;
     private String opprettFraIdenter;
 
     public Set<String> getEnvironments() {
@@ -74,36 +53,4 @@ public List<RsStatusRapport> getStatus() {
         }
         return status;
     }
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public static class RsBestilling {
-
-        private Boolean navSyntetiskIdent;
-        private List<String> importFraPdl;
-        private String kildeMiljoe;
-        private RsDigitalKontaktdata krrstub;
-        private List<RsInstdata> instdata;
-        private List<RsAareg> aareg;
-        private List<RsLignetInntekt> sigrunstub;
-        private List<RsPensjonsgivendeForFolketrygden> sigrunstubPensjonsgivende;
-        private InntektMultiplierWrapper inntektstub;
-        private Arenadata arenaforvalter;
-        private RsUdiPerson udistub;
-        private PensjonData pensjonforvalter;
-        private RsInntektsmelding inntektsmelding;
-        private RsBregdata brregstub;
-        private RsDokarkiv dokarkiv;
-        private RsMedl medl;
-        private RsHistark histark;
-        private RsSykemelding sykemelding;
-        private PdlPersondata pdldata;
-        private RsTpsMessaging tpsMessaging;
-        private BankkontoData bankkonto;
-        private RsSkjerming skjerming;
-        private ArbeidsplassenCVDTO arbeidsplassenCV;
-    }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestilling.java

@@ -0,0 +1,24 @@
+package no.nav.dolly.domain.resultset.entity.bestilling;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import no.nav.dolly.domain.resultset.entity.bruker.RsBrukerUtenFavoritter;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class RsMalBestilling {
+
+    private Long id;
+    private JsonNode bestilling;
+    private String miljoer;
+    private String malNavn;
+    private RsBrukerUtenFavoritter bruker;
+    private LocalDateTime sistOppdatert;
+}

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/entity/bestilling/RsMalBestillingWrapper.java

@@ -1,36 +1,13 @@
 package no.nav.dolly.domain.resultset.entity.bestilling;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import no.nav.dolly.domain.resultset.aareg.RsAareg;
-import no.nav.dolly.domain.resultset.arenaforvalter.Arenadata;
-import no.nav.dolly.domain.resultset.breg.RsBregdata;
-import no.nav.dolly.domain.resultset.dokarkiv.RsDokarkiv;
-import no.nav.dolly.domain.resultset.entity.bruker.RsBrukerUtenFavoritter;
-import no.nav.dolly.domain.resultset.histark.RsHistark;
-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.kontoregister.BankkontoData;
-import no.nav.dolly.domain.resultset.krrstub.RsDigitalKontaktdata;
-import no.nav.dolly.domain.resultset.medl.RsMedl;
-import no.nav.dolly.domain.resultset.pdldata.PdlPersondata;
-import no.nav.dolly.domain.resultset.pensjon.PensjonData;
-import no.nav.dolly.domain.resultset.sigrunstub.RsLignetInntekt;
-import no.nav.dolly.domain.resultset.sigrunstub.RsPensjonsgivendeForFolketrygden;
-import no.nav.dolly.domain.resultset.skjerming.RsSkjerming;
-import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
-import no.nav.dolly.domain.resultset.tpsmessagingservice.RsTpsMessaging;
-import no.nav.dolly.domain.resultset.udistub.model.RsUdiPerson;
-import no.nav.testnav.libs.data.arbeidsplassencv.v1.ArbeidsplassenCVDTO;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
 
 import static java.util.Objects.isNull;
@@ -51,52 +28,4 @@ public Map<String, List<RsMalBestilling>> getMalbestillinger() {
         }
         return malbestillinger;
     }
-
-    @Getter
-    @Setter
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public static class RsMalBestilling {
-
-        private Long id;
-        private String malNavn;
-        private RsBestilling bestilling;
-        private RsBrukerUtenFavoritter bruker;
-    }
-
-    @Getter
-    @Setter
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public static class RsBestilling {
-
-        private Integer antallIdenter;
-        private Boolean navSyntetiskIdent;
-        private String opprettFraIdenter;
-        private Set<String> environments;
-        private PdlPersondata pdldata;
-        private RsDigitalKontaktdata krrstub;
-        private List<RsInstdata> instdata;
-        private List<RsAareg> aareg;
-        private List<RsLignetInntekt> sigrunstub;
-        private List<RsPensjonsgivendeForFolketrygden> sigrunstubPensjonsgivende;
-        private InntektMultiplierWrapper inntektstub;
-        private Arenadata arenaforvalter;
-        private RsUdiPerson udistub;
-        private RsInntektsmelding inntektsmelding;
-        private PensjonData pensjonforvalter;
-        private RsBregdata brregstub;
-        private RsDokarkiv dokarkiv;
-        private RsMedl medl;
-        private RsHistark histark;
-        private RsSykemelding sykemelding;
-        private RsTpsMessaging tpsMessaging;
-        private RsSkjerming skjerming;
-        private BankkontoData bankkonto;
-        private ArbeidsplassenCVDTO arbeidsplassenCV;
-    }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingMapper.java → apps/dolly-backend/src/main/java/no/nav/dolly/mapper/BestillingMapper.java

@@ -1,4 +1,4 @@
-package no.nav.dolly.mapper.strategy;
+package no.nav.dolly.mapper;
 
 import lombok.experimental.UtilityClass;
 import no.nav.dolly.domain.jpa.Bestilling;

apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java

@@ -1,5 +1,6 @@
 package no.nav.dolly.mapper.strategy;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -9,16 +10,14 @@
 import no.nav.dolly.domain.jpa.Bestilling;
 import no.nav.dolly.domain.jpa.BestillingProgress;
 import no.nav.dolly.domain.jpa.OrganisasjonBestilling;
-import no.nav.dolly.domain.resultset.RsDollyBestillingRequest;
 import no.nav.dolly.domain.resultset.entity.bestilling.RsBestillingStatus;
 import no.nav.dolly.domain.resultset.entity.bruker.RsBrukerUtenFavoritter;
 import no.nav.dolly.mapper.MappingStrategy;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
+import org.springframework.web.server.ResponseStatusException;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
+import static java.util.Objects.isNull;
 import static no.nav.dolly.bestilling.service.DollyBestillingService.getEnvironments;
 import static no.nav.dolly.mapper.AnnenFeilStatusMapper.buildAnnenFeilStatusMap;
 import static no.nav.dolly.mapper.ArbeidsplassenCVStatusMapper.buildArbeidsplassenCVStatusMap;
@@ -44,14 +43,13 @@
 import static no.nav.dolly.mapper.BestillingTpsMessagingStatusMapper.buildTpsMessagingStatusMap;
 import static no.nav.dolly.mapper.BestillingUdiStubStatusMapper.buildUdiStubStatusMap;
 import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class BestillingStatusMappingStrategy implements MappingStrategy {
 
-    private final JsonBestillingMapper jsonBestillingMapper;
+    private static final String EMPTY_JSON = "{}";
     private final ObjectMapper objectMapper;
 
     @Override
@@ -62,12 +60,21 @@ public void register(MapperFactory factory) {
                     public void mapAtoB(Bestilling bestilling, RsBestillingStatus bestillingStatus, MappingContext context) {
 
                         var ident = (String) context.getProperty("ident");
+                        try {
+                            bestillingStatus.setBestilling(
+                                    objectMapper.readTree(isNull(bestilling.getBestKriterier()) ||
+                                            EMPTY_JSON.equals(bestilling.getBestKriterier()) ? EMPTY_JSON :
+                                            bestilling.getBestKriterier()));
+                        } catch (JsonProcessingException e) {
+                            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
+                        }
+
+                        bestillingStatus.setBruker(mapperFacade.map(bestilling.getBruker(), RsBrukerUtenFavoritter.class));
+
                         var progresser = bestilling.getProgresser().stream()
                                 .filter(progress -> isBlank(ident) || ident.equals(progress.getIdent()))
                                 .toList();
 
-                        RsDollyBestillingRequest bestillingRequest = jsonBestillingMapper
-                                .mapBestillingRequest(bestilling.getId(), bestilling.getBestKriterier());
                         bestillingStatus.setAntallLevert((int) progresser.stream()
                                 .filter(BestillingProgress::isIdentGyldig)
                                 .count());
@@ -97,32 +104,6 @@ public void mapAtoB(Bestilling bestilling, RsBestillingStatus bestillingStatus,
                         bestillingStatus.getStatus().addAll(buildKontoregisterStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildArbeidsplassenCVStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildAnnenFeilStatusMap(progresser));
-                        bestillingStatus.setBestilling(RsBestillingStatus.RsBestilling.builder()
-                                .pdldata(bestillingRequest.getPdldata())
-                                .aareg(bestillingRequest.getAareg())
-                                .krrstub(bestillingRequest.getKrrstub())
-                                .medl(bestillingRequest.getMedl())
-                                .arenaforvalter(bestillingRequest.getArenaforvalter())
-                                .instdata(bestillingRequest.getInstdata())
-                                .inntektstub(bestillingRequest.getInntektstub())
-                                .sigrunstub(bestillingRequest.getSigrunstub())
-                                .sigrunstubPensjonsgivende(bestillingRequest.getSigrunstubPensjonsgivende())
-                                .udistub(bestillingRequest.getUdistub())
-                                .pensjonforvalter(bestillingRequest.getPensjonforvalter())
-                                .inntektsmelding(bestillingRequest.getInntektsmelding())
-                                .brregstub(bestillingRequest.getBrregstub())
-                                .dokarkiv(bestillingRequest.getDokarkiv())
-                                .histark(bestillingRequest.getHistark())
-                                .sykemelding(bestillingRequest.getSykemelding())
-                                .skjerming(bestillingRequest.getSkjerming())
-                                .tpsMessaging(bestillingRequest.getTpsMessaging())
-                                .bankkonto(bestillingRequest.getBankkonto())
-                                .arbeidsplassenCV(bestillingRequest.getArbeidsplassenCV())
-                                .importFraPdl(mapIdents(bestilling.getPdlImport()))
-                                .kildeMiljoe(bestilling.getKildeMiljoe())
-                                .navSyntetiskIdent(bestilling.getNavSyntetiskIdent())
-                                .build());
-                        bestillingStatus.setBruker(mapperFacade.map(bestilling.getBruker(), RsBrukerUtenFavoritter.class));
                     }
                 })
                 .exclude("bruker")
@@ -139,9 +120,6 @@ public void mapAtoB(OrganisasjonBestilling bestilling, RsBestillingStatus bestil
                 })
                 .byDefault()
                 .register();
-    }
 
-    private static List<String> mapIdents(String idents) {
-        return isNotBlank(idents) ? Arrays.asList(idents.split(",")) : Collections.emptyList();
     }
 }