From 2da02d1cf3cbb5d18597e18c2914fc2abe618121 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Tue, 9 May 2023 14:08:33 +0200
Subject: [PATCH] =?UTF-8?q?Issue=20#28:=20Erweitere=20Text=20f=C3=BCr=20Er?=
 =?UTF-8?q?gebnis,=20Exon=20und=20Pathogenit=C3=A4tsklasse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #28
---
 src/main/java/DNPM/dto/Variant.java     | 26 ++++++++++++-------------
 src/test/java/DNPM/dto/VariantTest.java |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/DNPM/dto/Variant.java b/src/main/java/DNPM/dto/Variant.java
index 8ebe740..f8d25c1 100644
--- a/src/main/java/DNPM/dto/Variant.java
+++ b/src/main/java/DNPM/dto/Variant.java
@@ -50,7 +50,7 @@ public class Variant {
     }
 
     public static Optional<Variant> fromProcedure(Procedure procedure) {
-        if (! "OS.Molekulargenetische Untersuchung".equals(procedure.getFormName())) {
+        if (!"OS.Molekulargenetische Untersuchung".equals(procedure.getFormName())) {
             return Optional.empty();
         }
 
@@ -67,30 +67,30 @@ public class Variant {
             return Optional.of(
                     new Variant(
                             procedure.getId(),
-                            "Einfache Variante",
-                            gene.getString(),
-                            exon.getString(),
-                            pathogenitaetsklasse.getString()
+                            "Einfache Variante (Mutation)",
+                            gene.getString().isBlank() ? "-" : gene.getString(),
+                            null == exon || exon.getString().isBlank() ? "-" : exon.getString(),
+                            null == pathogenitaetsklasse || pathogenitaetsklasse.getString().isBlank() ? "-" : pathogenitaetsklasse.getString()
                     )
             );
         } else if (ergebnis.getString().equals("CNV")) {
             return Optional.of(
                     new Variant(
                             procedure.getId(),
-                            "Copy Number Variation",
-                            gene.getString(),
-                            exon.getString(),
-                            pathogenitaetsklasse.getString()
+                            "Copy Number Variation (CNV)",
+                            gene.getString().isBlank() ? "-" : gene.getString(),
+                            null == exon || exon.getString().isBlank() ? "-" : exon.getString(),
+                            null == pathogenitaetsklasse || pathogenitaetsklasse.getString().isBlank() ? "-" : pathogenitaetsklasse.getString()
                     )
             );
         } else if (ergebnis.getString().equals("F")) {
             return Optional.of(
                     new Variant(
                             procedure.getId(),
-                            "Fusion",
-                            gene.getString(),
-                            exon.getString(),
-                            pathogenitaetsklasse.getString()
+                            "Fusion (Translokation Inversion Insertion)",
+                            gene.getString().isBlank() ? "-" : gene.getString(),
+                            null == exon || exon.getString().isBlank() ? "-" : exon.getString(),
+                            null == pathogenitaetsklasse || pathogenitaetsklasse.getString().isBlank() ? "-" : pathogenitaetsklasse.getString()
                     )
             );
         } else {
diff --git a/src/test/java/DNPM/dto/VariantTest.java b/src/test/java/DNPM/dto/VariantTest.java
index 4a29ba1..3242852 100644
--- a/src/test/java/DNPM/dto/VariantTest.java
+++ b/src/test/java/DNPM/dto/VariantTest.java
@@ -23,7 +23,7 @@ public class VariantTest {
 
         assertThat(actual).isPresent();
         assertThat(actual.get().getId()).isEqualTo(12345);
-        assertThat(actual.get().getErgebnis()).isEqualTo("Einfache Variante");
+        assertThat(actual.get().getErgebnis()).isEqualTo("Einfache Variante (Mutation)");
         assertThat(actual.get().getGen()).isEqualTo("BRAF");
         assertThat(actual.get().getExon()).isEqualTo("123");
         assertThat(actual.get().getPathogenitaetsklasse()).isEqualTo("2");
@@ -44,7 +44,7 @@ public class VariantTest {
 
         assertThat(actual).isPresent();
         assertThat(actual.get().getId()).isEqualTo(12345);
-        assertThat(actual.get().getErgebnis()).isEqualTo("Copy Number Variation");
+        assertThat(actual.get().getErgebnis()).isEqualTo("Copy Number Variation (CNV)");
         assertThat(actual.get().getGen()).isEqualTo("BRAF");
         assertThat(actual.get().getExon()).isEqualTo("123");
         assertThat(actual.get().getPathogenitaetsklasse()).isEqualTo("2");
@@ -65,7 +65,7 @@ public class VariantTest {
 
         assertThat(actual).isPresent();
         assertThat(actual.get().getId()).isEqualTo(12345);
-        assertThat(actual.get().getErgebnis()).isEqualTo("Fusion");
+        assertThat(actual.get().getErgebnis()).isEqualTo("Fusion (Translokation Inversion Insertion)");
         assertThat(actual.get().getGen()).isEqualTo("BRAF");
         assertThat(actual.get().getExon()).isEqualTo("123");
         assertThat(actual.get().getPathogenitaetsklasse()).isEqualTo("2");