Merge pull request #28 from FINTLabs/tilpassetnavn

Nå også med blankt mellomnavn
FINTLabs · Sep 27, 2024 · d6d56d3 · d6d56d3
2 parents 34af319 + 2120261
commit d6d56d3
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -51,7 +51,9 @@ jobs:
         cluster: [ aks-beta-fint-2021-11-23, aks-api-fint-2022-02-08 ]
         include:
           - cluster: aks-beta-fint-2021-11-23
+            org: bfk-no
             deploy-every-branch: true
+
         exclude:
           - cluster: aks-api-fint-2022-02-08
             org: fintlabs-no

diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java
@@ -5,10 +5,10 @@
 import no.fintlabs.gateway.instance.model.File;
 import no.fintlabs.gateway.instance.model.instance.InstanceObject;
 import no.fintlabs.gateway.instance.web.FileClient;
-import no.fintlabs.instance.gateway.model.vigo.Dokument;
 import no.fintlabs.instance.gateway.model.vigo.IncomingInstance;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDate;
@@ -59,23 +59,23 @@ private static Map<String, String> toValuePerKey(IncomingInstance incomingInstan
                 Stream.of(incomingInstance.getPersonalia().getFornavn(),
                         incomingInstance.getPersonalia().getMellomnavn(),
                         incomingInstance.getPersonalia().getEtternavn())
-                    .filter(s -> s != null)
+                    .filter(s -> StringUtils.hasLength(s))
                     .collect(Collectors.joining(" "))
         ));
 
         entries.add(Map.entry("tilpassetNavn2",
                 Stream.of(incomingInstance.getPersonalia().getEtternavn(),
                         incomingInstance.getPersonalia().getFornavn(),
                         incomingInstance.getPersonalia().getMellomnavn())
-                    .filter(s -> s != null)
+                    .filter(s -> StringUtils.hasLength(s))
                     .collect(Collectors.joining(" "))
         ));
 
         entries.add(Map.entry("tilpassetNavn3",
                 Stream.of(incomingInstance.getPersonalia().getEtternavn() +",",
                                 incomingInstance.getPersonalia().getFornavn(),
                                 incomingInstance.getPersonalia().getMellomnavn())
-                        .filter(s -> s != null)
+                        .filter(s -> StringUtils.hasLength(s))
                         .collect(Collectors.joining(" "))
         ));
 

diff --git a/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java b/src/test/java/no/fintlabs/instance/gateway/IncomingInstanceMappingServiceTest.java
@@ -194,6 +194,42 @@ void shouldCreateCustomizedFullNameWitoutMiddleName() {
         assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetNavn3"));
     }
 
+    @Test
+    void shouldCreateCustomizedFullNameWithEmptyMiddleName() {
+        InstanceObject result = incomingInstanceMappingService
+                .map(4L, createIncomingInstance()
+                                .personalia(Personalia.builder()
+                                        .fodselsnummer("12345678901")
+                                        .fornavn("Ola")
+                                        .mellomnavn("")
+                                        .etternavn("Nordmannsen")
+                                        .fodselsdato("19-12-3100")
+                                        .build()).build()
+                ).block();
+
+        assertEquals("Ola Nordmannsen", result.getValuePerKey().get("tilpassetNavn1"));
+        assertEquals("Nordmannsen Ola", result.getValuePerKey().get("tilpassetNavn2"));
+        assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetNavn3"));
+    }
+
+    @Test
+    void shouldCreateCustomizedFullNameWithNullMiddleName() {
+        InstanceObject result = incomingInstanceMappingService
+                .map(4L, createIncomingInstance()
+                                .personalia(Personalia.builder()
+                                        .fodselsnummer("12345678901")
+                                        .fornavn("Ola")
+                                        .mellomnavn(null)
+                                        .etternavn("Nordmannsen")
+                                        .fodselsdato("19-12-3100")
+                                        .build()).build()
+                ).block();
+
+        assertEquals("Ola Nordmannsen", result.getValuePerKey().get("tilpassetNavn1"));
+        assertEquals("Nordmannsen Ola", result.getValuePerKey().get("tilpassetNavn2"));
+        assertEquals("Nordmannsen, Ola", result.getValuePerKey().get("tilpassetNavn3"));
+    }
+
     @Test
     void shouldNotAcceptInvalidFodselsdato() {
         InstanceObject result = incomingInstanceMappingService