navikt
diff --git a/‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/organisasjonforvalter/OrganisasjonClient.java‎
Lines changed: 4 additions & 1 deletion b/‎apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/organisasjonforvalter/OrganisasjonClient.java‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/Bestilling.java‎
Lines changed: 3 additions & 0 deletions b/‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/jpa/Bestilling.java‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java‎
Lines changed: 47 additions & 4 deletions b/‎apps/dolly-backend/src/main/java/no/nav/dolly/mapper/strategy/BestillingStatusMappingStrategy.java‎
Lines changed: 47 additions & 4 deletions
diff --git a/‎apps/dolly-backend/src/main/java/no/nav/dolly/provider/BestillingController.java‎
Lines changed: 11 additions & 5 deletions b/‎apps/dolly-backend/src/main/java/no/nav/dolly/provider/BestillingController.java‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎apps/dolly-backend/src/main/java/no/nav/dolly/provider/OrganisasjonController.java‎
Lines changed: 2 additions & 0 deletions b/‎apps/dolly-backend/src/main/java/no/nav/dolly/provider/OrganisasjonController.java‎
Lines changed: 2 additions & 0 deletions
@@ -86,7 +86,10 @@ public Mono<Void> gjenopprett(DeployRequest request, OrganisasjonBestilling best
                         .organisasjonsforvalterStatus(miljoer.stream().map(env -> env + ":Deployer").collect(Collectors.joining(",")))
                         .build())
                 .doOnNext(saved -> bestillingEventPublisher.publishOrg(bestilling.getId()))
-                .then(deployOrganisasjon(request.getOrgnumre(), bestilling, miljoer));
+                .then(deployOrganisasjon(request.getOrgnumre(), bestilling, miljoer))
+                .onErrorResume(throwable ->
+                        organisasjonBestillingService.setBestillingFeil(bestilling.getId(), errorStatusDecoder.decodeThrowable(throwable))
+                                .then(organisasjonProgressService.setBestillingFeil(bestilling.getId(), errorStatusDecoder.decodeThrowable(throwable))));
     }
 
     public void release(List<String> ignored) {
 
@@ -86,6 +86,9 @@ public class Bestilling implements Serializable {
     @Column("nav_syntetisk_ident")
     private Boolean navSyntetiskIdent;
 
+    @Transient
+    private String utlededeFagsystemer;
+
     @Transient
     private List<BestillingProgress> progresser;
 
 
@@ -8,15 +8,21 @@
 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.BestilteKriterier;
+import no.nav.dolly.domain.resultset.RsStatusRapport;
 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 no.nav.dolly.util.UtledFagsystemUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ResponseStatusException;
 import tools.jackson.core.JacksonException;
 import tools.jackson.databind.ObjectMapper;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import static java.util.Objects.isNull;
 import static no.nav.dolly.bestilling.service.DollyBestillingService.getEnvironments;
 import static no.nav.dolly.mapper.AnnenFeilStatusMapper.buildAnnenFeilStatusMap;
@@ -50,6 +56,7 @@
 import static no.nav.dolly.mapper.BestillingUdiStubStatusMapper.buildUdiStubStatusMap;
 import static no.nav.dolly.mapper.BestillingYrkesskadeStatusMapper.buildYrkesskadeStatusMap;
 import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Slf4j
 @Component
@@ -67,11 +74,10 @@ public void register(MapperFactory factory) {
                     public void mapAtoB(Bestilling bestilling, RsBestillingStatus bestillingStatus, MappingContext context) {
 
                         var ident = (String) context.getProperty("ident");
+                        var bestKriterierJson = getBestKriterierJson(bestilling);
+
                         try {
-                            bestillingStatus.setBestilling(
-                                    objectMapper.readTree(isNull(bestilling.getBestKriterier()) ||
-                                            EMPTY_JSON.equals(bestilling.getBestKriterier()) ? EMPTY_JSON :
-                                            bestilling.getBestKriterier()));
+                            bestillingStatus.setBestilling(objectMapper.readTree(bestKriterierJson));
                         } catch (JacksonException e) {
                             throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, e.getOriginalMessage());
                         }
@@ -118,6 +124,12 @@ public void mapAtoB(Bestilling bestilling, RsBestillingStatus bestillingStatus,
                         bestillingStatus.getStatus().addAll(buildTpsMessagingStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildAnnenFeilStatusMap(progresser));
                         bestillingStatus.getStatus().addAll(buildKelvinAapStatusMap(progresser));
+
+                        if (!bestilling.isFerdig()) {
+                            utledFagsystemer(bestillingStatus, bestKriterierJson, bestilling);
+                        }
+
+                        UtledFagsystemUtil.sortStatusList(bestillingStatus.getStatus(), RsStatusRapport::getId);
                     }
                 })
                 .exclude("bruker")
@@ -136,4 +148,35 @@ public void mapAtoB(OrganisasjonBestilling bestilling, RsBestillingStatus bestil
                 .register();
 
     }
+
+    private String getBestKriterierJson(Bestilling bestilling) {
+
+        return isNull(bestilling.getBestKriterier()) || EMPTY_JSON.equals(bestilling.getBestKriterier())
+                ? EMPTY_JSON
+                : bestilling.getBestKriterier();
+    }
+
+    private void utledFagsystemer(RsBestillingStatus bestillingStatus, String bestKriterierJson, Bestilling bestilling) {
+
+        try {
+            var utledteFagsystemer = isNotBlank(bestilling.getUtlededeFagsystemer())
+                    ? UtledFagsystemUtil.deserialize(bestilling.getUtlededeFagsystemer())
+                    : UtledFagsystemUtil.resolve(objectMapper.readValue(bestKriterierJson, BestilteKriterier.class), bestilling);
+
+            var eksisterendeIds = bestillingStatus.getStatus().stream()
+                    .map(RsStatusRapport::getId)
+                    .collect(Collectors.toSet());
+
+            utledteFagsystemer.stream()
+                    .filter(type -> !eksisterendeIds.contains(type))
+                    .map(type -> RsStatusRapport.builder()
+                            .id(type)
+                            .navn(type.getBeskrivelse())
+                            .statuser(List.of())
+                            .build())
+                    .forEach(bestillingStatus.getStatus()::add);
+        } catch (JacksonException e) {
+            log.warn("Kunne ikke utlede fagsystemer fra bestKriterier: {}", e.getOriginalMessage());
+        }
+    }
 }
