feat: update data model for use with DNPM:DIP 1.3.5 (#332)

2 files changed, 13 insertions, 1 deletions

diff --git a/src/main/kotlin/dev/dnpm/etl/processor/pseudonym/extensions.kt b/src/main/kotlin/dev/dnpm/etl/processor/pseudonym/extensions.kt
index 21f3a7f..cc13a04 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/pseudonym/extensions.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/pseudonym/extensions.kt
@@ -95,6 +95,9 @@ infix fun PatientRecord.pseudonymizeWith(pseudonymizeService: PseudonymizeServic
   this.systemicTherapies?.filterNotNull()?.forEach { systemicTherapy ->
     systemicTherapy.history?.filterNotNull()?.forEach { it.patient?.id = patientPseudonym }
   }
+  this.studyInclusions?.filterNotNull()?.forEach { studyInclusion ->
+    studyInclusion.history?.filterNotNull()?.forEach { it.patient?.id = patientPseudonym }
+  }
   this.followUps?.filterNotNull()?.forEach { it.patient?.id = patientPseudonym }
 
   this.msiFindings?.filterNotNull()?.forEach { it.patient?.id = patientPseudonym }
@@ -278,6 +281,14 @@ infix fun PatientRecord.anonymizeContentWith(pseudonymizeService: PseudonymizeSe
       history.basedOn?.id = history.basedOn?.id?.let(::anonymize)
     }
   }
+
+  this.studyInclusions?.filterNotNull()?.forEach { studyInclusion ->
+    studyInclusion.history?.filterNotNull()?.forEach { history ->
+      history.id = history.id?.let(::anonymize)
+      history.reason?.id = history.reason?.id?.let(::anonymize)
+      history.basedOn?.id = history.basedOn?.id?.let(::anonymize)
+    }
+  }
 }
 
 fun PatientRecord.ensureMetaDataIsInitialized() {
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
index 6ce9d14..d94bfb3 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
@@ -372,11 +372,12 @@ class RequestProcessor(
     }
 
     private fun fingerprint(s: String): Fingerprint {
-        return Fingerprint(
+        val f = Fingerprint(
             Base32().encodeAsString(DigestUtils.sha256(s))
                 .replace("=", "")
                 .lowercase()
         )
+        return f
     }
 
 }