From 8e824ea9f6c6708d7d8af330455347b42aeae057 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 16 Dec 2025 01:27:59 +0100 Subject: fix: do not save PID in test mode (#228) --- .../dev/dnpm/etl/processor/services/RequestProcessor.kt | 12 ++++-------- src/main/kotlin/dev/dnpm/etl/processor/types.kt | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/main/kotlin/dev/dnpm') 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 saveAndSend(request: MtbFileRequest, pid: PatientId) { + private fun saveAndSend(request: MtbFileRequest) { 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("") -- cgit v1.2.3