@@ -30,9 +30,11 @@
 import java.time.Duration;
 import java.util.Set;
 
+import static java.util.Objects.nonNull;
 import static no.nav.dolly.config.CachingConfig.CACHE_BESTILLING;
 import static no.nav.dolly.config.CachingConfig.CACHE_GRUPPE;
 import static org.apache.commons.lang3.BooleanUtils.isTrue;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Slf4j
 @Transactional
@@ -144,7 +146,7 @@ public Mono<RsBestillingStatus> gjenopprettBestilling(@PathVariable("bestillingI
     public Flux<ServerSentEvent<RsBestillingStatus>> streamBestillingStatus(
             @PathVariable("bestillingId") Long bestillingId) {
 
-        return bestillingService.fetchBestillingById(bestillingId)
+        return bestillingService.fetchBestillingByIdMedUtlededeFagsystemer(bestillingId)
                 .map(bestilling -> mapperFacade.map(bestilling, RsBestillingStatus.class))
                 .flatMapMany(initial -> {
                     var initialSse = toBestillingSse(initial);
@@ -155,7 +157,7 @@ public Flux<ServerSentEvent<RsBestillingStatus>> streamBestillingStatus(
 
                     var updates = bestillingEventPublisher.subscribe(bestillingId)
                             .sample(Duration.ofMillis(200))
-                            .concatMap(id -> bestillingService.fetchBestillingById(bestillingId)
+                            .concatMap(id -> bestillingService.fetchBestillingByIdMedUtlededeFagsystemer(bestillingId)
                                     .map(bestilling -> mapperFacade.map(bestilling, RsBestillingStatus.class))
                                     .timeout(Duration.ofSeconds(5))
                                     .onErrorResume(e -> {
@@ -164,7 +166,7 @@ public Flux<ServerSentEvent<RsBestillingStatus>> streamBestillingStatus(
                                     }));
 
                     var fallbackCheck = Flux.interval(Duration.ofSeconds(3), Duration.ofSeconds(3))
-                            .concatMap(tick -> bestillingService.fetchBestillingById(bestillingId)
+                            .concatMap(tick -> bestillingService.fetchBestillingByIdMedUtlededeFagsystemer(bestillingId)
                                     .map(bestilling -> mapperFacade.map(bestilling, RsBestillingStatus.class))
                                     .timeout(Duration.ofSeconds(5))
                                     .onErrorResume(e -> Mono.empty()));
@@ -181,8 +183,12 @@ private String statusFingerprint(RsBestillingStatus status) {
         return status.isFerdig() + ":"
                 + status.getAntallLevert() + ":"
                 + status.getSistOppdatert() + ":"
-                + (status.getFeil() != null ? status.getFeil().length() : 0) + ":"
-                + status.getStatus().size();
+                + (isNotBlank(status.getFeil()) ? status.getFeil().length() : 0) + ":"
+                + status.getStatus().stream()
+                        .map(s -> s.getId() + "=" + (nonNull(s.getStatuser()) && !s.getStatuser().isEmpty()
+                                ? s.getStatuser().getFirst().getMelding()
+                                : ""))
+                        .collect(java.util.stream.Collectors.joining(","));
     }
 
     private ServerSentEvent<RsBestillingStatus> toBestillingSse(RsBestillingStatus status) {
 
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import no.nav.dolly.bestilling.organisasjonforvalter.OrganisasjonClient;
 import no.nav.dolly.bestilling.organisasjonforvalter.domain.DeployRequest;
 import no.nav.dolly.bestilling.organisasjonforvalter.domain.OrganisasjonDetaljer;
@@ -21,6 +22,7 @@
 
 import static no.nav.dolly.provider.OrganisasjonBestillingController.getStatus;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "api/v1/organisasjon")