From 4fd1a2eda541dacedd8652719b17df09850caea7 Mon Sep 17 00:00:00 2001 From: Nils-Odd Solberg Date: Thu, 30 May 2024 11:29:16 +0200 Subject: [PATCH 1/8] ARKIV-266 FINT Flyt VIGO Gateway for OFK in API. --- .github/workflows/cd.yaml | 3 ++ .../overlays/ofk-no/api/kustomization.yaml | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 kustomize/overlays/ofk-no/api/kustomization.yaml diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 3385c9a..ffd8ae0 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -53,6 +53,9 @@ jobs: - cluster: aks-beta-fint-2021-11-23 deploy-every-branch: true + - cluster: aks-api-fint-2022-02-08 + org: ofk-no + steps: - uses: actions/checkout@v4 diff --git a/kustomize/overlays/ofk-no/api/kustomization.yaml b/kustomize/overlays/ofk-no/api/kustomization.yaml new file mode 100644 index 0000000..df0bcf1 --- /dev/null +++ b/kustomize/overlays/ofk-no/api/kustomization.yaml @@ -0,0 +1,34 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: ofk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-vigo-gateway_ofk_no + fintlabs.no/org-id: ofk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "ofk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "ofk.no" + - op: add + path: "/spec/url/basePath" + value: "/ofk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/ofk-no/api/vigo" + - op: add + path: "/spec/env/-" + value: + name: "logging.level.no.fintlabs.instance.gateway" + value: "INFO" + target: + kind: Application + name: fint-flyt-vigo-gateway + From 08a03327b8a834912cea691263e0043c3c039f54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 10:54:57 +0000 Subject: [PATCH 2/8] Bump no.fintlabs:fint-flyt-resource-server from 2.0.0 to 2.1.0 Bumps no.fintlabs:fint-flyt-resource-server from 2.0.0 to 2.1.0. --- updated-dependencies: - dependency-name: no.fintlabs:fint-flyt-resource-server dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0b2f00e..e8566d6 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { implementation 'no.fintlabs:fint-flyt-kafka:3.0.2' implementation 'no.fintlabs:fint-flyt-instance-gateway:5.0.5' - implementation 'no.fintlabs:fint-flyt-resource-server:2.0.0' + implementation 'no.fintlabs:fint-flyt-resource-server:2.1.0' runtimeOnly 'io.micrometer:micrometer-registry-prometheus' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' From cd3f9aaca08df545857d791e5bc2c4be9369afba Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord Date: Fri, 7 Jun 2024 11:54:29 +0200 Subject: [PATCH 3/8] =?UTF-8?q?ARKIV-261=20Fodselsdato=20p=C3=A5=20persona?= =?UTF-8?q?lia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bruno/OTJOURNAL.bru | 78 +++++++++++++++++++ .../IncomingInstanceMappingService.java | 3 + .../gateway/model/vigo/Personalia.java | 1 + .../IncomingInstanceMappingServiceTest.java | 61 +++++++-------- 4 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 bruno/OTJOURNAL.bru diff --git a/bruno/OTJOURNAL.bru b/bruno/OTJOURNAL.bru new file mode 100644 index 0000000..eee07b4 --- /dev/null +++ b/bruno/OTJOURNAL.bru @@ -0,0 +1,78 @@ +meta { + name: OTJOURNAL + type: http + seq: 6 +} + +post { + url: https://flyt.vigoiks.no/{{env}}{{org}}/api/intern/metadata + body: json + auth: none +} + +body:json { + { + "sourceApplicationId": 4, + "sourceApplicationIntegrationId": "OTJOURNAL", + "sourceApplicationIntegrationUri": null, + "integrationDisplayName": "Arkivering fra VIGO OT", + "version": 2, + "instanceMetadata": { + "instanceValueMetadata": [], + "instanceObjectCollectionMetadata": [], + "categories": [ + { + "displayName": "Personalia", + "content": { + "instanceValueMetadata": [ + { "displayName": "Fødselsnummer", "type": "STRING", "key": "personaliaFodselsnummer" }, + { "displayName": "Fornavn", "type": "STRING", "key": "personaliaFornavn" }, + { "displayName": "Mellomnavn", "type": "STRING", "key": "personaliaMellomnavn" }, + { "displayName": "Etternavn", "type": "STRING", "key": "personaliaEtternavn" }, + { "displayName": "Fødselsdato", "type": "STRING", "key": "personaliaFodselsdato" } + ], + "instanceObjectCollectionMetadata": [], + "categories": [] + } + }, + { + "displayName": "Kontaktinformasjon", + "content": { + "instanceValueMetadata": [ + { "displayName": "Telefonnummer", "type": "STRING", "key": "kontaktinformasjonTelefonnummer" }, + { "displayName": "Epostadresse", "type": "STRING", "key": "kontaktinformasjonEpostadresse" } + ], + "instanceObjectCollectionMetadata": [], + "categories": [] + } + }, + { + "displayName": "Inntaksadresse", + "content": { + "instanceValueMetadata": [ + { "displayName": "Gateadresse", "type": "STRING", "key": "inntaksadresseGateadresse" }, + { "displayName": "Postnummer", "type": "STRING", "key": "inntaksadressePostnummer" }, + { "displayName": "Poststed", "type": "STRING", "key": "inntaksadressePoststed" } + ], + "instanceObjectCollectionMetadata": [], + "categories": [] + } + }, + { + "displayName": "Dokument", + "content": { + "instanceValueMetadata": [ + { "displayName": "Tittel", "type": "STRING", "key": "dokumentTittel" }, + { "displayName": "Dato", "type": "STRING", "key": "dokumentDato" }, + { "displayName": "Filnavn", "type": "STRING", "key": "dokumentFilnavn" }, + { "displayName": "Fil", "type": "FILE", "key": "dokumentFil" }, + { "displayName": "Format", "type": "STRING", "key": "dokumentFormat" } + ], + "instanceObjectCollectionMetadata": [], + "categories": [] + } + } + ] + } + } +} diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java index a45e465..cb87dc8 100644 --- a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java +++ b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java @@ -42,6 +42,9 @@ private static Map toValuePerKey(IncomingInstance incomingInstan entries.add(Map.entry("personaliaMellomnavn", incomingInstance.getPersonalia().getMellomnavn())); entries.add(Map.entry("personaliaEtternavn", incomingInstance.getPersonalia().getEtternavn())); + Optional.ofNullable(incomingInstance.getPersonalia().getFodselsdato()) + .ifPresent(fodselsdato -> entries.add(Map.entry("personaliaFodselsdato", fodselsdato))); + entries.add(Map.entry("kontaktinformasjonTelefonnummer", incomingInstance.getKontaktinformasjon().getTelefonnummer())); entries.add(Map.entry("kontaktinformasjonEpostadresse", incomingInstance.getKontaktinformasjon().getEpostadresse())); diff --git a/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java index ac2838a..8d98c34 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java @@ -15,4 +15,5 @@ public class Personalia { private String fornavn; private String mellomnavn; private String etternavn; + private String fodselsdato; } diff --git a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java index 45bbc4d..5702024 100644 --- a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java +++ b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java @@ -30,6 +30,7 @@ class IncomingInstanceMappingServiceTest { @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + when(fileClient.postFile(any(File.class))).thenReturn(Mono.just(UUID.randomUUID())); } @Test @@ -37,13 +38,15 @@ void shouldReturnInstanceObjectWhenIncomingInstanceIsValid() { UUID uuid = UUID.randomUUID(); when(fileClient.postFile(any(File.class))).thenReturn(Mono.just(uuid)); - InstanceObject result = incomingInstanceMappingService.map(4L, createValidIncomingInstanceWithTilleggsinformasjon()).block(); + InstanceObject result = incomingInstanceMappingService + .map(4L, createValidIncomingInstanceWithTilleggsinformasjon().build()).block(); Map valuePerKey = result.getValuePerKey(); assertEquals("Ola", valuePerKey.get("personaliaFornavn")); assertEquals("Nordmann", valuePerKey.get("personaliaMellomnavn")); assertEquals("Nordmannsen", valuePerKey.get("personaliaEtternavn")); assertEquals("12345678901", valuePerKey.get("personaliaFodselsnummer")); + assertEquals("1980-12-31", valuePerKey.get("personaliaFodselsdato")); assertEquals("12345678", valuePerKey.get("kontaktinformasjonTelefonnummer")); assertEquals("ola@normann.no", valuePerKey.get("kontaktinformasjonEpostadresse")); @@ -71,7 +74,8 @@ void shouldReturnInstanceObjectWhenIncomingInstanceDoesNotHaveTilleggsinformasjo UUID uuid = UUID.randomUUID(); when(fileClient.postFile(any(File.class))).thenReturn(Mono.just(uuid)); - InstanceObject result = incomingInstanceMappingService.map(4L, createIncomingInstanceWithoutTilleggsinformasjon()).block(); + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance().build()).block(); Map valuePerKey = result.getValuePerKey(); assertEquals("Ola", valuePerKey.get("personaliaFornavn")); @@ -94,15 +98,22 @@ void shouldReturnInstanceObjectWhenIncomingInstanceDoesNotHaveTilleggsinformasjo } @Test - void shouldNotReturnInstansId(){ - when(fileClient.postFile(any(File.class))).thenReturn(Mono.just(UUID.randomUUID())); + void shouldAcceptFodselsdatoAsNull() { + InstanceObject result = incomingInstanceMappingService + .map(4L, createValidIncomingInstanceWithFodselsdatoAsNull().build()).block(); - InstanceObject result = incomingInstanceMappingService.map(4L, createValidIncomingInstanceWithTilleggsinformasjon()).block(); + assertFalse(result.getValuePerKey().containsKey("personaliaFodselsdato")); + } + + @Test + void shouldNotReturnInstansId(){ + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance().build()).block(); assertFalse(result.getValuePerKey().containsKey("instansId")); } - private IncomingInstance createValidIncomingInstanceWithTilleggsinformasjon() { + private IncomingInstance.IncomingInstanceBuilder createIncomingInstance() { return IncomingInstance.builder() .instansId("12345") .personalia(Personalia.builder() @@ -110,6 +121,7 @@ private IncomingInstance createValidIncomingInstanceWithTilleggsinformasjon() { .fornavn("Ola") .mellomnavn("Nordmann") .etternavn("Nordmannsen") + .fodselsdato("1980-12-31") .build()) .kontaktinformasjon(Kontaktinformasjon.builder() @@ -128,8 +140,12 @@ private IncomingInstance createValidIncomingInstanceWithTilleggsinformasjon() { .dato("2021-01-01") .filnavn("dokument.pdf") .format("text/plain") - .build()) + .build()); + } + + private IncomingInstance.IncomingInstanceBuilder createValidIncomingInstanceWithTilleggsinformasjon() { + return createIncomingInstance() .tilleggsinformasjon(Tilleggsinformasjon.builder() .skolear("2024/2025") .skolenummer("1") @@ -137,38 +153,17 @@ private IncomingInstance createValidIncomingInstanceWithTilleggsinformasjon() { .programomradekode("LA1") .programomradenavn("Latin") .sokertype("Ordinær") - .build()) - .build(); + .build()); } - private IncomingInstance createIncomingInstanceWithoutTilleggsinformasjon() { - return IncomingInstance.builder() - .instansId("12345") + private IncomingInstance.IncomingInstanceBuilder createValidIncomingInstanceWithFodselsdatoAsNull() { + return createIncomingInstance() .personalia(Personalia.builder() .fodselsnummer("12345678901") .fornavn("Ola") .mellomnavn("Nordmann") .etternavn("Nordmannsen") - .build()) - - .kontaktinformasjon(Kontaktinformasjon.builder() - .telefonnummer("12345678") - .epostadresse("ola@normann.no") - .build()) - - .inntaksadresse(Inntaksadresse.builder() - .gateadresse("Osloveien 1") - .postnummer("1234") - .poststed("Oslo") - .build()) - - .dokument(Dokument.builder() - .tittel("Dokumenttittel") - .dato("2021-01-01") - .filnavn("dokument.pdf") - .format("text/plain") - .build()) - - .build(); + .fodselsdato(null) + .build()); } } \ No newline at end of file From ebe2a0530642931468b0b00e9676257900b45975 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord Date: Wed, 12 Jun 2024 15:44:11 +0200 Subject: [PATCH 4/8] =?UTF-8?q?ARKIV-261=20N=C3=A5=20mulig=20med=20formate?= =?UTF-8?q?rt=20dato=20og=20fullt=20navn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IncomingInstanceMappingService.java | 55 ++++++++++++++++++- .../IncomingInstanceMappingServiceTest.java | 53 ++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java index cb87dc8..85aab43 100644 --- a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java +++ b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java @@ -10,8 +10,12 @@ import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; @Service @Slf4j @@ -39,11 +43,47 @@ private static Map toValuePerKey(IncomingInstance incomingInstan entries.add(Map.entry("personaliaFodselsnummer", incomingInstance.getPersonalia().getFodselsnummer())); entries.add(Map.entry("personaliaFornavn", incomingInstance.getPersonalia().getFornavn())); - entries.add(Map.entry("personaliaMellomnavn", incomingInstance.getPersonalia().getMellomnavn())); + + Optional.ofNullable(incomingInstance.getPersonalia().getMellomnavn()) + .ifPresent(mellomnavn -> entries.add(Map.entry("personaliaMellomnavn", mellomnavn))); + entries.add(Map.entry("personaliaEtternavn", incomingInstance.getPersonalia().getEtternavn())); + entries.add(Map.entry("tilpassetFulltNavn1", + Stream.of(incomingInstance.getPersonalia().getFornavn(), + incomingInstance.getPersonalia().getMellomnavn(), + incomingInstance.getPersonalia().getEtternavn()) + .filter(s -> s != null) + .collect(Collectors.joining(" ")) + )); + + entries.add(Map.entry("tilpassetFulltNavn2", + Stream.of(incomingInstance.getPersonalia().getEtternavn(), + incomingInstance.getPersonalia().getFornavn(), + incomingInstance.getPersonalia().getMellomnavn()) + .filter(s -> s != null) + .collect(Collectors.joining(" ")) + )); + + entries.add(Map.entry("tilpassetFulltNavn3", + Stream.of(incomingInstance.getPersonalia().getEtternavn() +",", + incomingInstance.getPersonalia().getFornavn(), + incomingInstance.getPersonalia().getMellomnavn()) + .filter(s -> s != null) + .collect(Collectors.joining(" ")) + )); + Optional.ofNullable(incomingInstance.getPersonalia().getFodselsdato()) - .ifPresent(fodselsdato -> entries.add(Map.entry("personaliaFodselsdato", fodselsdato))); + .ifPresent(fodselsdato -> { + entries.add(Map.entry("personaliaFodselsdato", fodselsdato)); + + Optional.ofNullable(formatedDate(fodselsdato, "ddMMyy")).ifPresent(formatedFodselsdato -> + entries.add(Map.entry("tilpassetFodselsdato1", formatedFodselsdato))); + + Optional.ofNullable(formatedDate(fodselsdato, "dd.MM.yyyy")).ifPresent(formatedFodselsdato -> + entries.add(Map.entry("tilpassetFodselsdato2", formatedFodselsdato))); + + }); entries.add(Map.entry("kontaktinformasjonTelefonnummer", incomingInstance.getKontaktinformasjon().getTelefonnummer())); entries.add(Map.entry("kontaktinformasjonEpostadresse", incomingInstance.getKontaktinformasjon().getEpostadresse())); @@ -70,6 +110,17 @@ private static Map toValuePerKey(IncomingInstance incomingInstan return entries.stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); } + private static String formatedDate(String fodselsdato, String format) { + try { + LocalDate date = LocalDate.parse(fodselsdato, DateTimeFormatter.ofPattern("yyyy-MM-dd")); + String formattedDate = date.format(DateTimeFormatter.ofPattern(format)); + return formattedDate; + } catch (DateTimeParseException e) { + return null; + } + } + + private Mono postFile(Long sourceApplicationId, IncomingInstance incomingInstance) { return fileClient.postFile( File.builder() diff --git a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java index 5702024..ff7eb14 100644 --- a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java +++ b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java @@ -105,6 +105,59 @@ void shouldAcceptFodselsdatoAsNull() { assertFalse(result.getValuePerKey().containsKey("personaliaFodselsdato")); } + @Test + void shouldCreateCustomizedFodselsdato() { + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance().build()).block(); + + assertEquals("311280", result.getValuePerKey().get("tilpassetFodselsdato1")); + assertEquals("31.12.1980", result.getValuePerKey().get("tilpassetFodselsdato2")); + + } + + @Test + void shouldCreateCustomizedFullName() { + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance().build()).block(); + + assertEquals("Ola Nordmann Nordmannsen", result.getValuePerKey().get("tilpassetFulltNavn1")); + assertEquals("Nordmannsen Ola Nordmann", result.getValuePerKey().get("tilpassetFulltNavn2")); + assertEquals("Nordmannsen, Ola Nordmann", result.getValuePerKey().get("tilpassetFulltNavn3")); + } + + @Test + void shouldCreateCustomizedFullNameWitoutMiddleName() { + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance() + .personalia(Personalia.builder() + .fodselsnummer("12345678901") + .fornavn("Ola") + .etternavn("Nordmannsen") + .fodselsdato("19-12-3100") + .build()).build()).block(); + + assertEquals("Ola Nordmannsen", result.getValuePerKey().get("tilpassetFulltNavn1")); + assertEquals("Nordmannsen Ola", result.getValuePerKey().get("tilpassetFulltNavn2")); + assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetFulltNavn3")); + } + + @Test + void shouldNotAcceptInvalidFodselsdato() { + InstanceObject result = incomingInstanceMappingService + .map(4L, createIncomingInstance() + .personalia(Personalia.builder() + .fodselsnummer("12345678901") + .fornavn("Ola") + .mellomnavn("Nordmann") + .etternavn("Nordmannsen") + .fodselsdato("19-12-3100") + .build()) + .build()).block(); + + assertFalse(result.getValuePerKey().containsKey("tilpassetFodselsdato1")); + assertFalse(result.getValuePerKey().containsKey("tilpassetFodselsdato2")); + } + @Test void shouldNotReturnInstansId(){ InstanceObject result = incomingInstanceMappingService From 64550820ac19be28d6e9a5ea4ba4b76012fb974a Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord Date: Wed, 12 Jun 2024 15:50:01 +0200 Subject: [PATCH 5/8] ARKIV-261 Nok med tilpasset navn --- .../gateway/IncomingInstanceMappingService.java | 6 +++--- .../gateway/IncomingInstanceMappingServiceTest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java index 85aab43..42193a1 100644 --- a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java +++ b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java @@ -49,7 +49,7 @@ private static Map toValuePerKey(IncomingInstance incomingInstan entries.add(Map.entry("personaliaEtternavn", incomingInstance.getPersonalia().getEtternavn())); - entries.add(Map.entry("tilpassetFulltNavn1", + entries.add(Map.entry("tilpassetNavn1", Stream.of(incomingInstance.getPersonalia().getFornavn(), incomingInstance.getPersonalia().getMellomnavn(), incomingInstance.getPersonalia().getEtternavn()) @@ -57,7 +57,7 @@ private static Map toValuePerKey(IncomingInstance incomingInstan .collect(Collectors.joining(" ")) )); - entries.add(Map.entry("tilpassetFulltNavn2", + entries.add(Map.entry("tilpassetNavn2", Stream.of(incomingInstance.getPersonalia().getEtternavn(), incomingInstance.getPersonalia().getFornavn(), incomingInstance.getPersonalia().getMellomnavn()) @@ -65,7 +65,7 @@ private static Map toValuePerKey(IncomingInstance incomingInstan .collect(Collectors.joining(" ")) )); - entries.add(Map.entry("tilpassetFulltNavn3", + entries.add(Map.entry("tilpassetNavn3", Stream.of(incomingInstance.getPersonalia().getEtternavn() +",", incomingInstance.getPersonalia().getFornavn(), incomingInstance.getPersonalia().getMellomnavn()) diff --git a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java index ff7eb14..5a27348 100644 --- a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java +++ b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java @@ -120,9 +120,9 @@ void shouldCreateCustomizedFullName() { InstanceObject result = incomingInstanceMappingService .map(4L, createIncomingInstance().build()).block(); - assertEquals("Ola Nordmann Nordmannsen", result.getValuePerKey().get("tilpassetFulltNavn1")); - assertEquals("Nordmannsen Ola Nordmann", result.getValuePerKey().get("tilpassetFulltNavn2")); - assertEquals("Nordmannsen, Ola Nordmann", result.getValuePerKey().get("tilpassetFulltNavn3")); + assertEquals("Ola Nordmann Nordmannsen", result.getValuePerKey().get("tilpassetNavn1")); + assertEquals("Nordmannsen Ola Nordmann", result.getValuePerKey().get("tilpassetNavn2")); + assertEquals("Nordmannsen, Ola Nordmann", result.getValuePerKey().get("tilpassetNavn3")); } @Test @@ -136,9 +136,9 @@ void shouldCreateCustomizedFullNameWitoutMiddleName() { .fodselsdato("19-12-3100") .build()).build()).block(); - assertEquals("Ola Nordmannsen", result.getValuePerKey().get("tilpassetFulltNavn1")); - assertEquals("Nordmannsen Ola", result.getValuePerKey().get("tilpassetFulltNavn2")); - assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetFulltNavn3")); + assertEquals("Ola Nordmannsen", result.getValuePerKey().get("tilpassetNavn1")); + assertEquals("Nordmannsen Ola", result.getValuePerKey().get("tilpassetNavn2")); + assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetNavn3")); } @Test From 886069d7bf13b8b3abc11174851c51f985f33183 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:41:14 +0000 Subject: [PATCH 6/8] Bump gradle/wrapper-validation-action from 3.3.2 to 3.4.1 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.3.2 to 3.4.1. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v3.3.2...v3.4.1) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 354e0f9..68f5155 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: distribution: 'corretto' cache: 'gradle' - - uses: gradle/wrapper-validation-action@v3.3.2 + - uses: gradle/wrapper-validation-action@v3.4.1 - name: Build with Gradle uses: gradle/gradle-build-action@v3.3.2 with: From 0aad6a44d952edf47b9d2f27ff7b2e0622f80d89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:41:18 +0000 Subject: [PATCH 7/8] Bump gradle/gradle-build-action from 3.3.2 to 3.4.1 Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 3.3.2 to 3.4.1. - [Release notes](https://github.com/gradle/gradle-build-action/releases) - [Commits](https://github.com/gradle/gradle-build-action/compare/v3.3.2...v3.4.1) --- updated-dependencies: - dependency-name: gradle/gradle-build-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 354e0f9..01837c8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,6 +21,6 @@ jobs: - uses: gradle/wrapper-validation-action@v3.3.2 - name: Build with Gradle - uses: gradle/gradle-build-action@v3.3.2 + uses: gradle/gradle-build-action@v3.4.1 with: arguments: check From 29698915d178a9c199f1652a56af4a98cbae86b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:41:21 +0000 Subject: [PATCH 8/8] Bump docker/build-push-action from 5 to 6 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cd.yaml | 2 +- .github/workflows/md.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index ffd8ae0..d28787c 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -33,7 +33,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: push: ${{ github.actor != 'dependabot[bot]' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/md.yaml b/.github/workflows/md.yaml index aedfe6b..59c5411 100644 --- a/.github/workflows/md.yaml +++ b/.github/workflows/md.yaml @@ -85,7 +85,7 @@ jobs: type=sha,enable=true,priority=100,prefix=sha-,suffix=,format=short - name: Build and push Docker image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true