feature: Add tidspunkt field to InstdataKdiDTO and update related classes for improved event handling

krharum · krharum · commit 3fca3b4297c6 · 2026-05-29T08:50:47.000+02:00
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/InstdataClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/InstdataClient.java
@@ -60,19 +60,18 @@ private Mono<String> doInstKdiBestilling(RsDollyUtvidetBestilling bestilling, Do
 
         return Mono.just(bestilling)
                 .filter(bestilling1 -> nonNull(bestilling1.getInstdataKdi()))
-                .flatMap(bestilling1 -> instdataConsumer.getMiljoer())
-                .flatMapMany(miljoer -> Flux.fromIterable(miljoer.getKdiEnvironments())
-                        .filter(miljoe -> bestilling.getEnvironments().contains(miljoe))
-                        .flatMap(miljoe -> instKdiHendelseService.getOppdaterBestilling(bestilling, bestillingId,
-                                        dollyPerson.getIdent(), miljoe, isOpprettEndre)
-                                .map(instKdiData -> {
+                .flatMap(bestilling1 -> instKdiHendelseService.getOppdaterBestilling(bestilling1, bestillingId, isOpprettEndre))
+                .flatMap(instKdiData -> instdataConsumer.getMiljoer()
+                        .flatMapMany(miljoer -> Flux.fromIterable(miljoer.getKdiEnvironments())
+                                .filter(miljoe -> bestilling.getEnvironments().contains(miljoe))
+                                .map(miljoe -> {
                                     var context = MappingContextUtils.getMappingContext();
                                     context.setProperty("ident", dollyPerson.getIdent());
                                     context.setProperty("miljoe", miljoe);
                                     return mapperFacade.map(instKdiData, InstdataKdiDTO.class, context);
                                 }))
-                        .flatMap(instKdiRequest -> postInstdataKdi(instKdiRequest, dollyPerson.getIdent())))
-                .collect(Collectors.joining(","));
+                        .flatMap(instKdiRequest -> postInstdataKdi(instKdiRequest, dollyPerson.getIdent()))
+                        .collect(Collectors.joining(",")));
     }
 
     private Flux<String> doInst2Bestilling(RsDollyUtvidetBestilling bestilling, DollyPerson dollyPerson, boolean isOpprettEndre) {
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/InstdataConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/InstdataConsumer.java
@@ -6,7 +6,6 @@
 import no.nav.dolly.bestilling.instdata.command.InstdataGetCommand;
 import no.nav.dolly.bestilling.instdata.command.InstdataGetMiljoerCommand;
 import no.nav.dolly.bestilling.instdata.command.InstdataKdiDeleteCommand;
-import no.nav.dolly.bestilling.instdata.command.InstdataKdiGetCommand;
 import no.nav.dolly.bestilling.instdata.command.InstdataKdiPostCommand;
 import no.nav.dolly.bestilling.instdata.command.InstdataPostCommand;
 import no.nav.dolly.bestilling.instdata.domain.InstdataKdiDTO;
@@ -60,14 +59,6 @@ public Mono<InstdataResponse> getInstdata(String ident, String environment) {
                 .flatMap(token -> new InstdataGetCommand(webClient, ident, environment, token.getTokenValue()).call());
     }
 
-    @Timed(name = "providers", tags = {"operation", "inst_getInstdata"})
-    public Mono<InstdataKdiResponse> getInstdataKdi(String ident, String environment) {
-
-        return tokenService.exchange(serverProperties)
-                .flatMap(token -> new InstdataKdiGetCommand(webClient, ident, environment, token.getTokenValue()).call())
-                .doOnNext(response -> log.info("Instdata KDI hentet for ident {} i miljø {}: {}", ident, environment, response));
-    }
-
     @Timed(name = "providers", tags = {"operation", "inst_deleteInstdata"})
     public Mono<List<InstdataResponse>> deleteInstdata(List<String> identer) {
 
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataKdiGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/command/InstdataKdiGetCommand.java
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/domain/InstdataKdiDTO.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/domain/InstdataKdiDTO.java
@@ -9,11 +9,8 @@
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
-import static java.util.Objects.isNull;
-
 @Data
 @Builder
 @NoArgsConstructor
@@ -35,54 +32,6 @@ public static class Data {
         private List<AvbruddSlutt> avbruddSlutt;
         private List<ForventetLoeslatelse> forventetLoeslatelse;
         private List<Annullering> annullering;
-
-        public List<Innsettelse> getInnsettelse() {
-
-            if (isNull(innsettelse)) {
-                innsettelse = new ArrayList<>();
-            }
-            return innsettelse;
-        }
-
-        public List<Loeslatelse> getLoeslatelse() {
-
-            if (isNull(loeslatelse)) {
-                loeslatelse = new ArrayList<>();
-            }
-            return loeslatelse;
-        }
-
-        public List<AvbruddStart> getAvbruddStart() {
-
-            if (isNull(avbruddStart)) {
-                avbruddStart = new ArrayList<>();
-            }
-            return avbruddStart;
-        }
-
-        public List<AvbruddSlutt> getAvbruddSlutt() {
-
-            if (isNull(avbruddSlutt)) {
-                avbruddSlutt = new ArrayList<>();
-            }
-            return avbruddSlutt;
-        }
-
-        public List<ForventetLoeslatelse> getForventetLoeslatelse() {
-
-            if (isNull(forventetLoeslatelse)) {
-                forventetLoeslatelse = new ArrayList<>();
-            }
-            return forventetLoeslatelse;
-        }
-
-        public List<Annullering> getAnnullering() {
-
-            if (isNull(annullering)) {
-                annullering = new ArrayList<>();
-            }
-            return annullering;
-        }
     }
 
     @lombok.Data
@@ -95,6 +44,7 @@ public static class Innsettelse extends Hendelse{
 
         private String kategori;
         private String organisasjonsnummer;
+        private LocalDateTime tidspunkt;
     }
 
     @lombok.Data
@@ -109,6 +59,7 @@ public static class Loeslatelse extends Hendelse{
         private String organisasjonsnummer;
         private Boolean erOverfoertTilUtlandskfengsel;
         private Boolean erOverfoertTilVaretektMedElektroniskKontroll;
+        private LocalDateTime tidspunkt;
     }
 
     @lombok.Data
@@ -122,6 +73,7 @@ public static class AvbruddStart extends Hendelse{
         private String kategori;
         private String organisasjonsnummer;
         private LocalDateTime forventetAvbruddSluttTidspunkt;
+        private LocalDateTime tidspunkt;
     }
 
     @lombok.Data
@@ -134,6 +86,7 @@ public static class AvbruddSlutt extends Hendelse {
 
         private String kategori;
         private String organisasjonsnummer;
+        private LocalDateTime tidspunkt;
     }
 
     @lombok.Data
@@ -145,17 +98,18 @@ public static class AvbruddSlutt extends Hendelse {
     public static class ForventetLoeslatelse extends Hendelse{
 
         private String innmeldingHendelseId;
+        private LocalDateTime tidspunkt;
     }
 
     @lombok.Data
+    @ToString(callSuper = true)
+    @EqualsAndHashCode(callSuper = true)
     @SuperBuilder
     @NoArgsConstructor
     @AllArgsConstructor
-    public static class Annullering {
+    public static class Annullering extends Hendelse {
 
-        private String hendelseId;
-        private LocalDateTime publiseringstidspunkt;
-        private String norskident;
+        private LocalDateTime annullertMeldingId;
     }
 
     @lombok.Data
@@ -164,9 +118,9 @@ public static class Annullering {
     @AllArgsConstructor
     public abstract static class Hendelse {
 
+        private String meldingId;
         private String hendelseId;
         private LocalDateTime publiseringstidspunkt;
         private String norskident;
-        private LocalDateTime tidspunkt;
     }
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/service/InstKdiHendelseService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/service/InstKdiHendelseService.java
@@ -1,21 +1,20 @@
 package no.nav.dolly.bestilling.instdata.service;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.dolly.bestilling.instdata.InstdataConsumer;
-import no.nav.dolly.bestilling.instdata.domain.InstdataKdiDTO;
-import no.nav.dolly.bestilling.instdata.domain.InstdataKdiResponse;
 import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling;
 import no.nav.dolly.domain.resultset.inst.RsInstdataKdi;
 import no.nav.dolly.service.TransactionHelperService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.List;
-import java.util.stream.Stream;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static java.util.Objects.isNull;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 @Service
 @RequiredArgsConstructor
@@ -27,43 +26,27 @@ public class InstKdiHendelseService {
     private static final String LOESLATELSE = "D";
     private static final String FORVENTET_LOESLATELSE = "E";
 
-    private final InstdataConsumer instdataConsumer;
     private final TransactionHelperService transactionHelperService;
 
-    public Mono<RsInstdataKdi> getOppdaterBestilling(RsDollyUtvidetBestilling bestilling, Long bestillingId, String ident, String miljoe, boolean isOpprettEndre) {
+    public Mono<RsInstdataKdi> getOppdaterBestilling(RsDollyUtvidetBestilling bestilling, Long bestillingId, boolean isOpprettEndre) {
 
-        if (isOpprettEndre || hasEmptyHendelseId(bestilling.getInstdataKdi())) {
-
-            return instdataConsumer.getInstdataKdi(ident, miljoe)
-                    .filter(response -> response.getStatus().is2xxSuccessful())
-                    .map(instdataKdiResponse -> getOppdaterBestilling(instdataKdiResponse, bestilling.getInstdataKdi(), bestillingId))
+        if (isOpprettEndre) {
+            return Mono.just(getOppdaterBestilling(bestilling.getInstdataKdi(), bestillingId))
                     .doOnNext(bestilling::setInstdataKdi)
                     .flatMap(oppdaterBestilling -> transactionHelperService.persister(bestillingId, bestilling)
                             .then(Mono.just(oppdaterBestilling)));
-
         } else {
             return Mono.just(bestilling.getInstdataKdi());
         }
     }
 
-    private RsInstdataKdi getOppdaterBestilling(InstdataKdiResponse instdataKdiResponse, RsInstdataKdi bestilling, Long bestillingId) {
-
-        var kdidata = instdataKdiResponse.getInstdataKdi().getData();
-
-        var annuleringer = kdidata.getAnnullering().stream()
-                .map(InstdataKdiDTO.Annullering::getHendelseId)
-                .toList();
+    private RsInstdataKdi getOppdaterBestilling(RsInstdataKdi bestilling, Long bestillingId) {
 
-        oppdaterHendelser(bestilling.getInnsettelse(), getHendelseId(kdidata.getInnsettelse(),
-                INNSETTELSE, bestillingId, annuleringer));
-        oppdaterHendelser(bestilling.getAvbruddStart(), getHendelseId(kdidata.getAvbruddStart(),
-                AVBRUDD_START, bestillingId, annuleringer));
-        oppdaterHendelser(bestilling.getAvbruddSlutt(), getHendelseId(kdidata.getAvbruddSlutt(),
-                AVBRUDD_SLUTT, bestillingId, annuleringer));
-        oppdaterHendelser(bestilling.getLoeslatelse(), getHendelseId(kdidata.getLoeslatelse(),
-                LOESLATELSE, bestillingId, annuleringer));
-        oppdaterHendelser(bestilling.getForventetLoeslatelse(), getHendelseId(kdidata.getForventetLoeslatelse(),
-                FORVENTET_LOESLATELSE, bestillingId, annuleringer));
+        oppdaterHendelser(bestilling.getInnsettelse(), INNSETTELSE, bestillingId);
+        oppdaterHendelser(bestilling.getAvbruddStart(), AVBRUDD_START, bestillingId);
+        oppdaterHendelser(bestilling.getAvbruddSlutt(), AVBRUDD_SLUTT, bestillingId);
+        oppdaterHendelser(bestilling.getLoeslatelse(), LOESLATELSE, bestillingId);
+        oppdaterHendelser(bestilling.getForventetLoeslatelse(), FORVENTET_LOESLATELSE, bestillingId);
 
         bestilling.getAnnullering()
                 .forEach(annulering -> annulering.setPubliseringstidspunkt(
@@ -73,50 +56,26 @@ private RsInstdataKdi getOppdaterBestilling(InstdataKdiResponse instdataKdiRespo
         return bestilling;
     }
 
-    private static boolean hasEmptyHendelseId(RsInstdataKdi instdataKdi) {
-
-        return Stream.of(instdataKdi.getInnsettelse(), instdataKdi.getAvbruddStart(),
-                        instdataKdi.getAvbruddSlutt(), instdataKdi.getLoeslatelse(),
-                        instdataKdi.getForventetLoeslatelse())
-                .flatMap(Collection::stream)
-                .anyMatch(hendelse -> isNull(hendelse.getHendelseId()));
-    }
-
-    private static String getHendelseId(List<? extends InstdataKdiDTO.Hendelse> hendelser,
-                                        String type,
-                                        Long bestillingId,
-                                        List<String> annuleringer) {
+    private static void oppdaterHendelser(List<? extends RsInstdataKdi.Hendelse> hendelser, String type, Long bestillingId) {
 
-        var hendelseId = getHendelseId(hendelser, type, bestillingId);
+        var loepenummer = new AtomicInteger(1);
 
-        return !annuleringer.contains(hendelseId) ? hendelseId : getNextHendelseId(hendelseId);
-    }
-
-    private static String getNextHendelseId(String hendelseId) {
+        hendelser.forEach(hendelse -> {
 
-        return hendelseId.substring(0, 21) + String.format("%010d", Long.parseLong(hendelseId.substring(21)) + 1);
+            if (StringUtils.isBlank(hendelse.getMeldingId())) {
+                hendelse.setMeldingId(UUID.randomUUID().toString());
+            }
+            if (isBlank(hendelse.getHendelseId())) {
+                hendelse.setHendelseId(makeHendelseId(bestillingId, type, loepenummer.getAndIncrement()));
+            }
+            if (isNull(hendelse.getPubliseringstidspunkt())) {
+                hendelse.setPubliseringstidspunkt(LocalDateTime.now());
+            }
+        });
     }
 
     private static String makeHendelseId(Long bestillingId, String type, Integer loepenummer) {
 
         return "0x%010d00000%s00%010d".formatted(bestillingId, type, loepenummer);
     }
-
-    private static String getHendelseId(List<? extends InstdataKdiDTO.Hendelse> hendelser, String type, Long bestillingId) {
-
-        return hendelser.stream()
-                .map(InstdataKdiDTO.Hendelse::getHendelseId)
-                .max(String::compareTo)
-                .orElse(makeHendelseId(bestillingId, type, 1));
-    }
-
-    private static void oppdaterHendelser(List<? extends RsInstdataKdi.Hendelse> hendelser, String hendelseId) {
-
-        hendelser.forEach(hendelse -> {
-            hendelse.setHendelseId(hendelseId);
-            if (isNull(hendelse.getPubliseringstidspunkt())) {
-                hendelse.setPubliseringstidspunkt(LocalDateTime.now());
-            }
-        });
-    }
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdataKdi.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/inst/RsInstdataKdi.java
@@ -150,8 +150,7 @@ public static class ForventetLoeslatelse extends Hendelse {
     @AllArgsConstructor
     public static class Annullering extends Hendelse {
 
-        private String hendelseId;
-        private LocalDateTime publiseringstidspunkt;
+        private String annullertMeldingId;
     }
 
     @lombok.Data
@@ -160,6 +159,7 @@ public static class Annullering extends Hendelse {
     @AllArgsConstructor
     public abstract static class Hendelse {
 
+        private String meldingId;
         private String hendelseId;
         private LocalDateTime publiseringstidspunkt;
     }

Original file line number	Diff line number	Diff line change
`@@ -150,8 +150,7 @@ public static class ForventetLoeslatelse extends Hendelse {`
`150`	`150`	`@AllArgsConstructor`
`151`	`151`	`public static class Annullering extends Hendelse {`
`152`	`152`
`153`		`- private String hendelseId;`
`154`		`- private LocalDateTime publiseringstidspunkt;`
	`153`	`+ private String annullertMeldingId;`
`155`	`154`	`}`
`156`	`155`
`157`	`156`	`@lombok.Data`
`@@ -160,6 +159,7 @@ public static class Annullering extends Hendelse {`
`160`	`159`	`@AllArgsConstructor`
`161`	`160`	`public abstract static class Hendelse {`
`162`	`161`
	`162`	`+ private String meldingId;`
`163`	`163`	`private String hendelseId;`
`164`	`164`	`private LocalDateTime publiseringstidspunkt;`
`165`	`165`	`}`