From 684c866b97625269bf91d5d4e32da0814e0aeccc Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <code@pcvolkmer.de>
Date: Sun, 22 Jun 2025 15:31:54 +0200
Subject: [PATCH] feat: add util method to create patient reference

---
 .../mapper/KpaDiagnosisDataMapper.java        |  4 ++-
 .../datamapper/mapper/KpaEcogDataMapper.java  | 11 ++-----
 .../mapper/KpaProzedurDataMapper.java         |  4 ++-
 .../mapper/KpaTherapielinieDataMapper.java    |  4 ++-
 .../onco/datamapper/mapper/MapperUtils.java   | 30 +++++++++++++++++++
 .../mapper/KpaDiagnosisDataMapperTest.java    |  6 +++-
 .../mapper/KpaProzedurDataMapperTest.java     |  6 ++--
 .../KpaTherapielinieDataMapperTest.java       |  6 ++--
 8 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MapperUtils.java

diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java
index 165d460..a153fb0 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java
@@ -12,6 +12,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference;
+
 /**
  * Mapper class to load and map diagnosis data from database table 'dk_dnpm_kpa'
  *
@@ -50,7 +52,7 @@ public class KpaDiagnosisDataMapper implements DataMapper<MtbDiagnosis> {
         var builder = MtbDiagnosis.builder();
         builder
                 .id(data.getString("id"))
-                .patient(Reference.builder().id(data.getString("patient_id")).build())
+                .patient(getPatientReference(data.getString("patient_id")))
                 .code(
                         Coding.builder()
                                 .code(data.getString("icd10"))
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java
index f6dedbc..c53aed2 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java
@@ -3,7 +3,6 @@ package dev.pcvolkmer.onco.datamapper.mapper;
 import dev.pcvolkmer.mv64e.mtb.EcogCoding;
 import dev.pcvolkmer.mv64e.mtb.EcogCodingCode;
 import dev.pcvolkmer.mv64e.mtb.PerformanceStatus;
-import dev.pcvolkmer.mv64e.mtb.Reference;
 import dev.pcvolkmer.onco.datamapper.ResultSet;
 import dev.pcvolkmer.onco.datamapper.datacatalogues.EcogCatalogue;
 
@@ -13,6 +12,8 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference;
+
 /**
  * Mapper class to load and map prozedur data from database table 'dk_dnpm_uf_ecog'
  *
@@ -51,13 +52,7 @@ public class KpaEcogDataMapper extends AbstractSubformDataMapper<PerformanceStat
         var builder = PerformanceStatus.builder();
         builder
                 .id(resultSet.getProcedureId().toString())
-                .patient(
-                        Reference.builder()
-                                .id(resultSet.getString("patient_id"))
-                                // Use "Patient" since Onkostar only provides patient data
-                                .type("Patient")
-                                .build()
-                )
+                .patient(getPatientReference(resultSet.getString("patient_id")))
                 .effectiveDate(resultSet.getDate("datum"))
                 .value(getEcogCoding(resultSet.getString("ecog")))
         ;
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java
index 6f02dc4..b479c09 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapper.java
@@ -7,6 +7,8 @@ import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
 import dev.pcvolkmer.onco.datamapper.ResultSet;
 import dev.pcvolkmer.onco.datamapper.datacatalogues.ProzedurCatalogue;
 
+import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference;
+
 /**
  * Mapper class to load and map prozedur data from database table 'dk_dnpm_uf_prozedur'
  *
@@ -42,7 +44,7 @@ public class KpaProzedurDataMapper extends AbstractKpaTherapieverlaufDataMapper<
         var builder = OncoProcedure.builder();
         builder
                 .id(resultSet.getString("id"))
-                .patient(Reference.builder().id(resultSet.getString("patient_id")).build())
+                .patient(getPatientReference(resultSet.getString("patient_id")))
                 .basedOn(Reference.builder().id(diseases.get(0).getDiseaseId().toString()).build())
                 .recordedOn(resultSet.getDate("erfassungsdatum"))
                 .therapyLine(resultSet.getLong("therapielinie"))
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapper.java
index b060ea7..753c7c7 100644
--- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapper.java
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapper.java
@@ -7,6 +7,8 @@ import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
 import dev.pcvolkmer.onco.datamapper.ResultSet;
 import dev.pcvolkmer.onco.datamapper.datacatalogues.TherapielinieCatalogue;
 
+import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference;
+
 /**
  * Mapper class to load and map prozedur data from database table 'dk_dnpm_therapielinie'
  *
@@ -42,7 +44,7 @@ public class KpaTherapielinieDataMapper extends AbstractKpaTherapieverlaufDataMa
         var builder = MtbSystemicTherapy.builder();
         builder
                 .id(resultSet.getString("id"))
-                .patient(Reference.builder().id(resultSet.getString("patient_id")).build())
+                .patient(getPatientReference(resultSet.getString("patient_id")))
                 .basedOn(Reference.builder().id(diseases.get(0).getDiseaseId().toString()).build())
                 .recordedOn(resultSet.getDate("erfassungsdatum"))
                 .therapyLine(resultSet.getLong("therapielinie"))
diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MapperUtils.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MapperUtils.java
new file mode 100644
index 0000000..c5790a4
--- /dev/null
+++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MapperUtils.java
@@ -0,0 +1,30 @@
+package dev.pcvolkmer.onco.datamapper.mapper;
+
+import dev.pcvolkmer.mv64e.mtb.Reference;
+import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException;
+
+/**
+ * Utility methods to be used in mappers
+ */
+public class MapperUtils {
+
+    private MapperUtils() {
+    }
+
+    /**
+     * Get Patient Reference based on default column name 'patient_id'
+     *
+     * @return The patient reference
+     */
+    public static Reference getPatientReference(String patientId) {
+        if (patientId == null) {
+            throw new DataAccessException("No patient id found");
+        }
+        return Reference.builder()
+                .id(patientId)
+                // Use "Patient" since Onkostar only provides patient data
+                .type("Patient")
+                .build();
+    }
+
+}
diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java
index 2310874..c921386 100644
--- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java
+++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java
@@ -1,6 +1,7 @@
 package dev.pcvolkmer.onco.datamapper.mapper;
 
 import dev.pcvolkmer.mv64e.mtb.MtbDiagnosis;
