diff --git a/README.md b/README.md index 57699d9..2523488 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ var jsonResult = Converter.toJsonString( ``` Es ist auch möglich, die Daten anhand der Patienten-ID und dem Tumoridentifikator zu ermitteln. -Hierbei wird das letzte Formular `DNPM Klinik/Anamnese` andhand des Anmeldedatums MTB +Hierbei wird das letzte Formular `DNPM Klinik/Anamnese` anhand des Anmeldedatums MTB ausgewählt und verwendet. ``` @@ -38,7 +38,7 @@ var jsonResult = Converter.toJsonString( | DNPM-Datenmodell 2.1 - Bereich | Status | Anmerkung | |----------------------------------|--------|--------------------------------------------------------------------------------| -| Patient | ✅ | Verwendet Datenbank-ID, keine managing Site | +| Patient | ✅ | Verwendet Patienten-ID, nicht Datenbank-ID. Keine Managing Site | | Episoden | ✅ | | | Diagnosen | ✅ | Entsprechend Formularaufbau nur Diagnose der aktuellen Episode | | Verwandten-Diagnosen | ✅ | | diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java index ceeae0e..9c5a40e 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java @@ -20,6 +20,7 @@ package dev.pcvolkmer.onco.datamapper; +import dev.pcvolkmer.mv64e.mtb.Reference; import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException; import java.time.LocalDate; @@ -62,6 +63,22 @@ public class ResultSet { return procedureId; } + /** + * Get the id + * + * @return The procedures id + */ + public Reference getPatientReference() { + if (this.getString("patienten_id") == null) { + throw new DataAccessException("No patient id found"); + } + return Reference.builder() + .id(this.getString("patienten_id")) + // Use "Patient" since Onkostar only provides patient data + .type("Patient") + .build(); + } + /** * Get column value as String and cast value if possible * diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java index 8eb11f7..9628296 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractDataCatalogue.java @@ -53,7 +53,8 @@ public abstract class AbstractDataCatalogue implements DataCatalogue { public ResultSet getById(int id) { var result = this.jdbcTemplate.queryForList( String.format( - "SELECT * FROM %s JOIN prozedur ON (prozedur.id = %s.id) WHERE geloescht = 0 AND prozedur.id = ?", + "SELECT patient.patienten_id, %s.*, prozedur.* FROM %s JOIN prozedur ON (prozedur.id = %s.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?", + getTableName(), getTableName(), getTableName() ), diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractSubformDataCatalogue.java b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractSubformDataCatalogue.java index dba472c..ab5f14e 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractSubformDataCatalogue.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/datacatalogues/AbstractSubformDataCatalogue.java @@ -49,7 +49,8 @@ public abstract class AbstractSubformDataCatalogue extends AbstractDataCatalogue public List getAllByParentId(int id) { return this.jdbcTemplate.queryForList( String.format( - "SELECT * FROM %s JOIN prozedur ON (prozedur.id = %s.id) WHERE geloescht = 0 AND hauptprozedur_id = ?", + "SELECT patient.patienten_id, %s.*, prozedur.* FROM %s JOIN prozedur ON (prozedur.id = %s.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?", + getTableName(), getTableName(), getTableName() ), diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungProzedurDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungProzedurDataMapper.java index ebb0396..ce7aa8d 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungProzedurDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungProzedurDataMapper.java @@ -32,8 +32,6 @@ import java.util.Arrays; import java.util.List; 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_einzelempfehlung' * @@ -50,7 +48,7 @@ public class EinzelempfehlungProzedurDataMapper extends AbstractEinzelempfehlung protected ProcedureRecommendation map(ResultSet resultSet) { var resultBuilder = ProcedureRecommendation.builder() .id(resultSet.getString("id")) - .patient(getPatientReference(resultSet.getString("patient_id"))) + .patient(resultSet.getPatientReference()) // TODO Fix id? .reason(Reference.builder().id(resultSet.getString("id")).build()) .issuedOn(resultSet.getDate("datum")) diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungStudieDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungStudieDataMapper.java index 9195bde..74d833a 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungStudieDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungStudieDataMapper.java @@ -28,8 +28,6 @@ import dev.pcvolkmer.onco.datamapper.datacatalogues.EinzelempfehlungCatalogue; import java.util.List; 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_einzelempfehlung' * @@ -46,7 +44,7 @@ public class EinzelempfehlungStudieDataMapper extends AbstractEinzelempfehlungDa protected MtbStudyEnrollmentRecommendation map(ResultSet resultSet) { return MtbStudyEnrollmentRecommendation.builder() .id(resultSet.getString("id")) - .patient(getPatientReference(resultSet.getString("patient_id"))) + .patient(resultSet.getPatientReference()) // TODO Fix id? .reason(Reference.builder().id(resultSet.getString("id")).build()) .issuedOn(resultSet.getDate("datum")) diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungWirkstoffDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungWirkstoffDataMapper.java index e43c456..1d42e80 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungWirkstoffDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/EinzelempfehlungWirkstoffDataMapper.java @@ -30,8 +30,6 @@ import java.util.Arrays; import java.util.List; 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_einzelempfehlung' * @@ -54,7 +52,7 @@ public class EinzelempfehlungWirkstoffDataMapper extends AbstractEinzelempfehlun protected MtbMedicationRecommendation map(ResultSet resultSet) { var resultBuilder = MtbMedicationRecommendation.builder() .id(resultSet.getString("id")) - .patient(getPatientReference(resultSet.getString("patient_id"))) + .patient(resultSet.getPatientReference()) // TODO Fix id? .reason(Reference.builder().id(resultSet.getString("id")).build()) .issuedOn(resultSet.getDate("datum")) 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 d178159..6f18eac 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapper.java @@ -32,8 +32,6 @@ 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' * @@ -72,7 +70,7 @@ public class KpaDiagnosisDataMapper implements DataMapper { var builder = MtbDiagnosis.builder(); builder .id(data.getString("id")) - .patient(getPatientReference(data.getString("patient_id"))) + .patient(data.getPatientReference()) .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 c683cc6..3416229 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapper.java @@ -32,8 +32,6 @@ 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' * @@ -49,7 +47,7 @@ public class KpaEcogDataMapper extends AbstractSubformDataMapper. - * - */ - -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/main/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapper.java index 85f7a5e..53224b2 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapper.java @@ -29,8 +29,6 @@ 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 patient data from database table 'dk_molekulargenetik' * @@ -76,7 +74,7 @@ public class MolekulargenetikToSpecimenDataMapper implements DataMapper { var builder = MtbEpisodeOfCare.builder(); builder .id(kpaData.getString("id")) - .patient(getPatientReference(kpaData.getString("patient_id"))) + .patient(kpaData.getPatientReference()) .diagnoses( List.of( Reference.builder() diff --git a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java index 208d0f4..ff6e9e7 100644 --- a/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java +++ b/src/main/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapper.java @@ -22,15 +22,16 @@ package dev.pcvolkmer.onco.datamapper.mapper; import dev.pcvolkmer.mv64e.mtb.*; import dev.pcvolkmer.onco.datamapper.PropertyCatalogue; -import dev.pcvolkmer.onco.datamapper.datacatalogues.*; +import dev.pcvolkmer.onco.datamapper.datacatalogues.EinzelempfehlungCatalogue; +import dev.pcvolkmer.onco.datamapper.datacatalogues.RebiopsieCatalogue; +import dev.pcvolkmer.onco.datamapper.datacatalogues.ReevaluationCatalogue; +import dev.pcvolkmer.onco.datamapper.datacatalogues.TherapieplanCatalogue; import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static dev.pcvolkmer.onco.datamapper.mapper.MapperUtils.getPatientReference; - /** * Mapper class to load and map patient data from database table 'dk_dnpm_therapieplan' * @@ -78,7 +79,7 @@ public class TherapieplanDataMapper implements DataMapper { var builder = MtbCarePlan.builder(); builder .id(therapieplanData.getString("id")) - .patient(getPatientReference(therapieplanData.getString("patient_id"))) + .patient(therapieplanData.getPatientReference()) .issuedOn(therapieplanData.getDate("datum")) .histologyReevaluationRequests(getHistologyReevaluationRequests(id)) .rebiopsyRequests( @@ -125,7 +126,7 @@ public class TherapieplanDataMapper implements DataMapper { builder.geneticCounselingRecommendation( GeneticCounselingRecommendation.builder() .id(therapieplanData.getString("id")) - .patient(getPatientReference(therapieplanData.getString("patient_id"))) + .patient(therapieplanData.getPatientReference()) .issuedOn(therapieplanData.getDate("datum_tk_humangenber")) .reason( getGeneticCounselingRecommendationReasonCoding( @@ -177,7 +178,7 @@ public class TherapieplanDataMapper implements DataMapper { .map(resultSet -> RebiopsyRequest.builder() .id(resultSet.getString("id")) - .patient(getPatientReference(resultSet.getString("patient_id"))) + .patient(resultSet.getPatientReference()) .issuedOn(resultSet.getDate("datum")) .tumorEntity(diagnosisReference) .build() @@ -190,7 +191,7 @@ public class TherapieplanDataMapper implements DataMapper { .map(resultSet -> HistologyReevaluationRequest.builder() .id(resultSet.getString("id")) - .patient(getPatientReference(resultSet.getString("patient_id"))) + .patient(resultSet.getPatientReference()) .issuedOn(resultSet.getDate("datum")) .specimen(Reference.builder().id(resultSet.getString("ref_molekulargenetik")).build()) .build() diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EcogCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EcogCatalogueTest.java index e1a4482..20d4308 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EcogCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EcogCatalogueTest.java @@ -61,7 +61,7 @@ class EcogCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_ecog JOIN prozedur ON (prozedur.id = dk_dnpm_uf_ecog.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_ecog.*, prozedur.* FROM dk_dnpm_uf_ecog JOIN prozedur ON (prozedur.id = dk_dnpm_uf_ecog.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class EcogCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_ecog JOIN prozedur ON (prozedur.id = dk_dnpm_uf_ecog.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_ecog.*, prozedur.* FROM dk_dnpm_uf_ecog JOIN prozedur ON (prozedur.id = dk_dnpm_uf_ecog.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EinzelempfehlungCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EinzelempfehlungCatalogueTest.java index 477758f..28c13ff 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EinzelempfehlungCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/EinzelempfehlungCatalogueTest.java @@ -61,7 +61,7 @@ class EinzelempfehlungCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_einzelempfehlung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_einzelempfehlung.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_einzelempfehlung.*, prozedur.* FROM dk_dnpm_uf_einzelempfehlung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_einzelempfehlung.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class EinzelempfehlungCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_einzelempfehlung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_einzelempfehlung.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_einzelempfehlung.*, prozedur.* FROM dk_dnpm_uf_einzelempfehlung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_einzelempfehlung.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/HistologieCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/HistologieCatalogueTest.java index 7f316f7..51f6631 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/HistologieCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/HistologieCatalogueTest.java @@ -61,7 +61,7 @@ class HistologieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_histologie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_histologie.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_histologie.*, prozedur.* FROM dk_dnpm_uf_histologie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_histologie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class HistologieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_histologie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_histologie.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_histologie.*, prozedur.* FROM dk_dnpm_uf_histologie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_histologie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/KpaCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/KpaCatalogueTest.java index 283b247..13820d1 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/KpaCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/KpaCatalogueTest.java @@ -63,7 +63,7 @@ class KpaCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_kpa JOIN prozedur ON (prozedur.id = dk_dnpm_kpa.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_kpa.*, prozedur.* FROM dk_dnpm_kpa JOIN prozedur ON (prozedur.id = dk_dnpm_kpa.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/MolekulargenetikCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/MolekulargenetikCatalogueTest.java index c5eaf30..019b3b9 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/MolekulargenetikCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/MolekulargenetikCatalogueTest.java @@ -61,7 +61,7 @@ class MolekulargenetikCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_molekulargenetik JOIN prozedur ON (prozedur.id = dk_molekulargenetik.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_molekulargenetik.*, prozedur.* FROM dk_molekulargenetik JOIN prozedur ON (prozedur.id = dk_molekulargenetik.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class MolekulargenetikCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_molekulargenetik JOIN prozedur ON (prozedur.id = dk_molekulargenetik.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_molekulargenetik.*, prozedur.* FROM dk_molekulargenetik JOIN prozedur ON (prozedur.id = dk_molekulargenetik.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ProzedurCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ProzedurCatalogueTest.java index d8b09f4..8750467 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ProzedurCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ProzedurCatalogueTest.java @@ -61,7 +61,7 @@ class ProzedurCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_prozedur JOIN prozedur ON (prozedur.id = dk_dnpm_uf_prozedur.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_prozedur.*, prozedur.* FROM dk_dnpm_uf_prozedur JOIN prozedur ON (prozedur.id = dk_dnpm_uf_prozedur.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class ProzedurCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_prozedur JOIN prozedur ON (prozedur.id = dk_dnpm_uf_prozedur.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_prozedur.*, prozedur.* FROM dk_dnpm_uf_prozedur JOIN prozedur ON (prozedur.id = dk_dnpm_uf_prozedur.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/RebiopsieCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/RebiopsieCatalogueTest.java index b1dd32f..94e04be 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/RebiopsieCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/RebiopsieCatalogueTest.java @@ -61,7 +61,7 @@ class RebiopsieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_rebiopsie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_rebiopsie.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_rebiopsie.*, prozedur.* FROM dk_dnpm_uf_rebiopsie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_rebiopsie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class RebiopsieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_rebiopsie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_rebiopsie.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_rebiopsie.*, prozedur.* FROM dk_dnpm_uf_rebiopsie JOIN prozedur ON (prozedur.id = dk_dnpm_uf_rebiopsie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ReevaluationCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ReevaluationCatalogueTest.java index 74dbd14..86f6f6b 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ReevaluationCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/ReevaluationCatalogueTest.java @@ -61,7 +61,7 @@ class ReevaluationCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_reevaluation JOIN prozedur ON (prozedur.id = dk_dnpm_uf_reevaluation.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_reevaluation.*, prozedur.* FROM dk_dnpm_uf_reevaluation JOIN prozedur ON (prozedur.id = dk_dnpm_uf_reevaluation.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class ReevaluationCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_reevaluation JOIN prozedur ON (prozedur.id = dk_dnpm_uf_reevaluation.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_reevaluation.*, prozedur.* FROM dk_dnpm_uf_reevaluation JOIN prozedur ON (prozedur.id = dk_dnpm_uf_reevaluation.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapielinieCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapielinieCatalogueTest.java index 7a92e7b..5338cda 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapielinieCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapielinieCatalogueTest.java @@ -61,7 +61,7 @@ class TherapielinieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_therapielinie JOIN prozedur ON (prozedur.id = dk_dnpm_therapielinie.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_therapielinie.*, prozedur.* FROM dk_dnpm_therapielinie JOIN prozedur ON (prozedur.id = dk_dnpm_therapielinie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class TherapielinieCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_therapielinie JOIN prozedur ON (prozedur.id = dk_dnpm_therapielinie.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_therapielinie.*, prozedur.* FROM dk_dnpm_therapielinie JOIN prozedur ON (prozedur.id = dk_dnpm_therapielinie.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapieplanCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapieplanCatalogueTest.java index cee617d..3191102 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapieplanCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TherapieplanCatalogueTest.java @@ -61,7 +61,7 @@ class TherapieplanCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_therapieplan JOIN prozedur ON (prozedur.id = dk_dnpm_therapieplan.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_therapieplan.*, prozedur.* FROM dk_dnpm_therapieplan JOIN prozedur ON (prozedur.id = dk_dnpm_therapieplan.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorausbreitungCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorausbreitungCatalogueTest.java index cb91bd8..249c11f 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorausbreitungCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorausbreitungCatalogueTest.java @@ -61,7 +61,7 @@ class TumorausbreitungCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_tumorausbreitung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorausbreitung.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_tumorausbreitung.*, prozedur.* FROM dk_dnpm_uf_tumorausbreitung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorausbreitung.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class TumorausbreitungCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_tumorausbreitung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorausbreitung.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_tumorausbreitung.*, prozedur.* FROM dk_dnpm_uf_tumorausbreitung JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorausbreitung.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorgradingCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorgradingCatalogueTest.java index 1d58e63..4bdb1d6 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorgradingCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/TumorgradingCatalogueTest.java @@ -61,7 +61,7 @@ class TumorgradingCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_tumorgrading JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorgrading.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_tumorgrading.*, prozedur.* FROM dk_dnpm_uf_tumorgrading JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorgrading.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class TumorgradingCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_tumorgrading JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorgrading.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_tumorgrading.*, prozedur.* FROM dk_dnpm_uf_tumorgrading JOIN prozedur ON (prozedur.id = dk_dnpm_uf_tumorgrading.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VerwandteCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VerwandteCatalogueTest.java index 67df1d2..b18c60d 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VerwandteCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VerwandteCatalogueTest.java @@ -61,7 +61,7 @@ class VerwandteCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_verwandte JOIN prozedur ON (prozedur.id = dk_dnpm_uf_verwandte.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_verwandte.*, prozedur.* FROM dk_dnpm_uf_verwandte JOIN prozedur ON (prozedur.id = dk_dnpm_uf_verwandte.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class VerwandteCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_verwandte JOIN prozedur ON (prozedur.id = dk_dnpm_uf_verwandte.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_verwandte.*, prozedur.* FROM dk_dnpm_uf_verwandte JOIN prozedur ON (prozedur.id = dk_dnpm_uf_verwandte.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VorbefundeCatalogueTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VorbefundeCatalogueTest.java index 6d75237..019c845 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VorbefundeCatalogueTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/datacatalogues/VorbefundeCatalogueTest.java @@ -61,7 +61,7 @@ class VorbefundeCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_vorbefunde JOIN prozedur ON (prozedur.id = dk_dnpm_uf_vorbefunde.id) WHERE geloescht = 0 AND prozedur.id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_vorbefunde.*, prozedur.* FROM dk_dnpm_uf_vorbefunde JOIN prozedur ON (prozedur.id = dk_dnpm_uf_vorbefunde.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND prozedur.id = ?"); } @Test @@ -76,7 +76,7 @@ class VorbefundeCatalogueTest { verify(this.jdbcTemplate).queryForList(captor.capture(), anyInt()); assertThat(captor.getValue()) - .isEqualTo("SELECT * FROM dk_dnpm_uf_vorbefunde JOIN prozedur ON (prozedur.id = dk_dnpm_uf_vorbefunde.id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); + .isEqualTo("SELECT patient.patienten_id, dk_dnpm_uf_vorbefunde.*, prozedur.* FROM dk_dnpm_uf_vorbefunde JOIN prozedur ON (prozedur.id = dk_dnpm_uf_vorbefunde.id) JOIN patient ON (patient.id = prozedur.patient_id) WHERE geloescht = 0 AND hauptprozedur_id = ?"); } } 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 15ca956..d292614 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaDiagnosisDataMapperTest.java @@ -72,6 +72,9 @@ class KpaDiagnosisDataMapperTest { @Test void shouldCreateDiagnosis(@Mock ResultSet resultSet) { + doAnswer(invocationOnMock -> Reference.builder().id(testData().get("patienten_id").toString()).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData().get(columnName); @@ -97,7 +100,7 @@ class KpaDiagnosisDataMapperTest { return Map.of( "id", "1", "icd10", "F79.9", - "patient_id", "42" + "patienten_id", "42" ); } diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapperTest.java index cf60d0f..31cc0d9 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaEcogDataMapperTest.java @@ -60,11 +60,14 @@ class KpaEcogDataMapperTest { void shouldMapResultSet(@Mock ResultSet resultSet) { var testData = Map.of( "id", "1", - "patient_id", "42", + "patienten_id", "42", "datum", new java.sql.Date(Date.from(Instant.parse("2000-01-01T12:00:00Z")).getTime()), "ecog", "1" ); + doAnswer(invocationOnMock -> Reference.builder().id(testData.get("patienten_id").toString()).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData.get(columnName); 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 54ddffb..3ac0b1d 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaProzedurDataMapperTest.java @@ -71,9 +71,12 @@ class KpaProzedurDataMapperTest { "statusgrund", "patient-death", "therapielinie", 1L, "typ", "surgery", - "patient_id", "42" + "patienten_id", "42" ); + doAnswer(invocationOnMock -> Reference.builder().id(testData.get("patienten_id").toString()).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData.get(columnName); 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 9fde745..c0d0268 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaTherapielinieDataMapperTest.java @@ -70,9 +70,12 @@ class KpaTherapielinieDataMapperTest { "intention", "S", "status", "stopped", "statusgrund", "patient-death", - "patient_id", "42" + "patienten_id", "42" ); + doAnswer(invocationOnMock -> Reference.builder().id(testData.get("patienten_id").toString()).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData.get(columnName); diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaVerwandteDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaVerwandteDataMapperTest.java index 1c6f682..269d9b9 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaVerwandteDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/KpaVerwandteDataMapperTest.java @@ -58,10 +58,13 @@ class KpaVerwandteDataMapperTest { void shouldMapResultSet(@Mock ResultSet resultSet) { var testData = Map.of( "id", "1", - "patient_id", "42", + "patienten_id", "42", "verwandtschaftsgrad", "EXT" ); + doAnswer(invocationOnMock -> Reference.builder().id(testData.get("patienten_id")).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData.get(columnName); diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapperTest.java index f0b7b5e..130cfdf 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MolekulargenetikToSpecimenDataMapperTest.java @@ -111,7 +111,7 @@ class MolekulargenetikToSpecimenDataMapperTest { return ResultSet.from( Map.of( "id", id, - "patient_id", 4711, + "patienten_id", 4711, "entnahmemethode", "B", "probenmaterial", "T" ) @@ -164,7 +164,7 @@ class MolekulargenetikToSpecimenDataMapperTest { return ResultSet.from( Map.of( "id", id, - "patient_id", 4711, + "patienten_id", 4711, "entnahmemethode", "B", "probenmaterial", "T" ) @@ -201,7 +201,7 @@ class MolekulargenetikToSpecimenDataMapperTest { return ResultSet.from( Map.of( "id", id, - "patient_id", 4711, + "patienten_id", 4711, "materialfixierung", value, "entnahmemethode", "B", "probenmaterial", "T" @@ -278,7 +278,7 @@ class MolekulargenetikToSpecimenDataMapperTest { return ResultSet.from( Map.of( "id", id, - "patient_id", 4711, + "patienten_id", 4711, "entnahmemethode", value, "probenmaterial", "T" ) @@ -348,7 +348,7 @@ class MolekulargenetikToSpecimenDataMapperTest { return ResultSet.from( Map.of( "id", id, - "patient_id", 4711, + "patienten_id", 4711, "entnahmemethode", "B", "probenmaterial", value ) diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbEpisodeDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbEpisodeDataMapperTest.java index 74b77de..c4e5060 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbEpisodeDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/MtbEpisodeDataMapperTest.java @@ -62,7 +62,7 @@ class MtbEpisodeDataMapperTest { void shouldMapData() { final Map kpaData = Map.of( "id", 4711, - "patient_id", 42, + "patienten_id", 42, "anmeldedatummtb", new java.sql.Date(Date.from(Instant.parse("2025-06-28T12:00:00Z")).getTime()) ); diff --git a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java index 71c7209..1fe3537 100644 --- a/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java +++ b/src/test/java/dev/pcvolkmer/onco/datamapper/mapper/TherapieplanDataMapperTest.java @@ -78,13 +78,16 @@ class TherapieplanDataMapperTest { void shouldCreateCarePlan(@Mock ResultSet resultSet) { final var testData = Map.of( "id", "1", - "patient_id", "42", + "patienten_id", "42", "wirkstoffe_json", "[{\"code\":\"\",\"name\":\"PARP-Inhibierung\",\"system\":\"UNREGISTERED\"}]", "protokollauszug", "Das ist ein Protokollauszug", "mit_einzelempfehlung", true, "empfehlungskategorie", "systemisch" ); + doAnswer(invocationOnMock -> Reference.builder().id(testData.get("patienten_id").toString()).type("Patient").build()) + .when(resultSet).getPatientReference(); + doAnswer(invocationOnMock -> { var columnName = invocationOnMock.getArgument(0, String.class); return testData.get(columnName); @@ -119,7 +122,7 @@ class TherapieplanDataMapperTest { void shouldSetRecommendationsMissingReason() { final Map testData = Map.of( "id", 1, - "patient_id", 42, + "patienten_id", 42, "status_begruendung", "no-target" ); @@ -145,7 +148,7 @@ class TherapieplanDataMapperTest { void shouldSetNoSequencingPerformedReason() { final Map testData = Map.of( "id", 1, - "patient_id", 42, + "patienten_id", 42, "status_begruendung", "non-genetic-cause" ); @@ -171,7 +174,7 @@ class TherapieplanDataMapperTest { void shouldMapHumGenBeratung() { final Map testData = Map.of( "id", 1, - "patient_id", 42, + "patienten_id", 42, "humangen_beratung", 1, "humangen_ber_grund", "other", "humangen_ber_grund_propcat_version", 1234