diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java index 7ea2d11..f96f02e 100644 --- a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java +++ b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java @@ -37,6 +37,7 @@ public Mono map(Long sourceApplicationId, IncomingInstance incom private static Map toValuePerKey(IncomingInstance incomingInstance, UUID uuid) { + assert incomingInstance.getTilleggsinformasjon() != null; return Stream.of( Map.entry("personaliaFodselsnummer", incomingInstance.getPersonalia().getFodselsnummer()), Map.entry("personaliaFornavn", incomingInstance.getPersonalia().getFornavn()), @@ -54,7 +55,14 @@ private static Map toValuePerKey(IncomingInstance incomingInstan Map.entry("dokumentDato", incomingInstance.getDokument().getDato()), Map.entry("dokumentFilnavn", incomingInstance.getDokument().getFilnavn()), Map.entry("dokumentFormat", incomingInstance.getDokument().getFormat()), - Map.entry("dokumentFil", uuid.toString())) + Map.entry("dokumentFil", uuid.toString()), + + Map.entry("tilleggsinformasjonSkolear", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getSkolear() : ""), + Map.entry("tilleggsinformasjonSkolenummer", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getSkolenummer() : ""), + Map.entry("tilleggsinformasjonSkolenavn", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getSkolenavn() : ""), + Map.entry("tilleggsinformasjonProgramomradekode", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getProgramomradekode() : ""), + Map.entry("tilleggsinformasjonProgramomradenavn", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getProgramomradenavn() : ""), + Map.entry("tilleggsinformasjonSokertype", incomingInstance.getTilleggsinformasjon() != null ? incomingInstance.getTilleggsinformasjon().getSokertype() : "")) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } diff --git a/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java b/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java index 43cb8f1..9754baf 100644 --- a/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java +++ b/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java @@ -17,11 +17,9 @@ public InstanceProcessor incomingInstanceProcessor( IncomingInstanceMappingService incomingInstanceMappingService ) { return instanceProcessorFactoryService.createInstanceProcessor( - incommingInstance -> Optional.ofNullable(incommingInstance.getDokumenttype()), + incomingInstance -> Optional.ofNullable(incomingInstance.getDokumenttype()), incomingInstance -> Optional.ofNullable(incomingInstance.getInstansId()), incomingInstanceMappingService ); } - - } diff --git a/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java index 9a97eaa..1b3994a 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java @@ -21,4 +21,5 @@ public class IncomingInstance { private final Kontaktinformasjon kontaktinformasjon; private final Inntaksadresse inntaksadresse; private final Dokument dokument; + private final Tilleggsinformasjon tilleggsinformasjon; } diff --git a/src/main/java/no/fintlabs/instance/gateway/model/vigo/Tilleggsinformasjon.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Tilleggsinformasjon.java new file mode 100644 index 0000000..cfdd1ca --- /dev/null +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Tilleggsinformasjon.java @@ -0,0 +1,20 @@ +package no.fintlabs.instance.gateway.model.vigo; + +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.extern.jackson.Jacksonized; + +@Getter +@Jacksonized +@EqualsAndHashCode +@Builder +public class Tilleggsinformasjon { + + private String skolear; + private String skolenummer; + private String skolenavn; + private String programomradekode; + private String programomradenavn; + private String sokertype; +} diff --git a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java index d917907..afba7de 100644 --- a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java +++ b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java @@ -95,6 +95,15 @@ private IncomingInstance createValidIncomingInstance() { .filnavn("dokument.pdf") .format("text/plain") .build()) + + .tilleggsinformasjon(Tilleggsinformasjon.builder() + .skolear("2024/2025") + .skolenummer("1") + .skolenavn("Oslo katedralskole") + .programomradekode("LA1") + .programomradenavn("Latin") + .sokertype("Ordinær") + .build()) .build(); } } \ No newline at end of file