+import dev.pcvolkmer.mv64e.mtb.Reference;
 import dev.pcvolkmer.onco.datamapper.PropertyCatalogue;
 import dev.pcvolkmer.onco.datamapper.ResultSet;
 import dev.pcvolkmer.onco.datamapper.datacatalogues.KpaCatalogue;
@@ -67,13 +68,16 @@ class KpaDiagnosisDataMapperTest {
         var actual = this.dataMapper.getById(1);
         assertThat(actual).isInstanceOf(MtbDiagnosis.class);
         assertThat(actual.getId()).isEqualTo("1");
+        assertThat(actual.getPatient())
+                .isEqualTo(Reference.builder().id("42").type("Patient").build());
         assertThat(actual.getCode().getCode()).isEqualTo("F79.9");
     }
 
     private static Map<String, Object> testData() {
         return Map.of(
                 "id", "1",
-                "icd10", "F79.9"
+                "icd10", "F79.9",
+                "patient_id", "42"
         );
     }
 
diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java
index 78f5b87..5c15101 100644
--- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java
+++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java
@@ -42,7 +42,6 @@ class KpaProzedurDataMapperTest {
     @Test
     void shouldMapResultSet(@Mock ResultSet resultSet) {
         var testData = Map.of(
-                "erkrankung.id", "1",
                 "id", "1",
                 "beginn", new java.sql.Date(Date.from(Instant.parse("2000-01-01T12:00:00Z")).getTime()),
                 "ende", new java.sql.Date(Date.from(Instant.parse("2024-06-19T12:00:00Z")).getTime()),
@@ -51,7 +50,8 @@ class KpaProzedurDataMapperTest {
                 "status", "stopped",
                 "statusgrund", "patient-death",
                 "therapielinie", 1L,
-                "typ", "surgery"
+                "typ", "surgery",
+                "patient_id", "42"
         );
 
         doAnswer(invocationOnMock -> {
@@ -99,6 +99,8 @@ class KpaProzedurDataMapperTest {
         var actual = actualList.get(0);
         assertThat(actual).isInstanceOf(OncoProcedure.class);
         assertThat(actual.getId()).isEqualTo("1");
+        assertThat(actual.getPatient())
+                .isEqualTo(Reference.builder().id("42").type("Patient").build());
         assertThat(actual.getPeriod()).isEqualTo(
                 PeriodDate.builder()
                         .start(Date.from(Instant.parse("2000-01-01T12:00:00Z")))
diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java
index 643e53b..e616812 100644
--- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java
+++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java
@@ -42,7 +42,6 @@ class KpaTherapielinieDataMapperTest {
     @Test
     void shouldMapResultSet(@Mock ResultSet resultSet) {
         var testData = Map.of(
-                "erkrankung.id", "1",
                 "id", "1",
                 "beginn", new java.sql.Date(Date.from(Instant.parse("2000-01-01T12:00:00Z")).getTime()),
                 "ende", new java.sql.Date(Date.from(Instant.parse("2024-06-19T12:00:00Z")).getTime()),
@@ -50,7 +49,8 @@ class KpaTherapielinieDataMapperTest {
                 "intention", "S",
                 "status", "stopped",
                 "statusgrund", "patient-death",
-                "therapielinie", 1L
+                "therapielinie", 1L,
+                "patient_id", "42"
         );
 
         doAnswer(invocationOnMock -> {
@@ -99,6 +99,8 @@ class KpaTherapielinieDataMapperTest {
                 .isInstanceOf(MtbSystemicTherapy.class);
         assertThat(actual.getId())
                 .isEqualTo("1");
+        assertThat(actual.getPatient())
+                .isEqualTo(Reference.builder().id("42").type("Patient").build());
         assertThat(actual.getPeriod())
                 .isEqualTo(
                         PeriodDate.builder()