1
0
mirror of https://github.com/pcvolkmer/etl-processor.git synced 2025-07-17 12:52:54 +00:00

Merge branch 'refs/heads/master' into 63-check-consent-status

This commit is contained in:
Jakub Lidke
2025-06-26 14:37:00 +02:00
4 changed files with 1391 additions and 1368 deletions

View File

@ -5,7 +5,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
plugins { plugins {
war war
id("org.springframework.boot") version "3.5.0" id("org.springframework.boot") version "3.5.3"
id("io.spring.dependency-management") version "1.1.7" id("io.spring.dependency-management") version "1.1.7"
kotlin("jvm") version "1.9.25" kotlin("jvm") version "1.9.25"
kotlin("plugin.spring") version "1.9.25" kotlin("plugin.spring") version "1.9.25"

View File

@ -256,6 +256,7 @@ infix fun Mtb.pseudonymizeWith(pseudonymizeService: PseudonymizeService) {
this.claims?.forEach { it.patient.id = patientPseudonym } this.claims?.forEach { it.patient.id = patientPseudonym }
this.claimResponses?.forEach { it.patient.id = patientPseudonym } this.claimResponses?.forEach { it.patient.id = patientPseudonym }
this.diagnoses?.forEach { it.patient.id = patientPseudonym } this.diagnoses?.forEach { it.patient.id = patientPseudonym }
this.familyMemberHistories?.forEach { it.patient.id = patientPseudonym }
this.histologyReports?.forEach { this.histologyReports?.forEach {
it.patient.id = patientPseudonym it.patient.id = patientPseudonym
it.results.tumorMorphology?.patient?.id = patientPseudonym it.results.tumorMorphology?.patient?.id = patientPseudonym

View File

@ -212,7 +212,7 @@ class ExtensionsTest {
inner class UsingDnpmV2Datamodel { inner class UsingDnpmV2Datamodel {
val FAKE_MTB_FILE_PATH = "mv64e-mtb-fake-patient.json" val FAKE_MTB_FILE_PATH = "mv64e-mtb-fake-patient.json"
val CLEAN_PATIENT_ID = "e14bf9b6-7982-4933-a648-cfdea6484f1c" val CLEAN_PATIENT_ID = "aca5a971-28be-4089-8128-0036a4fe6f1a"
private fun fakeMtbFile(): Mtb { private fun fakeMtbFile(): Mtb {
val mtbFile = ClassPathResource(FAKE_MTB_FILE_PATH).inputStream val mtbFile = ClassPathResource(FAKE_MTB_FILE_PATH).inputStream

File diff suppressed because it is too large Load Diff