summaryrefslogtreecommitdiff
path: root/src/main/kotlin/dev/dnpm/etl
diff options
context:
space:
mode:
authorPaul-Christian Volkmer2025-12-16 01:27:59 +0100
committerGitHub2025-12-16 00:27:59 +0000
commit8e824ea9f6c6708d7d8af330455347b42aeae057 (patch)
tree49f7f5aab149102c7cd85ff4e0194dbcac5f99a4 /src/main/kotlin/dev/dnpm/etl
parent6cfb84770832a3e6cfb209c783a9fda52c5c9141 (diff)
fix: do not save PID in test mode (#228)
Diffstat (limited to 'src/main/kotlin/dev/dnpm/etl')
-rw-r--r--src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt12
-rw-r--r--src/main/kotlin/dev/dnpm/etl/processor/types.kt2
2 files changed, 6 insertions, 8 deletions
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 4721f75..22a25ee 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
@@ -66,8 +66,6 @@ class RequestProcessor(
}
fun processMtbFile(mtbFile: Mtb, requestId: RequestId) {
- val pid = PatientId(extractPatientIdentifier(mtbFile))
-
val isConsentOk =
consentProcessor != null && consentProcessor.consentGatedCheckAndTryEmbedding(mtbFile) ||
consentProcessor == null
@@ -78,7 +76,7 @@ class RequestProcessor(
mtbFile pseudonymizeWith pseudonymizeService
mtbFile anonymizeContentWith pseudonymizeService
val request = DnpmV2MtbFileRequest(requestId, transformationService.transform(mtbFile))
- saveAndSend(request, pid)
+ saveAndSend(request)
} else {
logger.warn("consent check failed file will not be processed further!")
applicationEventPublisher.publishEvent(
@@ -95,12 +93,12 @@ class RequestProcessor(
return isModelProjectConsented
}
- private fun <T> saveAndSend(request: MtbFileRequest<T>, pid: PatientId) {
+ private fun <T> saveAndSend(request: MtbFileRequest<T>) {
requestService.save(
Request(
request.requestId,
request.patientPseudonym(),
- pid,
+ emptyPatientId(),
fingerprint(request),
RequestType.MTB_FILE,
RequestStatus.UNKNOWN,
@@ -178,7 +176,7 @@ class RequestProcessor(
Request(
requestId,
patientPseudonym,
- patientId,
+ emptyPatientId(),
fingerprint(patientPseudonym.value),
RequestType.DELETE,
requestStatus,
@@ -229,5 +227,3 @@ class RequestProcessor(
)
}
}
-
-private fun extractPatientIdentifier(mtbFile: Mtb): String = mtbFile.patient.id
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/types.kt b/src/main/kotlin/dev/dnpm/etl/processor/types.kt
index c7aa110..87f5fb2 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/types.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/types.kt
@@ -42,6 +42,8 @@ fun randomRequestId() = RequestId(UUID.randomUUID().toString())
@JvmInline value class PatientId(val value: String)
+fun emptyPatientId() = PatientId("")
+
@JvmInline value class PatientPseudonym(val value: String)
fun emptyPatientPseudonym() = PatientPseudonym("")