chore: bump version

.gitignore

@@ -39,5 +39,3 @@ out/
 .vscode/
 /dev/gpas*
 /deploy/.env
-/dev/gICS*
-/dev/gPAS*

README.md

@@ -1,81 +1,33 @@
-# ETL-Processor für das MV gem. §64e und DNPM:DIP
+# ETL-Processor for bwHC data [![Run Tests](https://github.com/CCC-MF/etl-processor/actions/workflows/test.yml/badge.svg)](https://github.com/CCC-MF/etl-processor/actions/workflows/test.yml)
-[![Run Tests](https://github.com/pcvolkmer/etl-processor/actions/workflows/test.yml/badge.svg)](https://github.com/pcvolkmer/etl-processor/actions/workflows/test.yml)
 
-Diese Anwendung pseudonymisiert/anonymisiert Daten im DNPM-Datenmodell 2.1 für das Modellvorhaben
+Diese Anwendung versendet ein bwHC-MTB-File an das bwHC-Backend und pseudonymisiert die Patienten-ID.
-Genomsequenzierung nach §64e unter Beachtung des Consents und sendet sie an DNPM:DIP.
 
 ## Einordnung innerhalb einer DNPM-ETL-Strecke
 
-Diese Anwendung erlaubt das Entgegennehmen von HTTP/REST-Anfragen aus dem Onkostar-Plugin
+Diese Anwendung erlaubt das Entgegennehmen von HTTP/REST-Anfragen aus dem Onkostar-Plugin **[onkostar-plugin-dnpmexport](https://github.com/CCC-MF/onkostar-plugin-dnpmexport)**.
-**[mv64e-onkostar-plugin-export](https://github.com/pcvolkmer/mv64e-onkostar-plugin-export)**.
 
-Der Inhalt einer Anfrage, wenn ein MTB-File, wird pseudonymisiert und auf Duplikate geprüft.
+Der Inhalt einer Anfrage, wenn ein bwHC-MTBFile, wird pseudonymisiert und auf Duplikate geprüft.
 Duplikate werden verworfen, Änderungen werden weitergeleitet.
 
-Löschanfragen werden immer als Löschanfrage an DNPM:DIP weitergeleitet.
+Löschanfragen werden immer als Löschanfrage an das bwHC-backend weitergeleitet.
 
 Zudem ist eine minimalistische Weboberfläche integriert, die einen Einblick in den aktuellen Zustand der Anwendung gewährt.
 
 ![Modell DNPM-ETL-Strecke](docs/etl.png)
 
-### 🔥 Wichtige Änderungen in Version 0.11
-
-Ab Version 0.11 wird ausschließlich [DNPM:DIP](https://github.com/dnpm-dip) unterstützt.
-
-Zudem wurde der Name des Pakets in **mv64e-etl-processor** geändert.
-
-## Funktionsweise
-
 ### Duplikaterkennung
 
-Die Erkennung von Duplikaten ist normalerweise immer aktiv, kann jedoch über den
+Die Erkennung von Duplikaten ist normalerweise immer aktiv, kann jedoch über den Konfigurationsparameter
-Konfigurationsparameter
 `APP_DUPLICATION_DETECTION=false` deaktiviert werden.
 
-### Modelvorhaben genomDE §64e
-
-#### Vorgangsummern
-Zusätzlich zur Patienten Identifier Pseudonymisierung müssen Vorgangsummern generiert werden, die
-jede Übertragung eindeutig identifizieren aber gleichzeitig dem Patienten zugeordnet werden können.
-Dies lässt sich durch weitere Pseudonyme abbilden, allerdings werden pro Originalwert mehrere
-Pseudonyme benötigt.
-Zu diesem Zweck muss in gPas eine **Multi-Pseudonym-Domäne** konfiguriert werden (siehe auch
-*APP_PSEUDONYMIZE_GPAS_CCDN*).
-
-**WICHTIG:** Deaktivierte Pseudonymisierung ist nur für Tests nutzbar. Vorgangsummern sind zufällig
-und werden anschließend verworfen.
-
-#### Test Betriebsbereitschaft
-Um die voll Betriebsbereitschaft herzustellen, muss eine erfolgreiche Übertragung mit dem
-Submission-Typ *Test* erfolgt sein. Über die Umgebungsvariable wird dieser Übertragungsmodus
-aktiviert. Alle Datensätze mit erteilter Teilnahme am Modelvorhaben werden mit der Test-Submission-Kennung
-übertragen, unabhängig vom ursprünglichen Wert.
-
-`APP_GENOM_DE_TEST_SUBMISSION` -> `true` | `false` (falls fehlt, wird `false` angenommen)
-
 ### Datenübermittlung über HTTP/REST
 
-Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung direkt an DNPM:DIP
+Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung direkt an das bwHC-Backend gesendet.
-gesendet.
-
-Ein HTTP-Request kann, angenommen die Installation erfolgte auf dem Host `dnpm.example.com` an
-nachfolgende URLs gesendet werden:
-
-| HTTP-Request | URL                                     | Consent-Status im Datensatz | Bemerkung                                                                       |
-|--------------|-----------------------------------------|-----------------------------|---------------------------------------------------------------------------------|
-| `POST`       | `https://dnpm.example.com/mtb`          | `ACTIVE`                    | Die Anwendung verarbeitet den eingehenden Datensatz                             |
-| `POST`       | `https://dnpm.example.com/mtb`          | `REJECT`                    | Die Anwendung sendet einen Lösch-Request für die im Datensatz angegebene Pat-ID |
-| `DELETE`     | `https://dnpm.example.com/mtb/12345678` | -                           | Die Anwendung sendet einen Lösch-Request für Pat-ID `12345678`                  |
-
-Anstelle des Pfads `/mtb` kann auch, wie in Version 0.9 und älter üblich, `/mtbfile` verwendet
-werden.
 
 ### Datenübermittlung mit Apache Kafka
 
-Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung an Apache Kafka
+Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung an Apache Kafka übergeben.
-übergeben.
+Eine Antwort wird dabei ebenfalls mithilfe von Apache Kafka übermittelt und nach der Entgegennahme verarbeitet.
-Eine Antwort wird dabei ebenfalls mithilfe von Apache Kafka übermittelt und nach der Entgegennahme
-verarbeitet.
 
 Siehe hierzu auch: https://github.com/CCC-MF/kafka-to-bwhc
 
@@ -89,93 +41,37 @@ Ist diese nicht gesetzt. wird intern eine Anonymisierung der Patienten-ID vorgen
 * `APP_PSEUDONYMIZE_PREFIX`: Standortbezogenes Präfix - `UNKNOWN`, wenn nicht gesetzt
 * `APP_PSEUDONYMIZE_GENERATOR`: `BUILDIN` oder `GPAS` - `BUILDIN`, wenn nicht gesetzt
 
-**Hinweis**
+**Hinweise**: 
 
-Die Pseudonymisierung erfolgt im ETL-Prozessor nur für die Patienten-ID.
+* Der alte Konfigurationsparameter `APP_PSEUDONYMIZER` mit den Werten `GPAS` oder `BUILDIN` sollte nicht mehr verwendet
-Andere IDs werden mithilfe des standortbezogenen Präfixes (erneut) anonymisiert, um für den
+  werden.
-aktuellen Kontext nicht
+* Die Pseudonymisierung erfolgt im ETL-Prozessor nur für die Patienten-ID.
-vergleichbare IDs bereitzustellen.
+  Andere IDs werden mithilfe des standortbezogenen Präfixes (erneut) anonymisiert, um für den aktuellen Kontext nicht
+  vergleichbare IDs bereitzustellen.
 
 #### Eingebaute Anonymisierung
 
-Wurde keine oder die Verwendung der eingebauten Anonymisierung konfiguriert, so wird für die
+Wurde keine oder die Verwendung der eingebauten Anonymisierung konfiguriert, so wird für die Patienten-ID der
-Patienten-ID der entsprechende SHA-256-Hash gebildet und Base64-codiert - hier ohne endende 
+entsprechende SHA-256-Hash gebildet und Base64-codiert - hier ohne endende "=" - zuzüglich des konfigurierten Präfixes
-"=" - zuzüglich des konfigurierten Präfixes als Patienten-Pseudonym verwendet.
+als Patienten-Pseudonym verwendet.
 
 #### Pseudonymisierung mit gPAS
 
 Wurde die Verwendung von gPAS konfiguriert, so sind weitere Angaben zu konfigurieren.
 
-Ab Version 2025.1 (Multi-Pseudonym Support)
+* `APP_PSEUDONYMIZE_GPAS_URI`: URI der gPAS-Instanz inklusive Endpoint (z.B. `http://localhost:8080/ttp-fhir/fhir/gpas/$$pseudonymizeAllowCreate`)
-
+* `APP_PSEUDONYMIZE_GPAS_TARGET`: gPas Domänenname
-* `APP_PSEUDONYMIZE_GPAS_URI`: URI der gPAS-Instanz REST API (e.g. http://127.0.0.1:9990/ttp-fhir/fhir/gpas)
 * `APP_PSEUDONYMIZE_GPAS_USERNAME`: gPas Basic-Auth Benutzername
 * `APP_PSEUDONYMIZE_GPAS_PASSWORD`: gPas Basic-Auth Passwort
-* `APP_PSEUDONYMIZE_GPAS_PID_DOMAIN`: gPas Domänenname für Patienten ID
+* ~~`APP_PSEUDONYMIZE_GPAS_SSLCALOCATION`~~: **Veraltet** - Root Zertifikat für gPas, falls es dediziert hinzugefügt werden muss.
-* `APP_PSEUDONYMIZE_GPAS_GENOM_DE_TAN_DOMAIN`: gPas Multi-Pseudonym-Domäne für genomDE Vorgangsnummern (
-  Clinical data node)
 
-### (Externe) Consent-Services
+Der Konfigurationsparameter `APP_PSEUDONYMIZE_GPAS_SSLCALOCATION` sollte nicht mehr verwendet werden und wird in einer kommenden Version entfernt.
-
+Stattdessen sollte das Root Zertifikat wie unter [_Integration eines eigenen Root CA Zertifikats_](#integration-eines-eigenen-root-ca-zertifikats) beschrieben eingebunden werden.
-Consent-Services können konfiguriert werden.
-
-* `APP_CONSENT_SERVICE`: Zu verwendender (externer) Consent-Service:
-    * `NONE`: Verwende Consent-Angaben im MTB-File v1 und ändere diese nicht. Für MTB-File v2 wird
-      die Prüfung übersprungen.
-    * `GICS`: Verwende gICS der Greiswalder Tools (siehe unten).
-
-#### Einwilligung gICS
-
-Ab gIcs Version 2.13.0 kann im ETL-Processor
-per [REST-Schnittstelle](https://simplifier.net/guide/ttp-fhir-gateway-ig/ImplementationGuide-markdown-Einwilligungsmanagement-Operations-isConsented?version=current)
-der Einwilligungsstatus abgefragt werden.
-Vor der MTB-Übertragung kann der zum Sendezeitpunkt verfügbarer Einwilligungsstatus über Endpunkt
-*isConsented* (MTB-File v1) und *currentPolicyStatesForPerson* (MTB-File v2) abgefragt werden.
-
-Falls Anbindung an gICS aktiviert wurde, wird der Einwilligungsstatus der MTB Datei ignoriert.
-Stattdessen werden vorhandene Einwilligungen abgefragt und in die MTB Datei eingebettet.
-
-Es werden zwei Einwilligungsdomänen unterstützt, eine für Broad Consent und als zweites GenomDE
-Modelvorhaben §64e.
-
-##### Hinweise
-
-1. Die aktuelle Impl. nimmt an, dass die hinterlegten Domänen der Einwilligungen ausschließlich für
-   die genannten Art von Einwilligungen genutzt werden. Es finde keine weitere Filterung statt. Wir
-   fragen pro Domäne die Schnittstelle `CurrentPolicyStatesForPerson` - siehe
-   auch [IG TTP-FHIR Gateway
-   ](https://www.ths-greifswald.de/wp-content/uploads/tools/fhirgw/ig/2024-3-0/ImplementationGuide-markdown-Einwilligungsmanagement-Operations-currentPolicyStatesForPerson.html)
-   ab.
-2. Die Einwilligung wird für den Patienten-Identifier der MTB abgerufen und anschließend durch das
-   DNPM Pseudonym ersetzt.
-3. Abfragen von Einwilligungen über gesonderte Pseudonyme anstatt des MTB-Identifiers fehlt in der
-   ersten Implementierung.
-4. Bei Verarbeitung von MTB Version 1.x Inhalten ist eine positive Einwilligung für die
-   Weiterverarbeitung notwendig. Das Fehlen einer Einwilligung löst die Löschung des Patienten im
-   Brückenkopf aus.
-
-##### Konfiguration
-
-* `APP_CONSENT_SERVICE`: Muss Wert `GICS` gesetzt sein um die Abfragen zu aktivieren. Der Wert
-  `NONE` deaktiviert die Abfrage in gICS.
-* `APP_CONSENT_GICS_URI`: URI der gICS-Instanz (z.B. `http://localhost:8090/ttp-fhir/fhir/gics`)
-* `APP_CONSENT_GICS_USERNAME`: gIcs Basic-Auth Benutzername
-* `APP_CONSENT_GICS_PASSWORD`: gIcs Basic-Auth Passwort
-* `APP_CONSENT_GICS_PERSONIDENTIFIERSYSTEM`: Derzeit wird nur die PID unterstützt. wenn leer wird
-  `https://ths-greifswald.de/fhir/gics/identifiers/Patienten-ID` angenommen
-* `APP_CONSENT_GICS_BROADCONSENTDOMAINNAME`: Domäne in der gIcs Broad Consent Einwilligungen
-  verwaltet. Falls Wert leer, wird `MII` angenommen.
-* `APP_CONSENT_GICS_GNOMDECONSENTDOMAINNAME`: Domäne in der gIcs GenomDE Modelvorhaben §64e
-  Einwilligungen verwaltet. Falls Wert leer, wird `GenomDE_MV` angenommen.
-* `APP_CONSENT_GICS_POLICYCODE`: Die entscheidende Objekt-ID der zu prüfenden Einwilligung-Regel.
-  Falls leer wird `2.16.840.1.113883.3.1937.777.24.5.3.6` angenommen.
-* `APP_CONSENT_GICS_POLICYSYSTEM`: Das System der Einwilligung-Regel der Objekt-IDs. Falls leer wird
-  `urn:oid:2.16.840.1.113883.3.1937.777.24.5.3` angenommen.
 
 ### Anmeldung mit einem Passwort
 
-Ein initialer Administrator-Account kann optional konfiguriert werden und sorgt dafür, dass
+Ein initialer Administrator-Account kann optional konfiguriert werden und sorgt dafür, dass bestimmte Bereiche nur nach
-bestimmte Bereiche nur nach einem erfolgreichen Login erreichbar sind.
+einem erfolgreichen Login erreichbar sind.
 
 * `APP_SECURITY_ADMIN_USER`: Muss angegeben werden zur Aktivierung der Zugriffsbeschränkung.
 * `APP_SECURITY_ADMIN_PASSWORD`: Das Passwort für den Administrator (Empfohlen).
@@ -188,34 +84,27 @@ Hier Beispiele für das Beispielpasswort `very-secret`:
 * `{bcrypt}$2y$05$CCkfsMr/wbTleMyjVIK8g.Aa3RCvrvoLXVAsL.f6KeouS88vXD9b6`
 * `{sha256}9a34717f0646b5e9cfcba70055de62edb026ff4f68671ba3db96aa29297d2df5f1a037d58c745657`
 
-Wird kein Administrator-Passwort angegeben, wird ein zufälliger Wert generiert und beim Start der
+Wird kein Administrator-Passwort angegeben, wird ein zufälliger Wert generiert und beim Start der Anwendung in den Logs
-Anwendung in den Logs
 angezeigt.
 
 #### Weitere (nicht administrative) Nutzer mit OpenID Connect
 
-Die folgenden Konfigurationsparameter werden benötigt, um die Authentifizierung weiterer Benutzer an
+Die folgenden Konfigurationsparameter werden benötigt, um die Authentifizierung weiterer Benutzer an einen OIDC-Provider
-einen OIDC-Provider
 zu delegieren.
 Ein Admin-Benutzer muss dabei konfiguriert sein.
 
-* `APP_SECURITY_ENABLE_OIDC`: Aktiviert die Nutzung von OpenID Connect. Damit sind weitere Parameter
+* `APP_SECURITY_ENABLE_OIDC`: Aktiviert die Nutzung von OpenID Connect. Damit sind weitere Parameter erforderlich
-  erforderlich
+* `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_NAME`: Name. Wird beim zusätzlichen Loginbutton angezeigt.
-* `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_NAME`: Name. Wird beim zusätzlichen
-  Loginbutton angezeigt.
 * `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_ID`: Client-ID
 * `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_SECRET`: Client-Secret
-* `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_SCOPE[0]`: Hier sollte immer `openid`
+* `SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_CUSTOM_CLIENT_SCOPE[0]`: Hier sollte immer `openid` angegeben werden.
-  angegeben werden.
 * `SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_CUSTOM_ISSUER_URI`: Die URI des Providers,
   z.B. `https://auth.example.com/realm/example`
-* `SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_CUSTOM_USER_NAME_ATTRIBUTE`: Name des Attributes, welches
+* `SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_CUSTOM_USER_NAME_ATTRIBUTE`: Name des Attributes, welches den Benutzernamen
-  den Benutzernamen
   enthält.
   Oft verwendet: `preferred_username`
 
-Ist die Nutzung von OpenID Connect konfiguriert, erscheint ein zusätzlicher Login-Button zur Nutzung
+Ist die Nutzung von OpenID Connect konfiguriert, erscheint ein zusätzlicher Login-Button zur Nutzung mit OpenID Connect
-mit OpenID Connect
 und dem konfigurierten `CLIENT_NAME`.
 
 ![Login mit OpenID Connect](docs/login.png)
@@ -228,73 +117,58 @@ zu finden.
 
 Wird OpenID Connect verwendet, gibt es eine rollenbasierte Berechtigungszuweisung. 
 
-Die Standardrolle für neue OIDC-Benutzer kann mit der Option `APP_SECURITY_DEFAULT_USER_ROLE`
+Die Standardrolle für neue OIDC-Benutzer kann mit der Option `APP_SECURITY_DEFAULT_USER_ROLE` festgelegt werden.
-festgelegt werden.
 Mögliche Werte sind `user` oder `guest`. Standardwert ist `user`.
 
 Benutzer mit der Rolle "Gast" sehen nur die Inhalte, die auch nicht angemeldete Benutzer sehen.
 
-Hierdurch ist es möglich, einzelne Benutzer einzuschränken oder durch Änderung der Standardrolle auf
+Hierdurch ist es möglich, einzelne Benutzer einzuschränken oder durch Änderung der Standardrolle auf `guest` nur
-`guest` nur
 einzelne Benutzer als vollwertige Nutzer zuzulassen.
 
 ![Rollenverwaltung](docs/userroles.png)
 
-Benutzer werden nach dem Entfernen oder der Änderung der vergebenen Rolle automatisch abgemeldet und
+Benutzer werden nach dem Entfernen oder der Änderung der vergebenen Rolle automatisch abgemeldet und müssen sich neu anmelden.
-müssen sich neu anmelden.
 Sie bekommen dabei wieder die Standardrolle zugewiesen.
 
 #### Auswirkungen auf den dargestellten Inhalt
 
-Nur Administratoren haben Zugriff auf den Konfigurationsbereich, nur angemeldete Benutzer können die
+Nur Administratoren haben Zugriff auf den Konfigurationsbereich, nur angemeldete Benutzer können die anonymisierte oder
-anonymisierte oder
+pseudonymisierte Patienten-ID sowie den Qualitätsbericht des bwHC-Backends einsehen.
-pseudonymisierte Patienten-ID sowie den Qualitätsbericht von DNPM:DIP einsehen.
 
 Wurde kein Administrator-Account konfiguriert, sind diese Inhalte generell nicht verfügbar.
 
 ### Tokenbasierte Authentifizierung für MTBFile-Endpunkt
 
-Die Anwendung unterstützt das Erstellen und Nutzen einer tokenbasierten Authentifizierung für den
+Die Anwendung unterstützt das Erstellen und Nutzen einer tokenbasierten Authentifizierung für den MTB-File-Endpunkt.
-MTB-File-Endpunkt.
 
-Dies kann mit der Umgebungsvariable `APP_SECURITY_ENABLE_TOKENS` aktiviert (`true` oder `false`)
+Dies kann mit der Umgebungsvariable `APP_SECURITY_ENABLE_TOKENS` aktiviert (`true` oder `false`) werden
-werden
 und ist als Standardeinstellung nicht aktiv.
 
-Ist diese Einstellung aktiviert worden, ist es Administratoren möglich, Zugriffstokens für Onkostar
+Ist diese Einstellung aktiviert worden, ist es Administratoren möglich, Zugriffstokens für Onkostar zu erstellen, die
-zu erstellen, die
 zur Nutzung des MTB-File-Endpunkts eine HTTP-Basic-Authentifizierung voraussetzen.
 
 ![Tokenverwaltung](docs/tokens.png)
 
-In diesem Fall kann der Endpunkt für das Onkostar-Plugin *
+In diesem Fall können den Endpunkt für das Onkostar-Plugin **[onkostar-plugin-dnpmexport](https://github.com/CCC-MF/onkostar-plugin-dnpmexport)** wie folgt konfigurieren:
-*[mv64e-onkostar-plugin-export](https://github.com/pcvolkmer/mv64e-onkostar-plugin-export)** wie folgt
-konfiguriert werden:
 
 ```
 https://testonkostar:MTg1NTL...NGU4@etl.example.com/mtbfile
 ```
 
-Ist die Verwendung von Tokens aktiv, werden Anfragen ohne die Angabe der Token-Information
+Ist die Verwendung von Tokens aktiv, werden Anfragen ohne die Angabe der Token-Information abgelehnt.
-abgelehnt.
-
-Alternativ kann eine Authentifizierung über Benutzername/Passwort oder OIDC erfolgen.
 
 ### Transformation von Werten
 
-In Onkostar kann es vorkommen, dass ein Wert eines Merkmalskatalogs an einem Standort angepasst
+In Onkostar kann es vorkommen, dass ein Wert eines Merkmalskatalogs an einem Standort angepasst wurde und dadurch nicht dem Wert entspricht,
-wurde und dadurch nicht dem Wert entspricht,
+der vom bwHC-Backend akzeptiert wird.
-der von DNPM:DIP akzeptiert wird.
 
-Diese Anwendung bietet daher die Möglichkeit, eine Transformation vorzunehmen. Hierzu muss der "Pfad"
+Diese Anwendung bietet daher die Möglichkeit, eine Transformation vorzunehmen. Hierzu muss der "Pfad" innerhalb des JSON-MTB-Files angegeben werden und
-innerhalb des JSON-MTB-Files angegeben werden und welcher Wert wie ersetzt werden soll.
+welcher Wert wie ersetzt werden soll.
 
 Hier ein Beispiel für die erste (Index 0 - weitere dann mit 1,2, ...) Transformationsregel:
 
-* `APP_TRANSFORMATIONS_0_PATH`: Pfad zum Wert in der JSON-MTB-Datei. Beispiel:
+* `APP_TRANSFORMATIONS_0_PATH`: Pfad zum Wert in der JSON-MTB-Datei. Beispiel: `diagnoses[*].icd10.version` für **alle** Diagnosen
-  `diagnoses[*].icd10.version` für **alle** Diagnosen
+* `APP_TRANSFORMATIONS_0_FROM`: Angabe des Werts, der ersetzt werden soll. Andere Werte bleiben dabei unverändert.
-* `APP_TRANSFORMATIONS_0_FROM`: Angabe des Werts, der ersetzt werden soll. Andere Werte bleiben
-  dabei unverändert.
 * `APP_TRANSFORMATIONS_0_TO`: Angabe des neuen Werts.
 
 ### Mögliche Endpunkte zur Datenübermittlung
@@ -306,61 +180,51 @@ Werden sowohl REST als auch Kafka-Endpunkt konfiguriert, wird nur der REST-Endpu
 
 #### REST
 
-Folgende Umgebungsvariablen müssen gesetzt sein, damit ein MTB-File an DNPM:DIP gesendet wird:
+Folgende Umgebungsvariablen müssen gesetzt sein, damit ein bwHC-MTB-File an das bwHC-Backend gesendet wird:
 
-* `APP_REST_URI`: URI der zu benutzenden API der Backend-Instanz. Zum Beispiel `http://localhost:9000/api`
+* `APP_REST_URI`: URI der zu benutzenden API der bwHC-Backend-Instanz. z.B.: `http://localhost:9000/bwhc/etl/api`
-* `APP_REST_USERNAME`: Basic-Auth-Benutzername für den REST-Endpunkt
-* `APP_REST_PASSWORD`: Basic-Auth-Passwort für den REST-Endpunkt
 
 #### Kafka-Topics
 
-Folgende Umgebungsvariablen müssen gesetzt sein, damit ein MTB-File an ein Kafka-Topic
+Folgende Umgebungsvariablen müssen gesetzt sein, damit ein bwHC-MTB-File an ein Kafka-Topic übermittelt wird:
-übermittelt wird:
 
 * `APP_KAFKA_OUTPUT_TOPIC`: Zu verwendendes Topic zum Versenden von Anfragen. 
-* `APP_KAFKA_OUTPUT_RESPONSE_TOPIC`: Topic mit Antworten über den Erfolg des Versendens.
+  Ersetzt in einer kommenden Version `APP_KAFKA_TOPIC`. 
-  Standardwert: `APP_KAFKA_TOPIC` mit Anhang "_response".
+* `APP_KAFKA_OUTPUT_RESPONSE_TOPIC`: Topic mit Antworten über den Erfolg des Versendens. Standardwert: `APP_KAFKA_TOPIC` mit Anhang "_response".
-* `APP_KAFKA_GROUP_ID`: Kafka GroupID des Consumers. Standardwert: `APP_KAFKA_TOPIC` mit Anhang "_
+  Ersetzt in einer kommenden Version `APP_KAFKA_RESPONSE_TOPIC`.
-  group".
+* `APP_KAFKA_GROUP_ID`: Kafka GroupID des Consumers. Standardwert: `APP_KAFKA_TOPIC` mit Anhang "_group".
 * `APP_KAFKA_SERVERS`: Zu verwendende Kafka-Bootstrap-Server als kommagetrennte Liste
 
-Wird keine Rückantwort über Apache Kafka empfangen und es gibt keine weitere Möglichkeit den Status
+Wird keine Rückantwort über Apache Kafka empfangen und es gibt keine weitere Möglichkeit den Status festzustellen, verbleibt der Status auf `UNKNOWN`.
-festzustellen, verbleibt der Status auf `UNKNOWN`.
 
 Weitere Einstellungen können über die Parameter von Spring Kafka konfiguriert werden.
 
-Lässt sich keine Verbindung zu dem Backend aufbauen, wird eine Rückantwort mit Status-Code `900`
+Lässt sich keine Verbindung zu dem bwHC-Backend aufbauen, wird eine Rückantwort mit Status-Code `900` erwartet, welchen es
-erwartet, welchen es
 für HTTP nicht gibt.
 
-Wird die Umgebungsvariable `APP_KAFKA_INPUT_TOPIC` gesetzt, kann eine Nachricht auch über dieses
+Wird die Umgebungsvariable `APP_KAFKA_INPUT_TOPIC` gesetzt, kann eine Nachricht auch über dieses Kafka-Topic an den ETL-Prozessor übermittelt werden.
-Kafka-Topic an den ETL-Prozessor übermittelt werden.
 
 ##### Retention Time
 
 Generell werden in Apache Kafka alle Records entsprechend der Konfiguration vorgehalten.
 So wird ohne spezielle Konfiguration ein Record für 7 Tage in Apache Kafka gespeichert.
-Es sind innerhalb dieses Zeitraums auch alte Informationen weiterhin enthalten, wenn der Consent
+Es sind innerhalb dieses Zeitraums auch alte Informationen weiterhin enthalten, wenn der Consent später abgelehnt wurde.
-später abgelehnt wurde.
 
 Durch eine entsprechende Konfiguration des Topics kann dies verhindert werden.
 
 Beispiel - auszuführen innerhalb des Kafka-Containers: Löschen alter Records nach einem Tag
-
 ```
 kafka-configs.sh --bootstrap-server localhost:9092 --alter --topic test --add-config retention.ms=86400000
 ```
 
 ##### Key based Retention
 
-Möchten Sie hingegen immer nur die letzte Meldung für einen Patienten und eine Erkrankung in Apache
+Möchten Sie hingegen immer nur die letzte Meldung für einen Patienten und eine Erkrankung in Apache Kafka vorhalten,
-Kafka vorhalten,
 so ist die nachfolgend genannte Konfiguration der Kafka-Topics hilfreich.
 
-* `retention.ms`: Möglichst kurze Zeit in der alte Records noch erhalten bleiben, z.B. 10 Sekunden
+
-  10000
+* `retention.ms`: Möglichst kurze Zeit in der alte Records noch erhalten bleiben, z.B. 10 Sekunden 10000
-* `cleanup.policy`: Löschen alter Records und Beibehalten des letzten Records zu einem
+* `cleanup.policy`: Löschen alter Records und Beibehalten des letzten Records zu einem Key [delete,compact]
-  Key [delete,compact]
 
 Beispiele für ein Topic `test`, hier bitte an die verwendeten Topics anpassen.
 
@@ -369,39 +233,21 @@ kafka-configs.sh --bootstrap-server localhost:9092 --alter --topic test --add-co
 kafka-configs.sh --bootstrap-server localhost:9092 --alter --topic test --add-config cleanup.policy=[delete,compact]
 ```
 
-Da als Key eines Records die (pseudonymisierte) Patienten-ID verwendet wird, stehen mit obiger
+Da als Key eines Records die (pseudonymisierte) Patienten-ID verwendet wird, stehen mit obiger Konfiguration 
-Konfiguration
+der Kafka-Topics nach 10 Sekunden nur noch der jeweils letzte Eintrag für den entsprechenden Key zur Verfügung.
-der Kafka-Topics nach 10 Sekunden nur noch der jeweils letzte Eintrag für den entsprechenden Key zur
-Verfügung.
 
-Da der Key sowohl für die Records in Richtung DNPM:DIP, als auch für die Rückantwort identisch
+Da der Key sowohl für die Records in Richtung bwHC-Backend für die Rückantwort identisch aufgebaut ist, lassen sich so
-aufgebaut ist, lassen sich so
+auch im Falle eines Consent-Widerspruchs die enthaltenen Daten als auch die Offenlegung durch Verifikationsdaten in der
-auch im Falle eines Consent-Widerspruchs die enthaltenen Daten als auch die Offenlegung durch
-Verifikationsdaten in der
 Antwort effektiv verhindern, da diese nach 10 Sekunden gelöscht werden.
 
-Es steht dann nur noch die jeweils letzten Information zur Verfügung, dass für einen Patienten/eine
+Es steht dann nur noch die jeweils letzten Information zur Verfügung, dass für einen Patienten/eine Erkrankung
-Erkrankung
 ein Consent-Widerspruch erfolgte.
 
-Dieses Vorgehen empfiehlt sich, wenn Sie gespeicherte Records nachgelagert für andere Auswertungen
+Dieses Vorgehen empfiehlt sich, wenn Sie gespeicherte Records nachgelagert für andere Auswertungen verwenden möchten.
-verwenden möchten.
-
-### Antworten und Statusauswertung
-
-Seit Version 0.10 wird die Issue-Liste der Antwort verwendet und die darion enthaltene höchste
-Severity-Stufe als Ergebnis verwendet.
-
-| Höchste Severity | Status    |
-|------------------|-----------|
-| `info`           | `SUCCESS` |
-| `warning`        | `WARNING` |
-| `error`, `fatal` | `ERROR`   |
 
 ## Docker-Images
 
-Diese Anwendung ist auch als Docker-Image
+Diese Anwendung ist auch als Docker-Image verfügbar: https://github.com/CCC-MF/etl-processor/pkgs/container/etl-processor
-verfügbar: https://github.com/pcvolkmer/etl-processor/pkgs/container/etl-processor
 
 ### Images lokal bauen 
 
@@ -411,25 +257,20 @@ verfügbar: https://github.com/pcvolkmer/etl-processor/pkgs/container/etl-proces
 
 ### Integration eines eigenen Root CA Zertifikats
 
-Wird eine eigene Root CA verwendet, die nicht offiziell signiert ist, wird es zu Problemen beim
+Wird eine eigene Root CA verwendet, die nicht offiziell signiert ist, wird es zu Problemen beim SSL-Handshake kommen, wenn z.B. gPAS zur Generierung von Pseudonymen verwendet wird.
-SSL-Handshake kommen, wenn z.B. gPAS zur Generierung von Pseudonymen verwendet wird.
 
 Hier bietet es sich an, das Root CA Zertifikat in das Image zu integrieren.
 
 #### Integration beim Bauen des Images
 
-Hier muss die Zeile `"BP_EMBED_CERTS" to "true"` in der Datei `build.gradle.kts` verwendet werden
+Hier muss die Zeile `"BP_EMBED_CERTS" to "true"` in der Datei `build.gradle.kts` verwendet werden und darf nicht als Kommentar verwendet werden.
-und darf nicht als Kommentar verwendet werden.
 
-Die PEM-Datei mit dem/den Root CA Zertifikat(en) muss dabei im vorbereiteten Verzeichnis [
+Die PEM-Datei mit dem/den Root CA Zertifikat(en) muss dabei im vorbereiteten Verzeichnis [`bindings/ca-certificates`](bindings/ca-certificates) enthalten sein.
-`bindings/ca-certificates`](bindings/ca-certificates) enthalten sein.
 
 #### Integration zur Laufzeit
 
 Hier muss die Umgebungsvariable `SERVICE_BINDING_ROOT` z.B. auf den Wert `/bindings` gesetzt sein.
-Zudem muss ein Verzeichnis `bindings/ca-certificates` - analog zum Verzeichnis
+Zudem muss ein Verzeichnis `bindings/ca-certificates` - analog zum Verzeichnis [`bindings/ca-certificates`](bindings/ca-certificates) mit einer PEM-Datei als Docker-Volume eingebunden werden.
-[`bindings/ca-certificates`](bindings/ca-certificates) mit einer PEM-Datei und der 
-Datei [`bindings/ca-certificates/type`](bindings/ca-certificates/type) als Docker-Volume eingebunden werden.
 
 Beispiel für Docker-Compose:
 
@@ -444,14 +285,12 @@ Beispiel für Docker-Compose:
 ```
 
 ## Deployment
-
 *Ausführen als Docker Container:*
 
 ```bash
 cd ./deploy
 cp env-sample.env .env
 ```
-
 Wenn gewünscht, Änderungen in der `.env` vornehmen.
 
 ```bash
@@ -460,19 +299,15 @@ docker compose up -d
 
 ### Einfaches Beispiel für ein eigenes Docker-Compose-File
 
-Die Datei [`docs/docker-compose.yml`](docs/docker-compose.yml) zeigt eine einfache Konfiguration für
+Die Datei [`docs/docker-compose.yml`](docs/docker-compose.yml) zeigt eine einfache Konfiguration für REST-Requests basierend 
-REST-Requests basierend
 auf Docker-Compose mit der gestartet werden kann.
 
 ### Betrieb hinter einem Reverse-Proxy
 
-Die Anwendung verarbeitet `X-Forwarded`-HTTP-Header und kann daher auch hinter einem Reverse-Proxy
+Die Anwendung verarbeitet `X-Forwarded`-HTTP-Header und kann daher auch hinter einem Reverse-Proxy betrieben werden.
-betrieben werden.
 
-Dabei werden, je nachdem welche Header durch den Reverse-Proxy gesendet werden auch Protokoll, Host
+Dabei werden, je nachdem welche Header durch den Reverse-Proxy gesendet werden auch Protokoll, Host oder auch Path-Präfix
-oder auch Path-Präfix
+automatisch erkannt und verwendet werden. Dadurch ist z.B. eine abweichende Angabe des Pfads problemlos möglich.
-automatisch erkannt und verwendet werden. Dadurch ist z.B. eine abweichende Angabe des Pfads
-problemlos möglich.
 
 #### Beispiel *Traefik* (mit Docker-Labels):
 
@@ -508,17 +343,13 @@ Das folgende Beispiel zeigt die Konfiguration einer _location_ in einer nginx-Ko
 
 ## Entwicklungssetup
 
-Zum Starten einer lokalen Entwicklungs- und Testumgebung kann die beiliegende Datei
+Zum Starten einer lokalen Entwicklungs- und Testumgebung kann die beiliegende Datei `dev-compose.yml` verwendet werden.
-`dev-compose.yml` verwendet werden.
 Diese kann zur Nutzung der Datenbanken **MariaDB** als auch **PostgreSQL** angepasst werden.
 
-Zur Nutzung von Apache Kafka muss dazu ein Eintrag im hosts-File vorgenommen werden und der Hostname
+Zur Nutzung von Apache Kafka muss dazu ein Eintrag im hosts-File vorgenommen werden und der Hostname `kafka` auf die lokale
-`kafka` auf die lokale
+IP-Adresse verweisen. Ohne diese Einstellung ist eine Nutzung von Apache Kafka außerhalb der Docker-Umgebung nicht möglich.
-IP-Adresse verweisen. Ohne diese Einstellung ist eine Nutzung von Apache Kafka außerhalb der
-Docker-Umgebung nicht möglich.
 
-Beim Start der Anwendung mit dem Profil `dev` wird die in `dev-compose.yml` definierte Umgebung beim
+Beim Start der Anwendung mit dem Profil `dev` wird die in `dev-compose.yml` definierte Umgebung beim Start der
-Start der
 Anwendung mit gestartet:
 
 ```
@@ -529,6 +360,3 @@ Die Datei `application-dev.yml` enthält hierzu die Konfiguration für das Profi
 
 Beim Ausführen der Integrationstests wird eine Testdatenbank in einem Docker-Container gestartet.
 Siehe hier auch die Klasse `AbstractTestcontainerTest` unter `src/integrationTest`.
-
-Ein einfaches Entwickler-Setup inklusive DNPM:DIP ist mit Hilfe
-von https://github.com/pcvolkmer/dnpmdip-devenv realisierbar.

build.gradle.kts

@@ -1,35 +1,30 @@
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 
 plugins {
     war
-    id("org.springframework.boot") version "3.5.5"
+    id("org.springframework.boot") version "3.2.12"
-    id("io.spring.dependency-management") version "1.1.7"
+    id("io.spring.dependency-management") version "1.1.5"
-    kotlin("jvm") version "1.9.25"
+    kotlin("jvm") version "1.9.24"
-    kotlin("plugin.spring") version "1.9.25"
+    kotlin("plugin.spring") version "1.9.24"
-    jacoco
 }
 
 group = "dev.dnpm"
-version = "0.11.0"
+version = "0.9.9"
 
 var versions = mapOf(
-    "mtb-dto" to "0.1.0-SNAPSHOT",
+    "bwhc-dto-java" to "0.3.0",
-    "hapi-fhir" to "7.6.1",
+    "hapi-fhir" to "6.10.5",
-    "mockito-kotlin" to "5.4.0",
+    "httpclient5" to "5.2.3",
-    "archunit" to "1.3.0",
+    "mockito-kotlin" to "5.3.1",
     // Webjars
-    "webjars-locator" to "0.52",
     "echarts" to "5.4.3",
     "htmx.org" to "1.9.12"
 )
 
 java {
-    toolchain {
+    sourceCompatibility = JavaVersion.VERSION_21
-        languageVersion = JavaLanguageVersion.of(21)
-    }
 }
 
 sourceSets {
@@ -48,18 +43,9 @@ configurations {
     compileOnly {
         extendsFrom(configurations.annotationProcessor.get())
     }
-
-    all {
-        resolutionStrategy {
-            cacheChangingModulesFor(5, "minutes")
-        }
-    }
 }
 
 repositories {
-    maven {
-        url = uri("https://git.dnpm.dev/api/packages/public-snapshots/maven")
-    }
     maven {
         url = uri("https://git.dnpm.dev/api/packages/public/maven")
     }
@@ -76,49 +62,37 @@ dependencies {
     implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.springframework.kafka:spring-kafka")
-    implementation("org.flywaydb:flyway-database-postgresql")
     implementation("org.flywaydb:flyway-mysql")
     implementation("commons-codec:commons-codec")
     implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
-    implementation("dev.pcvolkmer.mv64e:mtb-dto:${versions["mtb-dto"]}") { isChanging = true }
+    implementation("de.ukw.ccc:bwhc-dto-java:${versions["bwhc-dto-java"]}")
     implementation("ca.uhn.hapi.fhir:hapi-fhir-base:${versions["hapi-fhir"]}")
     implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${versions["hapi-fhir"]}")
-    implementation("org.apache.httpcomponents.client5:httpclient5")
+    implementation("org.apache.httpcomponents.client5:httpclient5:${versions["httpclient5"]}")
     implementation("com.jayway.jsonpath:json-path")
-    implementation("org.webjars:webjars-locator:${versions["webjars-locator"]}")
+    implementation("org.webjars:webjars-locator:0.52")
     implementation("org.webjars.npm:echarts:${versions["echarts"]}")
     implementation("org.webjars.npm:htmx.org:${versions["htmx.org"]}")
-    // Fix for CVE-2025-48924
-    implementation("org.apache.commons:commons-lang3:3.18.0")
-
     runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
     runtimeOnly("org.postgresql:postgresql")
-
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     developmentOnly("org.springframework.boot:spring-boot-docker-compose")
-
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
-
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
     testImplementation("io.projectreactor:reactor-test")
     testImplementation("org.mockito.kotlin:mockito-kotlin:${versions["mockito-kotlin"]}")
-
     integrationTestImplementation("org.testcontainers:junit-jupiter")
     integrationTestImplementation("org.testcontainers:postgresql")
-    integrationTestImplementation("com.tngtech.archunit:archunit:${versions["archunit"]}")
+    // Override dependency version from org.testcontainers:junit-jupiter - CVE-2024-26308, CVE-2024-25710
-    integrationTestImplementation("org.htmlunit:htmlunit")
+    integrationTestImplementation("org.apache.commons:commons-compress:1.26.2")
-    integrationTestImplementation("org.springframework:spring-webflux")
-    // Fix for CVE-2024-25710
-    integrationTestImplementation("org.apache.commons:commons-compress:1.26.0")
 }
 
 tasks.withType<KotlinCompile> {
-    compilerOptions {
+    kotlinOptions {
-        freeCompilerArgs.add("-Xjsr305=strict")
+        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget.set(JvmTarget.JVM_21)
+        jvmTarget = "21"
     }
 }
 
@@ -129,9 +103,8 @@ tasks.withType<Test> {
     }
 }
 
-tasks.register<Test>("integrationTest") {
+task<Test>("integrationTest") {
     description = "Runs integration tests"
-    group = "verification"
 
     testClassesDirs = sourceSets["integrationTest"].output.classesDirs
     classpath = sourceSets["integrationTest"].runtimeClasspath
@@ -139,24 +112,8 @@ tasks.register<Test>("integrationTest") {
     shouldRunAfter("test")
 }
 
-tasks.register("allTests") {
-    description = "Run all tests"
-    group = JavaBasePlugin.VERIFICATION_GROUP
-    dependsOn(tasks.withType<Test>())
-}
-
-tasks.jacocoTestReport {
-    dependsOn("allTests")
-
-    executionData(fileTree(project.rootDir.absolutePath).include("**/build/jacoco/*.exec"))
-
-    reports {
-        xml.required = true
-    }
-}
-
 tasks.named<BootBuildImage>("bootBuildImage") {
-    imageName.set("ghcr.io/pcvolkmer/mv64e-etl-processor")
+    imageName.set("ghcr.io/pcvolkmer/etl-processor")
 
     // Binding for CA Certs
     bindings.set(listOf(
@@ -166,8 +123,8 @@ tasks.named<BootBuildImage>("bootBuildImage") {
     environment.set(environment.get() + mapOf(
         // Enable this line to embed CA Certs into image on build time
         //"BP_EMBED_CERTS" to "true",
-        "BP_OCI_SOURCE" to "https://github.com/pcvolkmer/mv64e-etl-processor",
+        "BP_OCI_SOURCE" to "https://github.com/pcvolkmer/etl-processor",
         "BP_OCI_LICENSES" to "AGPLv3",
-        "BP_OCI_DESCRIPTION" to "ETL Processor for MV § 64e and DNPM:DIP"
+        "BP_OCI_DESCRIPTION" to "ETL Processor for bwHC MTB files"
     ))
 }

deploy/docker-compose.yaml

@@ -18,9 +18,6 @@ services:
       APP_KAFKA_GROUP_ID: ${DNPM_KAFKA_GROUP_ID}
       APP_KAFKA_RESPONSE_TOPIC: ${DNPM_KAFKA_RESPONSE_TOPIC}
       APP_REST_URI: ${DNPM_BWHC_REST_URI}
-      APP_REST_USERNAME: ${DNPM_BWHC_REST_USERNAME}
-      APP_REST_PASSWORD: ${DNPM_BWHC_REST_PASSWORD}
-      APP_REST_IS_BWHC: ${DNPM_BWHC_REST_IS_BWHC}
       APP_SECURITY_ADMIN_USER: ${DNPM_ADMIN_USER}
       APP_SECURITY_ADMIN_PASSWORD: ${DNPM_ADMIN_PASSWORD}
       SPRING_DATASOURCE_URL: ${DNPM_DATASOURCE_URL}

deploy/env-sample.env

@@ -28,9 +28,6 @@ DNPM_DATASOURCE_URL=jdbc:mariadb://dnpm-monitor-db:3306/$DNPM_MARIADB_DB
 ## TARGET SYSTEMS CONFIG
 # in case of direct access to bwhc enter endpoint url here
 DNPM_BWHC_REST_URI=
-DNPM_BWHC_REST_USERNAME=
-DNPM_BWHC_REST_PASSWORD=
-DNPM_BWHC_REST_IS_BWHC=false
 
 # produce mtb files to this topic - values 'false' disabling kafka processing
 DNPM_KAFKA_TOPIC=false

dev-compose.yml

@@ -1,125 +1,24 @@
 services:
   kafka:
-    image: apache/kafka
+    image: bitnami/kafka
     hostname: kafka
     ports:
       - "9092:9092"
       - "9094:9094"
     environment:
       ALLOW_PLAINTEXT_LISTENER: "yes"
-      KAFKA_NODE_ID: "0"
+      KAFKA_CFG_NODE_ID: "0"
-      KAFKA_KRAFT_CLUSTER_ID: "mv64e-etl-processor-dev"
+      KAFKA_CFG_PROCESS_ROLES: "controller,broker"
-      KAFKA_CONTROLLER_QUORUM_VOTERS: 0@kafka:9093
+      KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
-      KAFKA_PROCESS_ROLES: "controller,broker"
+      KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094
-      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_CFG_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: "1"
+      KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: true
-      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: "1"
+      KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@kafka:9093
-      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: "1"
+      KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: "0"
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
-      # Without SSL
-      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      # Using SSL
-#      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
-#      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:9092,EXTERNAL://localhost:9094
-#      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,EXTERNAL:SSL,PLAINTEXT:PLAINTEXT
-#      KAFKA_SSL_KEYSTORE_TYPE: "PEM"
-#      KAFKA_SSL_KEYSTORE_CERTIFICATE_CHAIN: -----BEGIN CERTIFICATE-----
-#        MIIDCzCCAfOgAwIBAgIUaXNh4PahaKeLUaab2rUPSVESx28wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODEyMTFaFw0zNTA4
-#        MTkxODEyMTFaMBUxEzARBgNVBAMMCkV4YW1wbGUgQ0EwggEiMA0GCSqGSIb3DQEB
-#        AQUAA4IBDwAwggEKAoIBAQCsqalqVOLFglVbX9oSHU91ebyL1kPyb/2N90UGQIcD
-#        UAjzKxxysId1Vdvtbbwgli6UgfPwlzFP2Wlw51h496yL4QU/9tNV956UJ1RoS/fG
-#        qBAEHctqavfMI27UQmIzw4pGMkGzEQxRMc6a9pdabBhbMMTJsjtmOv2YMYHj1HHK
-#        Dr7wTBTt2l0eRyCR0kZ8XGIMWhYowPa4EMpC7+4e5Nf/7LSJZWLLy9jXPpazsjkJ
-#        jEmDNlFfx2tZiq0Wz2Xj1pZSDLbcuIX4IHcLfMvagibfrCMX/h6+WuW42sWPRuBW
-#        wB6cHGlXs+K/gBBWxtD7sOTacO5hbHFsfaJOhSEIGoIpAgMBAAGjUzBRMB0GA1Ud
-#        DgQWBBT2S/C2++ECY+CSuN5KKql0umfbTDAfBgNVHSMEGDAWgBT2S/C2++ECY+CS
-#        uN5KKql0umfbTDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBj
-#        H4DdwqrOHg7sVsqiwDsZfTharpUDCYeG5XhrJQlnA9eKwyofTb929W/fjOwBdDtg
-#        9THT/omR0lA8/UyHtezMT6nMsCn4HG2mXvx6ghgvA3jrFTEY7R80dHkboLMTV3u4
-#        RYgC9S3BJPcbJYpM0cXzkp2T0F4FxWZlfqefuedHuX3zcCxpgVD56qQb2a131TX7
-#        O3UDJfVg8a65IFtehndqILgLVrf7w6+pbmDAlCg5RKrt2USEYyZXYdyTryJbdtn4
-#        BCLp0avYtSYVUGwgH0oUCpkjQRwMg1003TTz8SNnmE7mAXHYljyYejnjL8vBHfch
-#        8tTDVXQn08BT9H3jZTnF
-#        -----END CERTIFICATE-----
-#        -----BEGIN CERTIFICATE-----
-#        MIIC+TCCAeGgAwIBAgIUUoCwz8GS6xQ3mmI7RUUYSNPIOi4wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODE0NDhaFw0zNTA4
-#        MTkxODE0NDhaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB
-#        BQADggEPADCCAQoCggEBAL9PW99MhhBwdEmTHyZgfnhfTrxZPrNU6z1UdV8b82Lk
-#        3p75o8eCKa9iOd7DDQlo75hQBhhX0+Xc3mucrstx5p8TYFMbypif8ojWh3LM++P8
-#        tz3ezQZlq86ycyKpm8dqlA03b227tFDfiYTev2eD2HN40BU7yDAYhhqd/QW8+MV2
-#        jkcRGv5cE21GZxWmPUpkVN+bNoBC8H90WmkST90LfeYF+wZnlsAJZH6AQzR1GnGD
-#        ICE5evMhC78hvRnpgeA310SyxssZEigkePL5lTZOBPY2IuzBqL05agyVTiVq4Xd6
-#        y3xOqXoxxOhZu06yd3nymorqeTgbF1fW8wQF0u3KsFECAwEAAaNCMEAwHQYDVR0O
-#        BBYEFHk9jMWRAAt2YsBSxUcOQVoWayoHMB8GA1UdIwQYMBaAFPZL8Lb74QJj4JK4
-#        3koqqXS6Z9tMMA0GCSqGSIb3DQEBCwUAA4IBAQBqabAA9INONDaLHqs9i9YQHm/g
-#        AnB7xRl/RFbERKKCTSMZUYM8oEaaH0W2ENoPMc/7xOB/R8a7Rm62PTr6syxwhZrY
-#        5NtGKJOD+rh90/5l83tulf93KqOJtGkiv6NBDvCNrITcA+UKRk/z4GcFi2YjWAl4
-#        wvY44lzTasMKSpjUQ5N0VNANcW3nVuEgPQ8rrr0NOK/5j4guPjsXDsixa47gqblA
-#        5xGfBKeVmEXdPbzawZfP4hPIw7DpX2m8Y0erswF1ZxkIV73V3TDsFSLcqSKSzZr6
-#        mtj8COlV9Us7zqaJbV5eOl7GN1T9orZJwZmX1Z46gCkkSLYDP/dqtl2j9JgN
-#        -----END CERTIFICATE-----
-#      KAFKA_SSL_KEYSTORE_KEY: -----BEGIN PRIVATE KEY-----
-#        MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/T1vfTIYQcHRJ
-#        kx8mYH54X068WT6zVOs9VHVfG/Ni5N6e+aPHgimvYjneww0JaO+YUAYYV9Pl3N5r
-#        nK7LceafE2BTG8qYn/KI1odyzPvj/Lc93s0GZavOsnMiqZvHapQNN29tu7RQ34mE
-#        3r9ng9hzeNAVO8gwGIYanf0FvPjFdo5HERr+XBNtRmcVpj1KZFTfmzaAQvB/dFpp
-#        Ek/dC33mBfsGZ5bACWR+gEM0dRpxgyAhOXrzIQu/Ib0Z6YHgN9dEssbLGRIoJHjy
-#        +ZU2TgT2NiLswai9OWoMlU4lauF3est8Tql6McToWbtOsnd58pqK6nk4GxdX1vME
-#        BdLtyrBRAgMBAAECggEAC1wXfPlqxoQe65WAVoOJTvV90+JKvlRPCZu/wm+C8r7b
-#        Vz5Ekt6wQflHrWoQlpv0CivKSNzCONZ2IJazrGHti0mXwSeXzptEyApRDaiNVnrV
-#        mKdnrjcQThw7iPXgSaWS9/vwMmhgayLy5ABkBi4GhsjINlKP7wctw1vZP+N6NCNd
-#        Ql3taStvDKmG0SfJHF6/2o/XBpof3IJEL7ghbzyTTbWWaO34J1mJ8A+AmjGhj9GE
-#        Dp3XuOrO9W7MVd1nfZDtGBS8qf80AwROyodZZRma9vZuWJZ5aQFi2CnUEtU1T+Uv
-#        tW+F6tg2FOMr8M0Fb79wGIDwSF8u/QcTvwhEzZAfiQKBgQDioOofnE1oB1DOMnqZ
-#        SOFjs+vsirvS6G3lo27+HkE3TgvCHR4sk1305AiXtjmPu8iaUCo9qn18MtduY2RS
-#        CcKMOG/FxhmDyP5I29DhJRhvERIpJd0kcSDQOgtaoVPC1XzIlyTqte6nGX9kAnA/
-#        x/OOXrZ0hjhMNDcZzf2NasPYJQKBgQDYGqTobkVBk+eekNWklnTh41/649rUIgTu
-#        JStArtY2hgaEInYcGa2e7cEj7nIHA0iGy3EJ2yvwoUIyxtoXVcGohu2IrzlhS33T
-#        R4jA7nE2/yHZrEMEJovuSU0eMw7rgvEtL79Q0RToYnTY1EU6X/BBoFfiiEeNMHKz
-#        zjDOOQ6ZvQKBgGCWChIc0FSkwYiPtPZ9PCn89XCjk/cIPkYfiF9fT5Ydeh9pv4Fp
-#        8SI8yXi3HgMnGhDCV65eagqztGMEky3voO2X4/MbQaaL0+wDWxuJbsdvNBk7XOt6
-#        F20HP+2JUiR4Ti1DVWV+0k5/LG7YJzTXp/KmZQZ2aan4mv8xbn2F4h/NAoGAI4ou
-#        OLN53FEQtHkpSYoc6tFUBZTXdi+qE+g09sxKGmlsROrN9c0bSpnbO6eJRTH7CYAH
-#        tRFAZrB+jI87ar8FvEuEYQhALYoWxVpsWR5drCfFT2EPHG2icavIbQEEoSLFuyKx
-#        Gf9oqtcWVFqEkBcbEg/mpDC5Y7TmCEAOsrubdRkCgYEAl7B+EzIdG0rabGoti09q
-#        QXfyiTjR7nQYkhpLxMCeNlCpQ8Y15XSa8bm1UIGYqj/ZBpeBNhrj64IHoub5Vd43
-#        tzbb8yNgoLUd16TU1VvyccCMGQVPIF8RkDsAtEawV2eoXbHAstN99xbC8jsLNZRQ
-#        fcfgTiQaXRJmlVx6jfbfZd4=
-#        -----END PRIVATE KEY-----
-#      #KAFKA_SSL_KEYSTORE_CREDENTIALS: example
-#      KAFKA_SSL_KEY_CREDENTIALS: example
-#      KAFKA_SSL_TRUSTSTORE_TYPE: "PEM"
-#      KAFKA_SSL_TRUSTSTORE_CERTIFICATES: -----BEGIN CERTIFICATE-----
-#        MIIDCzCCAfOgAwIBAgIUaXNh4PahaKeLUaab2rUPSVESx28wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODEyMTFaFw0zNTA4
-#        MTkxODEyMTFaMBUxEzARBgNVBAMMCkV4YW1wbGUgQ0EwggEiMA0GCSqGSIb3DQEB
-#        AQUAA4IBDwAwggEKAoIBAQCsqalqVOLFglVbX9oSHU91ebyL1kPyb/2N90UGQIcD
-#        UAjzKxxysId1Vdvtbbwgli6UgfPwlzFP2Wlw51h496yL4QU/9tNV956UJ1RoS/fG
-#        qBAEHctqavfMI27UQmIzw4pGMkGzEQxRMc6a9pdabBhbMMTJsjtmOv2YMYHj1HHK
-#        Dr7wTBTt2l0eRyCR0kZ8XGIMWhYowPa4EMpC7+4e5Nf/7LSJZWLLy9jXPpazsjkJ
-#        jEmDNlFfx2tZiq0Wz2Xj1pZSDLbcuIX4IHcLfMvagibfrCMX/h6+WuW42sWPRuBW
-#        wB6cHGlXs+K/gBBWxtD7sOTacO5hbHFsfaJOhSEIGoIpAgMBAAGjUzBRMB0GA1Ud
-#        DgQWBBT2S/C2++ECY+CSuN5KKql0umfbTDAfBgNVHSMEGDAWgBT2S/C2++ECY+CS
-#        uN5KKql0umfbTDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBj
-#        H4DdwqrOHg7sVsqiwDsZfTharpUDCYeG5XhrJQlnA9eKwyofTb929W/fjOwBdDtg
-#        9THT/omR0lA8/UyHtezMT6nMsCn4HG2mXvx6ghgvA3jrFTEY7R80dHkboLMTV3u4
-#        RYgC9S3BJPcbJYpM0cXzkp2T0F4FxWZlfqefuedHuX3zcCxpgVD56qQb2a131TX7
-#        O3UDJfVg8a65IFtehndqILgLVrf7w6+pbmDAlCg5RKrt2USEYyZXYdyTryJbdtn4
-#        BCLp0avYtSYVUGwgH0oUCpkjQRwMg1003TTz8SNnmE7mAXHYljyYejnjL8vBHfch
-#        8tTDVXQn08BT9H3jZTnF
-#        -----END CERTIFICATE-----
-#      KAFKA_SSL_CLIENT_AUTH: none
-      ###
 
-  ## Use AKHQ as Kafka web frontend
   akhq:
-    image: tchiotludo/akhq:0.25.0
+    image: tchiotludo/akhq:0.21.0
     environment:
       AKHQ_CONFIGURATION: |
         akhq:
@@ -133,8 +32,6 @@ services:
     ports:
       - "8084:8080"
 
-
-## For use with MariaDB
   mariadb:
     image: mariadb:10
     ports:
@@ -145,7 +42,6 @@ services:
       MARIADB_PASSWORD: dev
       MARIADB_ROOT_PASSWORD: dev
 
-## For use with Postgres
 #  postgres:
 #    image: postgres:alpine
 #    ports:

dev/docker-compose.dev.yml

@@ -2,55 +2,31 @@ version: '3.7'
 
 services:
 
-  zoo:
+  zoo1:
-    image: zookeeper:3.9.2
+    image: zookeeper:3.8.0
-    restart: unless-stopped
+    hostname: zoo1
     ports:
       - "2181:2181"
     environment:
       ZOO_MY_ID: 1
       ZOO_PORT: 2181
-      ZOO_SERVERS: server.1=zoo:2888:3888;2181
+      ZOO_SERVERS: server.1=zoo1:2888:3888;2181
 
-  kafka:
+  kafka1:
-    image: confluentinc/cp-kafka:7.6.1
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka1
     ports:
       - "9092:9092"
     environment:
-      KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka:19092,LISTENER_DOCKER_EXTERNAL://172.17.0.1:9093,LISTENER_EXTERNAL://127.0.0.1:9092
+      KAFKA_ADVERTISED_LISTENERS: LISTENER_DOCKER_INTERNAL://kafka1:19092,LISTENER_DOCKER_EXTERNAL://${DOCKER_HOST_IP:-127.0.0.1}:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT,LISTENER_EXTERNAL:PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: LISTENER_DOCKER_INTERNAL
-      KAFKA_ZOOKEEPER_CONNECT: zoo:2181
+      KAFKA_ZOOKEEPER_CONNECT: "zoo1:2181"
       KAFKA_BROKER_ID: 1
-      KAFKA_LOG4J_LOGGERS: kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO
+      KAFKA_LOG4J_LOGGERS: "kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO"
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_MESSAGE_MAX_BYTES: 5242880
-      KAFKA_REPLICA_FETCH_MAX_BYTES: 5242880
-      KAFKA_COMPRESSION_TYPE: gzip
     depends_on:
-      - zoo
+      - zoo1
-    healthcheck:
-      test: kafka-topics --bootstrap-server kafka:9092 --list
-      interval: 30s
-      timeout: 10s
-      retries: 3
-
-  akhq:
-    image: tchiotludo/akhq:0.25.0
-    environment:
-      AKHQ_CONFIGURATION: |
-        akhq:
-          ui-options:
-            topic.show-all-consumer-groups: true
-            topic-data.sort: NEWEST
-          connections:
-            docker-kafka-server:
-              properties:
-                bootstrap.servers: "kafka:19092"
-    ports:
-      - "9000:8080"
-    depends_on:
-      - kafka
 
   kafka-rest-proxy:
     image: confluentinc/cp-kafka-rest:7.2.1
@@ -64,8 +40,8 @@ services:
       KAFKA_REST_HOST_NAME: kafka-rest-proxy
       KAFKA_REST_BOOTSTRAP_SERVERS: PLAINTEXT://kafka1:19092
     depends_on:
-      - zoo
+      - zoo1
-      - kafka
+      - kafka1
 
   kafka-connect:
     image: confluentinc/cp-kafka-connect:7.2.1
@@ -91,6 +67,24 @@ services:
     #volumes:
     #  - ./connectors:/etc/kafka-connect/jars/
     depends_on:
-      - zoo
+      - zoo1
-      - kafka
+      - kafka1
       - kafka-rest-proxy
+
+  akhq:
+    image: tchiotludo/akhq:0.21.0
+    environment:
+      AKHQ_CONFIGURATION: |
+        akhq:
+          connections:
+            docker-kafka-server:
+              properties:
+                bootstrap.servers: "kafka1:19092"
+              connect:
+                - name: "kafka-connect"
+                  url: "http://kafka-connect:8083"
+    ports:
+      - "8084:8080"
+    depends_on:
+      - kafka1
+      - kafka-connect

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1 +1 @@
-rootProject.name = "mv64e-etl-processor"
+rootProject.name = "etl-processor"

src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt

@@ -20,11 +20,10 @@
 package dev.dnpm.etl.processor
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import de.ukw.ccc.bwhc.dto.*
 import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.output.DnpmV2MtbFileRequest
 import dev.dnpm.etl.processor.output.MtbFileSender
-import dev.pcvolkmer.mv64e.mtb.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
@@ -34,10 +33,10 @@ import org.mockito.kotlin.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.context.ApplicationContext
 import org.springframework.http.MediaType
 import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.post
@@ -46,12 +45,11 @@ import org.testcontainers.junit.jupiter.Testcontainers
 @Testcontainers
 @ExtendWith(SpringExtension::class)
 @SpringBootTest
-@MockitoBean(types = [MtbFileSender::class])
+@MockBean(MtbFileSender::class)
 @TestPropertySource(
     properties = [
         "app.rest.uri=http://example.com",
-        "app.pseudonymize.generator=buildin",
+        "app.pseudonymize.generator=buildin"
-        "app.consent.service=none"
     ]
 )
 class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
@@ -68,15 +66,14 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
     @TestPropertySource(
         properties = [
             "app.pseudonymize.generator=buildin",
-            "app.consent.service=none",
+            "app.transformations[0].path=diagnoses[*].icd10.version",
-            "app.transformations[0].path=diagnoses[*].code.version",
             "app.transformations[0].from=2013",
             "app.transformations[0].to=2014",
         ]
     )
     inner class TransformationTest {
 
-        @MockitoBean
+        @MockBean
         private lateinit var mtbFileSender: MtbFileSender
 
         @Autowired
@@ -94,33 +91,36 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
         fun mtbFileIsTransformed() {
             doAnswer {
                 MtbFileSender.Response(RequestStatus.SUCCESS)
-            }.whenever(mtbFileSender).send(any<DnpmV2MtbFileRequest>())
+            }.whenever(mtbFileSender).send(any<MtbFileSender.MtbFileRequest>())
 
-            val mtbFile = Mtb.builder()
+            val mtbFile = MtbFile.builder()
-                .patient(
+                .withPatient(
                     Patient.builder()
-                        .id("TEST_12345678")
+                        .withId("TEST_12345678")
+                        .withBirthDate("2000-08-08")
+                        .withGender(Patient.Gender.MALE)
                         .build()
                 )
-                .metadata(
+                .withConsent(
-                    MvhMetadata
+                    Consent.builder()
-                        .builder()
+                        .withId("1")
-                        .modelProjectConsent(
+                        .withStatus(Consent.Status.ACTIVE)
-                            ModelProjectConsent
+                        .withPatient("TEST_12345678")
-                                .builder()
-                                .provisions(
-                                    listOf(Provision.builder().type(ConsentProvision.PERMIT).purpose(ModelProjectConsentPurpose.SEQUENCING).build())
-                                ).build()
-                        )
                         .build()
                 )
-                .diagnoses(
+                .withEpisode(
+                    Episode.builder()
+                        .withId("1")
+                        .withPatient("TEST_12345678")
+                        .withPeriod(PeriodStart("2023-08-08"))
+                        .build()
+                )
+                .withDiagnoses(
                     listOf(
-                        MtbDiagnosis.builder()
+                        Diagnosis.builder()
-                            .id("1234")
+                            .withId("1234")
-                            .patient(Reference.builder().id("TEST_12345678").build())
+                            .withIcd10(Icd10.builder().withCode("F79.9").withVersion("2013").build())
-                            .code(Coding.builder().code("F79.9").version("2013").build())
+                            .build()
-                            .build(),
                     )
                 )
                 .build()
@@ -134,10 +134,10 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
                 }
             }
 
-            val captor = argumentCaptor<DnpmV2MtbFileRequest>()
+            val captor = argumentCaptor<MtbFileSender.MtbFileRequest>()
             verify(mtbFileSender).send(captor.capture())
-            assertThat(captor.firstValue.content.diagnoses).hasSize(1).allMatch { diagnosis ->
+            assertThat(captor.firstValue.mtbFile.diagnoses).hasSize(1).allMatch { diagnosis ->
-                diagnosis.code.version == "2014"
+                diagnosis.icd10.version == "2014"
             }
         }
     }

src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorArchTest.kt

@@ -1,73 +0,0 @@
-package dev.dnpm.etl.processor
-
-import com.tngtech.archunit.core.domain.JavaClasses
-import com.tngtech.archunit.core.importer.ClassFileImporter
-import com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes
-import com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.springframework.data.repository.Repository
-
-class EtlProcessorArchTest {
-
-    private lateinit var noTestClasses: JavaClasses
-
-    @BeforeEach
-    fun setUp() {
-        this.noTestClasses = ClassFileImporter()
-            .withImportOption { !(it.contains("/test/") || it.contains("/integrationTest/")) }
-            .importPackages("dev.dnpm.etl.processor")
-    }
-
-    @Test
-    fun noClassesInInputPackageShouldDependOnMonitoringPackage() {
-        val rule = noClasses()
-            .that()
-            .resideInAPackage("..input")
-            .should().dependOnClassesThat()
-            .resideInAnyPackage("..monitoring")
-
-        rule.check(noTestClasses)
-    }
-
-    @Test
-    fun noClassesInInputPackageShouldDependOnRepositories() {
-        val rule = noClasses()
-            .that()
-            .resideInAPackage("..input")
-            .should().dependOnClassesThat().haveSimpleNameEndingWith("Repository")
-
-        rule.check(noTestClasses)
-    }
-
-    @Test
-    fun noClassesInOutputPackageShouldDependOnRepositories() {
-        val rule = noClasses()
-            .that()
-            .resideInAPackage("..output")
-            .should().dependOnClassesThat().haveSimpleNameEndingWith("Repository")
-
-        rule.check(noTestClasses)
-    }
-
-    @Test
-    fun noClassesInWebPackageShouldDependOnRepositories() {
-        val rule = noClasses()
-            .that()
-            .resideInAPackage("..web")
-            .should().dependOnClassesThat().haveSimpleNameEndingWith("Repository")
-
-        rule.check(noTestClasses)
-    }
-
-    @Test
-    fun repositoryClassNamesShouldEndWithRepository() {
-        val rule = classes()
-            .that()
-            .areInterfaces().and().areAssignableTo(Repository::class.java)
-            .should().haveSimpleNameEndingWith("Repository")
-
-        rule.check(noTestClasses)
-    }
-
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/config/AppConfigurationTest.kt

@@ -20,18 +20,15 @@
 package dev.dnpm.etl.processor.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
-import dev.dnpm.etl.processor.consent.GicsConsentService
-import dev.dnpm.etl.processor.consent.MtbFileConsentService
 import dev.dnpm.etl.processor.input.KafkaInputListener
 import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.output.KafkaMtbFileSender
 import dev.dnpm.etl.processor.output.RestMtbFileSender
 import dev.dnpm.etl.processor.pseudonym.AnonymizingGenerator
 import dev.dnpm.etl.processor.pseudonym.GpasPseudonymGenerator
-import dev.dnpm.etl.processor.security.TokenRepository
-import dev.dnpm.etl.processor.security.TokenService
 import dev.dnpm.etl.processor.services.RequestProcessor
+import dev.dnpm.etl.processor.services.TokenRepository
+import dev.dnpm.etl.processor.services.TokenService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
@@ -39,26 +36,24 @@ import org.junit.jupiter.api.assertThrows
 import org.springframework.beans.factory.NoSuchBeanDefinitionException
 import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.boot.test.mock.mockito.MockBeans
 import org.springframework.context.ApplicationContext
 import org.springframework.retry.support.RetryTemplate
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.provisioning.InMemoryUserDetailsManager
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest
-@ContextConfiguration(
+@ContextConfiguration(classes = [
-    classes = [
+    AppConfiguration::class,
-        AppConfiguration::class,
+    AppSecurityConfiguration::class,
-        AppSecurityConfiguration::class,
+    KafkaAutoConfiguration::class,
-        KafkaAutoConfiguration::class,
+    AppKafkaConfiguration::class,
-        AppKafkaConfiguration::class,
+    AppRestConfiguration::class
-        AppRestConfiguration::class,
+])
-        ConsentEvaluator::class
+@MockBean(ObjectMapper::class)
-    ]
-)
-@MockitoBean(types = [ObjectMapper::class])
 @TestPropertySource(
     properties = [
         "app.pseudonymize.generator=BUILDIN",
@@ -91,7 +86,7 @@ class AppConfigurationTest {
             "app.kafka.group-id=test"
         ]
     )
-    @MockitoBean(types = [RequestRepository::class])
+    @MockBean(RequestRepository::class)
     inner class AppConfigurationKafkaTest(private val context: ApplicationContext) {
 
         @Test
@@ -150,7 +145,7 @@ class AppConfigurationTest {
             "app.kafka.group-id=test"
         ]
     )
-    @MockitoBean(types = [RequestProcessor::class])
+    @MockBean(RequestProcessor::class)
     inner class AppConfigurationUsingKafkaInputTest(private val context: ApplicationContext) {
 
         @Test
@@ -186,7 +181,40 @@ class AppConfigurationTest {
         @Nested
         @TestPropertySource(
             properties = [
-                "app.pseudonymize.generator=buildin"
+                "app.pseudonymize.generator=",
+                "app.pseudonymizer=buildin",
+            ]
+        )
+        inner class AppConfigurationPseudonymizerBuildinTest(private val context: ApplicationContext) {
+
+            @Test
+            fun shouldUseConfiguredGenerator() {
+                assertThat(context.getBean(AnonymizingGenerator::class.java)).isNotNull
+            }
+
+        }
+
+        @Nested
+        @TestPropertySource(
+            properties = [
+                "app.pseudonymize.generator=",
+                "app.pseudonymizer=gpas",
+            ]
+        )
+        inner class AppConfigurationPseudonymizerGpasTest(private val context: ApplicationContext) {
+
+            @Test
+            fun shouldUseConfiguredGenerator() {
+                assertThat(context.getBean(GpasPseudonymGenerator::class.java)).isNotNull
+            }
+
+        }
+
+        @Nested
+        @TestPropertySource(
+            properties = [
+                "app.pseudonymize.generator=buildin",
+                "app.pseudonymizer=",
             ]
         )
         inner class AppConfigurationPseudonymizeGeneratorBuildinTest(private val context: ApplicationContext) {
@@ -201,7 +229,8 @@ class AppConfigurationTest {
         @Nested
         @TestPropertySource(
             properties = [
-                "app.pseudonymize.generator=gpas"
+                "app.pseudonymize.generator=gpas",
+                "app.pseudonymizer=",
             ]
         )
         inner class AppConfigurationPseudonymizeGeneratorGpasTest(private val context: ApplicationContext) {
@@ -219,13 +248,11 @@ class AppConfigurationTest {
                 "app.security.enable-tokens=true"
             ]
         )
-        @MockitoBean(
+        @MockBeans(value = [
-            types = [
+            MockBean(InMemoryUserDetailsManager::class),
-                InMemoryUserDetailsManager::class,
+            MockBean(PasswordEncoder::class),
-                PasswordEncoder::class,
+            MockBean(TokenRepository::class)
-                TokenRepository::class
+        ])
-            ]
-        )
         inner class AppConfigurationTokenEnabledTest(private val context: ApplicationContext) {
 
             @Test
@@ -236,13 +263,11 @@ class AppConfigurationTest {
         }
 
         @Nested
-        @MockitoBean(
+        @MockBeans(value = [
-            types = [
+            MockBean(InMemoryUserDetailsManager::class),
-                InMemoryUserDetailsManager::class,
+            MockBean(PasswordEncoder::class),
-                PasswordEncoder::class,
+            MockBean(TokenRepository::class)
-                TokenRepository::class
+        ])
-            ]
-        )
         inner class AppConfigurationTokenDisabledTest(private val context: ApplicationContext) {
 
             @Test
@@ -280,30 +305,4 @@ class AppConfigurationTest {
 
     }
 
-    @Nested
-    @TestPropertySource(
-        properties = [
-            "app.consent.service=GICS",
-            "app.consent.gics.uri=http://localhost:9000",
-        ]
-    )
-    inner class AppConfigurationConsentGicsTest(private val context: ApplicationContext) {
-
-        @Test
-        fun shouldUseConfiguredGenerator() {
-            assertThat(context.getBean(GicsConsentService::class.java)).isNotNull
-        }
-
-    }
-
-    @Nested
-    inner class AppConfigurationConsentBuildinTest(private val context: ApplicationContext) {
-
-        @Test
-        fun shouldUseConfiguredGenerator() {
-            assertThat(context.getBean(MtbFileConsentService::class.java)).isNotNull
-        }
-
-    }
-
 }

src/integrationTest/kotlin/dev/dnpm/etl/processor/helpers.kt

@@ -1,30 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor
-
-import org.mockito.ArgumentMatchers
-
-@Suppress("UNCHECKED_CAST")
-inline fun <reified T> anyValueClass(): T {
-    val unboxedClass = T::class.java.declaredFields.first().type
-    return ArgumentMatchers.any(unboxedClass as Class<T>)
-        ?: T::class.java.getDeclaredMethod("box-impl", unboxedClass)
-            .invoke(null, null) as T
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt

@@ -20,47 +20,41 @@
 package dev.dnpm.etl.processor.input
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import de.ukw.ccc.bwhc.dto.*
 import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.consent.ConsentEvaluation
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
-import dev.dnpm.etl.processor.consent.MtbFileConsentService
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
-import dev.dnpm.etl.processor.security.TokenRepository
-import dev.dnpm.etl.processor.security.UserRoleRepository
 import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.pcvolkmer.mv64e.mtb.*
+import dev.dnpm.etl.processor.services.TokenRepository
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.*
+import org.mockito.kotlin.any
+import org.mockito.kotlin.never
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.http.MediaType
-import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.anonymous
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.delete
 import org.springframework.test.web.servlet.post
-import java.time.Instant
-import java.util.*
 
 @WebMvcTest(controllers = [MtbFileRestController::class])
 @ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
 @ContextConfiguration(
     classes = [
         MtbFileRestController::class,
-        AppSecurityConfiguration::class,
+        AppSecurityConfiguration::class
-        MtbFileConsentService::class
     ]
 )
-@MockitoBean(types = [TokenRepository::class, RequestProcessor::class,  ConsentEvaluator::class])
+@MockBean(TokenRepository::class, RequestProcessor::class)
 @TestPropertySource(
     properties = [
         "app.pseudonymize.generator=BUILDIN",
@@ -71,23 +65,17 @@ import java.util.*
 )
 class MtbFileRestControllerTest {
 
-    lateinit var mockMvc: MockMvc
+    private lateinit var mockMvc: MockMvc
-    lateinit var requestProcessor: RequestProcessor
+
-    lateinit var consentEvaluator: ConsentEvaluator
+    private lateinit var requestProcessor: RequestProcessor
 
     @BeforeEach
     fun setup(
         @Autowired mockMvc: MockMvc,
-        @Autowired requestProcessor: RequestProcessor,
+        @Autowired requestProcessor: RequestProcessor
-        @Autowired consentEvaluator: ConsentEvaluator
     ) {
         this.mockMvc = mockMvc
         this.requestProcessor = requestProcessor
-        this.consentEvaluator = consentEvaluator
-
-        doAnswer {
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_GIVEN, true)
-        }.whenever(consentEvaluator).check(any())
     }
 
     @Test
@@ -100,20 +88,7 @@ class MtbFileRestControllerTest {
             status { isAccepted() }
         }
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        verify(requestProcessor, times(1)).processMtbFile(any())
-    }
-
-    @Test
-    fun testShouldGrantPermissionToSendMtbFileToAdminUser() {
-        mockMvc.post("/mtbfile") {
-            with(user("onkostarserver").roles("ADMIN"))
-            contentType = MediaType.APPLICATION_JSON
-            content = ObjectMapper().writeValueAsString(mtbFile)
-        }.andExpect {
-            status { isAccepted() }
-        }
-
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
     }
 
     @Test
@@ -126,20 +101,7 @@ class MtbFileRestControllerTest {
             status { isUnauthorized() }
         }
 
-        verify(requestProcessor, never()).processMtbFile(any<Mtb>())
+        verify(requestProcessor, never()).processMtbFile(any())
-    }
-
-    @Test
-    fun testShouldDenyPermissionToSendMtbFileForUser() {
-        mockMvc.post("/mtbfile") {
-            with(user("fakeuser").roles("USER"))
-            contentType = MediaType.APPLICATION_JSON
-            content = ObjectMapper().writeValueAsString(mtbFile)
-        }.andExpect {
-            status { isForbidden() }
-        }
-
-        verify(requestProcessor, never()).processMtbFile(any<Mtb>())
     }
 
     @Test
@@ -150,7 +112,7 @@ class MtbFileRestControllerTest {
             status { isAccepted() }
         }
 
-        verify(requestProcessor, times(1)).processDeletion(anyValueClass(),  eq(TtpConsentStatus.UNKNOWN_CHECK_FILE))
+        verify(requestProcessor, times(1)).processDeletion(anyString())
     }
 
     @Test
@@ -161,64 +123,32 @@ class MtbFileRestControllerTest {
             status { isUnauthorized() }
         }
 
-        verify(requestProcessor, never()).processDeletion(anyValueClass(), any())
+        verify(requestProcessor, never()).processDeletion(anyString())
-    }
-
-    @Nested
-    @MockitoBean(types = [UserRoleRepository::class, ClientRegistrationRepository::class])
-    @TestPropertySource(
-        properties = [
-            "app.pseudonymize.generator=BUILDIN",
-            "app.security.admin-user=admin",
-            "app.security.admin-password={noop}very-secret",
-            "app.security.enable-tokens=true",
-            "app.security.enable-oidc=true"
-        ]
-    )
-    inner class WithOidcEnabled {
-        @Test
-        fun testShouldGrantPermissionToSendMtbFileToAdminUser() {
-            mockMvc.post("/mtbfile") {
-                with(user("onkostarserver").roles("ADMIN"))
-                contentType = MediaType.APPLICATION_JSON
-                content = ObjectMapper().writeValueAsString(mtbFile)
-            }.andExpect {
-                status { isAccepted() }
-            }
-
-            verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
-        }
-
-        @Test
-        fun testShouldGrantPermissionToSendMtbFileToUser() {
-            mockMvc.post("/mtbfile") {
-                with(user("onkostarserver").roles("USER"))
-                contentType = MediaType.APPLICATION_JSON
-                content = ObjectMapper().writeValueAsString(mtbFile)
-            }.andExpect {
-                status { isAccepted() }
-            }
-
-            verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
-        }
     }
 
     companion object {
 
-        val mtbFile = Mtb.builder()
+        val mtbFile: MtbFile = MtbFile.builder()
-            .patient(
+            .withPatient(
                 Patient.builder()
-                    .id("PID")
+                    .withId("PID")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .episodesOfCare(
+            .withConsent(
-                listOf(
+                Consent.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withStatus(Consent.Status.ACTIVE)
-                        .patient(Reference.builder().id("PID").build())
+                    .withPatient("PID")
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2023-08-08T02:00:00.00Z"))).build())
+                    .build()
-                        .build()
+            )
-                )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("PID")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
             )
             .build()
 

src/integrationTest/kotlin/dev/dnpm/etl/processor/monitoring/RequestRepositoryTest.kt

@@ -1,75 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.monitoring
-
-import dev.dnpm.etl.processor.*
-import dev.dnpm.etl.processor.output.MtbFileSender
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.data.jdbc.DataJdbcTest
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.transaction.annotation.Transactional
-import org.testcontainers.junit.jupiter.Testcontainers
-import java.time.Instant
-
-@Testcontainers
-@ExtendWith(SpringExtension::class)
-@DataJdbcTest
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-@Transactional
-@MockitoBean(types = [MtbFileSender::class])
-@TestPropertySource(
-    properties = [
-        "app.pseudonymize.generator=buildin",
-        "app.rest.uri=http://example.com"
-    ]
-)
-class RequestRepositoryTest : AbstractTestcontainerTest() {
-
-    private lateinit var requestRepository: RequestRepository
-
-    @BeforeEach
-    fun setUp(
-        @Autowired requestRepository: RequestRepository
-    ) {
-        this.requestRepository = requestRepository
-    }
-
-    @Test
-    fun shouldSaveRequest() {
-        val request = Request(
-            randomRequestId(),
-            PatientPseudonym("TEST_12345678901"),
-            PatientId("P1"),
-            Fingerprint("0123456789abcdef1"),
-            RequestType.MTB_FILE,
-            RequestStatus.WARNING,
-            Instant.parse("2023-07-07T00:00:00Z")
-        )
-
-        requestRepository.save(request)
-    }
-
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGeneratorTest.kt

@@ -1,147 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.pseudonym
-
-import dev.dnpm.etl.processor.config.AppFhirConfig
-import dev.dnpm.etl.processor.config.GPasConfigProperties
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.springframework.http.HttpHeaders
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import org.springframework.retry.policy.SimpleRetryPolicy
-import org.springframework.retry.support.RetryTemplateBuilder
-import org.springframework.test.web.client.MockRestServiceServer
-import org.springframework.test.web.client.match.MockRestRequestMatchers.method
-import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
-import org.springframework.test.web.client.response.MockRestResponseCreators.withException
-import org.springframework.test.web.client.response.MockRestResponseCreators.withStatus
-import org.springframework.web.client.RestTemplate
-import java.io.IOException
-
-class GpasPseudonymGeneratorTest {
-
-    private lateinit var mockRestServiceServer: MockRestServiceServer
-    private lateinit var generator: GpasPseudonymGenerator
-    private lateinit var restTemplate: RestTemplate
-    private var appFhirConfig: AppFhirConfig = AppFhirConfig()
-
-    @BeforeEach
-    fun setup() {
-        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
-        val gPasConfigProperties = GPasConfigProperties(
-            "https://localhost:9990/ttp-fhir/fhir/gpas",
-            "test", "test2",
-            null,
-            null
-        )
-
-        this.restTemplate = RestTemplate()
-        this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
-        this.generator =
-            GpasPseudonymGenerator(gPasConfigProperties, retryTemplate, restTemplate, appFhirConfig)
-    }
-
-    @Test
-    fun shouldReturnExpectedPseudonym() {
-        this.mockRestServiceServer.expect {
-            method(HttpMethod.POST)
-            requestTo("https://localhost/ttp-fhir/fhir/gpas/\$pseudonymizeAllowCreate")
-        }.andRespond {
-            withStatus(HttpStatus.OK).body(
-                getDummyResponseBody(
-                    "1234",
-                    "test",
-                    "test1234ABCDEF567890"
-                )
-            )
-                .createResponse(it)
-        }
-
-        assertThat(this.generator.generate("ID1234")).isEqualTo("test1234ABCDEF567890")
-    }
-
-    @Test
-    fun shouldThrowExceptionIfGpasNotAvailable() {
-        this.mockRestServiceServer.expect {
-            method(HttpMethod.POST)
-            requestTo("https://localhost/ttp-fhir/fhir/gpas/\$pseudonymizeAllowCreate")
-        }.andRespond {
-            withException(IOException("Simulated IO error")).createResponse(it)
-        }
-
-        assertThrows<PseudonymRequestFailed> { this.generator.generate("ID1234") }
-    }
-
-    @Test
-    fun shouldThrowExceptionIfGpasDoesNotReturn2xxResponse() {
-        this.mockRestServiceServer.expect {
-            method(HttpMethod.POST)
-            requestTo("https://localhost/ttp-fhir/fhir/gpas/\$pseudonymizeAllowCreate")
-        }.andRespond {
-            withStatus(HttpStatus.FOUND)
-                .header(
-                    HttpHeaders.LOCATION,
-                    "https://localhost/ttp-fhir/fhir/gpas/\$pseudonymizeAllowCreate"
-                )
-                .createResponse(it)
-        }
-
-        assertThrows<PseudonymRequestFailed> { this.generator.generate("ID1234") }
-    }
-
-    companion object {
-
-        fun getDummyResponseBody(original: String, target: String, pseudonym: String) = """{
-          "resourceType": "Parameters",
-          "parameter": [
-            {
-              "name": "pseudonym",
-              "part": [
-                {
-                  "name": "original",
-                  "valueIdentifier": {
-                    "system": "https://ths-greifswald.de/gpas",
-                    "value": "$original"
-                  }
-                },
-                {
-                  "name": "target",
-                  "valueIdentifier": {
-                    "system": "https://ths-greifswald.de/gpas",
-                    "value": "$target"
-                  }
-                },
-                {
-                  "name": "pseudonym",
-                  "valueIdentifier": {
-                    "system": "https://ths-greifswald.de/gpas",
-                    "value": "$pseudonym"
-                  }
-                }
-              ]
-            }
-          ]
-        }""".trimIndent()
-
-    }
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt

@@ -19,7 +19,7 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.*
+import dev.dnpm.etl.processor.AbstractTestcontainerTest
 import dev.dnpm.etl.processor.monitoring.Request
 import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
@@ -31,18 +31,19 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.transaction.annotation.Transactional
 import org.testcontainers.junit.jupiter.Testcontainers
 import java.time.Instant
+import java.util.*
 
 @Testcontainers
 @ExtendWith(SpringExtension::class)
 @SpringBootTest
 @Transactional
-@MockitoBean(types = [MtbFileSender::class])
+@MockBean(MtbFileSender::class)
 @TestPropertySource(
     properties = [
         "app.pseudonymize.generator=buildin",
@@ -65,7 +66,7 @@ class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
 
     @Test
     fun shouldResultInEmptyRequestList() {
-        val actual = requestService.allRequestsByPatientPseudonym(TEST_PATIENT_PSEUDONYM)
+        val actual = requestService.allRequestsByPatientPseudonym("TEST_12345678901")
 
         assertThat(actual).isEmpty()
     }
@@ -75,33 +76,33 @@ class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
         this.requestRepository.saveAll(
             listOf(
                 Request(
-                    randomRequestId(),
+                    uuid = UUID.randomUUID().toString(),
-                    PatientPseudonym("TEST_12345678901"),
+                    patientId = "TEST_12345678901",
-                    PatientId("P1"),
+                    pid = "P1",
-                    Fingerprint("0123456789abcdef1"),
+                    fingerprint = "0123456789abcdef1",
-                    RequestType.MTB_FILE,
+                    type = RequestType.MTB_FILE,
-                    RequestStatus.SUCCESS,
+                    status = RequestStatus.SUCCESS,
-                    Instant.parse("2023-07-07T02:00:00Z")
+                    processedAt = Instant.parse("2023-07-07T02:00:00Z")
                 ),
                 // Should be ignored - wrong patient ID -->
                 Request(
-                    randomRequestId(),
+                    uuid = UUID.randomUUID().toString(),
-                    PatientPseudonym("TEST_12345678902"),
+                    patientId = "TEST_12345678902",
-                    PatientId("P2"),
+                    pid = "P2",
-                    Fingerprint("0123456789abcdef2"),
+                    fingerprint = "0123456789abcdef2",
-                    RequestType.MTB_FILE,
+                    type = RequestType.MTB_FILE,
-                    RequestStatus.WARNING,
+                    status = RequestStatus.WARNING,
-                    Instant.parse("2023-08-08T00:00:00Z")
+                    processedAt = Instant.parse("2023-08-08T00:00:00Z")
                 ),
                 // <--
                 Request(
-                    randomRequestId(),
+                    uuid = UUID.randomUUID().toString(),
-                    PatientPseudonym("TEST_12345678901"),
+                    patientId = "TEST_12345678901",
-                    PatientId("P2"),
+                    pid = "P2",
-                    Fingerprint("0123456789abcdee1"),
+                    fingerprint = "0123456789abcdee1",
-                    RequestType.DELETE,
+                    type = RequestType.DELETE,
-                    RequestStatus.SUCCESS,
+                    status = RequestStatus.SUCCESS,
-                    Instant.parse("2023-08-08T02:00:00Z")
+                    processedAt = Instant.parse("2023-08-08T02:00:00Z")
                 )
             )
         )
@@ -111,18 +112,18 @@ class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
     fun shouldResultInSortedRequestList() {
         setupTestData()
 
-        val actual = requestService.allRequestsByPatientPseudonym(TEST_PATIENT_PSEUDONYM)
+        val actual = requestService.allRequestsByPatientPseudonym("TEST_12345678901")
 
         assertThat(actual).hasSize(2)
-        assertThat(actual[0].fingerprint).isEqualTo(Fingerprint("0123456789abcdee1"))
+        assertThat(actual[0].fingerprint).isEqualTo("0123456789abcdee1")
-        assertThat(actual[1].fingerprint).isEqualTo(Fingerprint("0123456789abcdef1"))
+        assertThat(actual[1].fingerprint).isEqualTo("0123456789abcdef1")
     }
 
     @Test
     fun shouldReturnDeleteRequestAsLastRequest() {
         setupTestData()
 
-        val actual = requestService.isLastRequestWithKnownStatusDeletion(TEST_PATIENT_PSEUDONYM)
+        val actual = requestService.isLastRequestWithKnownStatusDeletion("TEST_12345678901")
 
         assertThat(actual).isTrue()
     }
@@ -131,14 +132,10 @@ class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
     fun shouldReturnLastMtbFileRequest() {
         setupTestData()
 
-        val actual = requestService.lastMtbFileRequestForPatientPseudonym(TEST_PATIENT_PSEUDONYM)
+        val actual = requestService.lastMtbFileRequestForPatientPseudonym("TEST_12345678901")
 
         assertThat(actual).isNotNull
-        assertThat(actual?.fingerprint).isEqualTo(Fingerprint("0123456789abcdef1"))
+        assertThat(actual?.fingerprint).isEqualTo("0123456789abcdef1")
-    }
-
-    companion object {
-        val TEST_PATIENT_PSEUDONYM = PatientPseudonym("TEST_12345678901")
     }
 
 }

src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt

@@ -21,50 +21,30 @@ package dev.dnpm.etl.processor.web
 
 import dev.dnpm.etl.processor.config.AppConfiguration
 import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.monitoring.ConnectionCheckResult
+import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
-import dev.dnpm.etl.processor.monitoring.GIcsConnectionCheckService
-import dev.dnpm.etl.processor.monitoring.GPasConnectionCheckService
 import dev.dnpm.etl.processor.monitoring.RestConnectionCheckService
 import dev.dnpm.etl.processor.output.MtbFileSender
 import dev.dnpm.etl.processor.pseudonym.Generator
-import dev.dnpm.etl.processor.security.Role
-import dev.dnpm.etl.processor.security.TokenService
-import dev.dnpm.etl.processor.security.UserRoleService
 import dev.dnpm.etl.processor.services.RequestProcessor
+import dev.dnpm.etl.processor.services.TokenRepository
 import dev.dnpm.etl.processor.services.TransformationService
-import org.assertj.core.api.Assertions.assertThat
-import org.htmlunit.WebClient
-import org.htmlunit.html.HtmlPage
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.ArgumentMatchers.anyString
 import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.argumentCaptor
-import org.mockito.kotlin.times
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
-import org.springframework.http.MediaType.TEXT_EVENT_STREAM
-import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.anonymous
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.*
+import org.springframework.test.web.servlet.get
-import org.springframework.test.web.servlet.client.MockMvcWebTestClient
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder
-import org.springframework.web.context.WebApplicationContext
 import reactor.core.publisher.Sinks
-import reactor.test.StepVerifier
-import java.time.Instant
 
 abstract class MockSink : Sinks.Many<Boolean>
 
@@ -79,51 +59,44 @@ abstract class MockSink : Sinks.Many<Boolean>
 )
 @TestPropertySource(
     properties = [
-        "app.pseudonymize.generator=BUILDIN"
+        "app.pseudonymize.generator=BUILDIN",
+        "app.security.admin-user=admin",
+        "app.security.admin-password={noop}very-secret",
+        "app.security.enable-tokens=true"
     ]
 )
-@MockitoBean(name = "configsUpdateProducer", types = [MockSink::class])
+@MockBean(name = "configsUpdateProducer", classes = [MockSink::class])
-@MockitoBean(
+@MockBean(
-    types = [
+    Generator::class,
-        Generator::class,
+    MtbFileSender::class,
-        MtbFileSender::class,
+    ConnectionCheckService::class,
-        RequestProcessor::class,
+    RequestProcessor::class,
-        TransformationService::class,
+    TransformationService::class,
-        GPasConnectionCheckService::class,
+    TokenRepository::class,
-        RestConnectionCheckService::class,
+    RestConnectionCheckService::class
-        GIcsConnectionCheckService::class
-    ]
 )
 class ConfigControllerTest {
 
     private lateinit var mockMvc: MockMvc
-    private lateinit var webClient: WebClient
 
     private lateinit var requestProcessor: RequestProcessor
-    private lateinit var connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
 
     @BeforeEach
     fun setup(
         @Autowired mockMvc: MockMvc,
-        @Autowired requestProcessor: RequestProcessor,
+        @Autowired requestProcessor: RequestProcessor
-        @Autowired connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
     ) {
         this.mockMvc = mockMvc
-        this.webClient = MockMvcWebClientBuilder.mockMvcSetup(mockMvc).build()
         this.requestProcessor = requestProcessor
-        this.connectionCheckUpdateProducer = connectionCheckUpdateProducer
-
-        webClient.options.isThrowExceptionOnScriptError = false
     }
 
     @Test
-    fun testShouldRequestConfigPageIfLoggedIn() {
+    fun testShouldShowConfigPageIfLoggedIn() {
         mockMvc.get("/configs") {
             with(user("admin").roles("ADMIN"))
             accept(MediaType.TEXT_HTML)
         }.andExpect {
             status { isOk() }
-            view { name("configs") }
         }
     }
 
@@ -140,244 +113,4 @@ class ConfigControllerTest {
         }
     }
 
-    @Nested
-    @TestPropertySource(
-        properties = [
-            "app.security.enable-tokens=true",
-            "app.security.admin-user=admin"
-        ]
-    )
-    @MockitoBean(
-        types = [
-            TokenService::class
-        ]
-    )
-    inner class WithTokensEnabled {
-        private lateinit var tokenService: TokenService
-
-        @BeforeEach
-        fun setup(
-            @Autowired tokenService: TokenService
-        ) {
-            webClient.options.isThrowExceptionOnScriptError = false
-
-            this.tokenService = tokenService
-        }
-
-        @Test
-        fun testShouldSaveNewToken() {
-            mockMvc.post("/configs/tokens") {
-                with(user("admin").roles("ADMIN"))
-                accept(MediaType.TEXT_HTML)
-                contentType = MediaType.APPLICATION_FORM_URLENCODED
-                content = "name=Testtoken"
-            }.andExpect {
-                status { is2xxSuccessful() }
-                view { name("configs/tokens") }
-            }
-
-            val captor = argumentCaptor<String>()
-            verify(tokenService, times(1)).addToken(captor.capture())
-
-            assertThat(captor.firstValue).isEqualTo("Testtoken")
-        }
-
-        @Test
-        fun testShouldNotSaveTokenWithExstingName() {
-            whenever(tokenService.addToken(anyString())).thenReturn(
-                Result.failure(
-                    RuntimeException(
-                        "Testfailure"
-                    )
-                )
-            )
-
-            mockMvc.post("/configs/tokens") {
-                with(user("admin").roles("ADMIN"))
-                accept(MediaType.TEXT_HTML)
-                contentType = MediaType.APPLICATION_FORM_URLENCODED
-                content = "name=Testtoken"
-            }.andExpect {
-                status { is2xxSuccessful() }
-                view { name("configs/tokens") }
-            }
-
-            val captor = argumentCaptor<String>()
-            verify(tokenService, times(1)).addToken(captor.capture())
-
-            assertThat(captor.firstValue).isEqualTo("Testtoken")
-        }
-
-        @Test
-        fun testShouldDeleteToken() {
-            mockMvc.delete("/configs/tokens/42") {
-                with(user("admin").roles("ADMIN"))
-                accept(MediaType.TEXT_HTML)
-            }.andExpect {
-                status { is2xxSuccessful() }
-                view { name("configs/tokens") }
-            }
-
-            val captor = argumentCaptor<Long>()
-            verify(tokenService, times(1)).deleteToken(captor.capture())
-
-            assertThat(captor.firstValue).isEqualTo(42)
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldRenderConfigPageWithTokens() {
-            val page = webClient.getPage<HtmlPage>("http://localhost/configs")
-            assertThat(
-                page.getElementById("tokens")
-            ).isNotNull
-        }
-    }
-
-    @Nested
-    @TestPropertySource(
-        properties = [
-            "app.security.enable-tokens=false"
-        ]
-    )
-    inner class WithTokensDisabled {
-        @BeforeEach
-        fun setup() {
-            webClient.options.isThrowExceptionOnScriptError = false
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldRenderConfigPageWithoutTokens() {
-            val page = webClient.getPage<HtmlPage>("http://localhost/configs")
-            assertThat(
-                page.getElementById("tokens")
-            ).isNull()
-        }
-    }
-
-    @Nested
-    @TestPropertySource(
-        properties = [
-            "app.security.enable-tokens=false",
-            "app.security.admin-user=admin",
-            "app.security.admin-password={noop}very-secret"
-        ]
-    )
-    @MockitoBean(
-        types = [
-            UserRoleService::class
-        ]
-    )
-    inner class WithUserRolesEnabled {
-        private lateinit var userRoleService: UserRoleService
-
-        @BeforeEach
-        fun setup(
-            @Autowired userRoleService: UserRoleService
-        ) {
-            webClient.options.isThrowExceptionOnScriptError = false
-
-            this.userRoleService = userRoleService
-        }
-
-        @Test
-        fun testShouldDeleteUserRole() {
-            mockMvc.delete("/configs/userroles/42") {
-                with(user("admin").roles("ADMIN"))
-                accept(MediaType.TEXT_HTML)
-            }.andExpect {
-                status { is2xxSuccessful() }
-                view { name("configs/userroles") }
-            }
-
-            val captor = argumentCaptor<Long>()
-            verify(userRoleService, times(1)).deleteUserRole(captor.capture())
-
-            assertThat(captor.firstValue).isEqualTo(42)
-        }
-
-        @Test
-        fun testShouldUpdateUserRole() {
-            mockMvc.put("/configs/userroles/42") {
-                with(user("admin").roles("ADMIN"))
-                accept(MediaType.TEXT_HTML)
-                contentType = MediaType.APPLICATION_FORM_URLENCODED
-                content = "role=ADMIN"
-            }.andExpect {
-                status { is2xxSuccessful() }
-                view { name("configs/userroles") }
-            }
-
-            val idCaptor = argumentCaptor<Long>()
-            val roleCaptor = argumentCaptor<Role>()
-            verify(userRoleService, times(1)).updateUserRole(
-                idCaptor.capture(),
-                roleCaptor.capture()
-            )
-
-            assertThat(idCaptor.firstValue).isEqualTo(42)
-            assertThat(roleCaptor.firstValue).isEqualTo(Role.ADMIN)
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldRenderConfigPageWithUserRoles() {
-            val page = webClient.getPage<HtmlPage>("http://localhost/configs")
-            assertThat(
-                page.getElementById("userroles")
-            ).isNotNull
-        }
-    }
-
-    @Nested
-    inner class WithUserRolesDisabled {
-        @BeforeEach
-        fun setup() {
-            webClient.options.isThrowExceptionOnScriptError = false
-        }
-
-        @Test
-        fun testShouldRenderConfigPageWithoutUserRoles() {
-            val page = webClient.getPage<HtmlPage>("http://localhost/configs")
-            assertThat(
-                page.getElementById("userroles")
-            ).isNull()
-        }
-    }
-
-    @Nested
-    inner class SseTest {
-        private lateinit var webClient: WebTestClient
-
-        @BeforeEach
-        fun setup(
-            applicationContext: WebApplicationContext
-        ) {
-            this.webClient = MockMvcWebTestClient
-                .bindToApplicationContext(applicationContext).build()
-        }
-
-        @Test
-        fun testShouldRequestGPasSSE() {
-            val expectedEvent =
-                ConnectionCheckResult.GPasConnectionCheckResult(true, Instant.now(), Instant.now())
-
-            connectionCheckUpdateProducer.tryEmitNext(expectedEvent)
-            connectionCheckUpdateProducer.emitComplete { _, _ -> true }
-
-            val result =
-                webClient.get().uri("http://localhost/configs/events").accept(TEXT_EVENT_STREAM)
-                    .exchange()
-                    .expectStatus().isOk()
-                    .expectHeader().contentType(TEXT_EVENT_STREAM)
-                    .returnResult(ConnectionCheckResult.GPasConnectionCheckResult::class.java)
-
-            StepVerifier.create(result.responseBody)
-                .expectNext(expectedEvent)
-                .expectComplete()
-                .verify()
-        }
-    }
-
 }

src/integrationTest/kotlin/dev/dnpm/etl/processor/web/HomeControllerTest.kt

@@ -1,287 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.web
-
-import dev.dnpm.etl.processor.*
-import dev.dnpm.etl.processor.config.AppConfiguration
-import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.monitoring.Report
-import dev.dnpm.etl.processor.monitoring.Request
-import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.monitoring.RequestType
-import dev.dnpm.etl.processor.services.RequestService
-import org.assertj.core.api.Assertions.assertThat
-import org.htmlunit.WebClient
-import org.htmlunit.html.HtmlPage
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.any
-import org.mockito.kotlin.whenever
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.data.domain.Page
-import org.springframework.data.domain.PageImpl
-import org.springframework.data.domain.Pageable
-import org.springframework.security.test.context.support.WithMockUser
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.get
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder
-import java.io.IOException
-import java.time.Instant
-import java.util.*
-
-@WebMvcTest(controllers = [HomeController::class])
-@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
-@ContextConfiguration(
-    classes = [
-        HomeController::class,
-        AppConfiguration::class,
-        AppSecurityConfiguration::class
-    ]
-)
-@TestPropertySource(
-    properties = [
-        "app.pseudonymize.generator=BUILDIN",
-        "app.security.admin-user=admin",
-        "app.security.admin-password={noop}very-secret"
-    ]
-)
-@MockitoBean(
-    types = [RequestService::class]
-)
-class HomeControllerTest {
-
-    private lateinit var mockMvc: MockMvc
-    private lateinit var webClient: WebClient
-
-    @BeforeEach
-    fun setup(
-        @Autowired mockMvc: MockMvc,
-        @Autowired requestService: RequestService
-    ) {
-        this.mockMvc = mockMvc
-        this.webClient = MockMvcWebClientBuilder.mockMvcSetup(mockMvc).build()
-
-        whenever(requestService.findAll(any<Pageable>())).thenReturn(Page.empty())
-    }
-
-    @Test
-    fun testShouldRequestHomePage() {
-        mockMvc.get("/").andExpect {
-            status { isOk() }
-            view { name("index") }
-        }
-    }
-
-    @Nested
-    inner class WithRequests {
-
-        private lateinit var requestService: RequestService
-
-        @BeforeEach
-        fun setup(
-            @Autowired requestService: RequestService
-        ) {
-            this.requestService = requestService
-        }
-
-        @Test
-        fun testShouldShowHomePage() {
-            whenever(requestService.findAll(any<Pageable>())).thenReturn(
-                PageImpl(
-                    listOf(
-                        Request(
-                            2L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("ashdkasdh"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.SUCCESS
-                        ),
-                        Request(
-                            1L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("asdasdasd"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.ERROR
-                        )
-                    )
-                )
-            )
-
-            val page = webClient.getPage<HtmlPage>("http://localhost/")
-            assertThat(page.querySelectorAll("tbody tr")).hasSize(2)
-            assertThat(page.querySelectorAll("div.notification.info")).isEmpty()
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldShowRequestDetails() {
-            val requestId = randomRequestId()
-
-            whenever(requestService.findByUuid(anyValueClass())).thenReturn(
-                Optional.of(
-                    Request(
-                        2L,
-                        requestId,
-                        PatientPseudonym("PSEUDO1"),
-                        PatientId("PATIENT1"),
-                        Fingerprint("ashdkasdh"),
-                        RequestType.MTB_FILE,
-                        RequestStatus.SUCCESS,
-                        Instant.now(),
-                        Report("Test")
-                    )
-                )
-            )
-
-            val page = webClient.getPage<HtmlPage>("http://localhost/report/${requestId.value}")
-            assertThat(page.querySelectorAll("tbody tr")).hasSize(1)
-            assertThat(page.querySelectorAll("div.notification.info")).isEmpty()
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldShowPatientDetails() {
-            whenever(requestService.findRequestByPatientId(anyValueClass(), any<Pageable>())).thenReturn(
-                PageImpl(
-                    listOf(
-                        Request(
-                            2L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("ashdkasdh"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.SUCCESS
-                        ),
-                        Request(
-                            1L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("asdasdasd"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.ERROR
-                        )
-                    )
-                )
-            )
-
-            val page = webClient.getPage<HtmlPage>("http://localhost/patient/PSEUDO1")
-            assertThat(page.querySelectorAll("tbody tr")).hasSize(2)
-            assertThat(page.querySelectorAll("div.notification.info")).isEmpty()
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldShowPatientPseudonym() {
-            whenever(requestService.findRequestByPatientId(anyValueClass(), any<Pageable>())).thenReturn(
-                PageImpl(
-                    listOf(
-                        Request(
-                            2L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("ashdkasdh"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.SUCCESS
-                        ),
-                        Request(
-                            1L,
-                            randomRequestId(),
-                            PatientPseudonym("PSEUDO1"),
-                            PatientId("PATIENT1"),
-                            Fingerprint("asdasdasd"),
-                            RequestType.MTB_FILE,
-                            RequestStatus.ERROR
-                        )
-                    )
-                )
-            )
-
-            val page = webClient.getPage<HtmlPage>("http://localhost/patient/PSEUDO1")
-            assertThat(page.querySelectorAll("h2 > span")).hasSize(1)
-            assertThat(page.querySelectorAll("h2 > span").first().textContent).isEqualTo("PSEUDO1")
-        }
-
-    }
-
-    @Nested
-    inner class WithoutRequests {
-
-        private lateinit var requestService: RequestService
-
-        @BeforeEach
-        fun setup(
-            @Autowired requestService: RequestService
-        ) {
-            this.requestService = requestService
-
-            whenever(requestService.findAll(any<Pageable>())).thenReturn(Page.empty())
-        }
-
-        @Test
-        fun testShouldShowHomePage() {
-            val page = webClient.getPage<HtmlPage>("http://localhost/")
-            assertThat(page.querySelectorAll("tbody tr")).isEmpty()
-            assertThat(page.querySelectorAll("div.notification.info")).hasSize(1)
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldThrowNotFoundExceptionForUnknownReport() {
-            val requestId = randomRequestId()
-
-            whenever(requestService.findByUuid(anyValueClass())).thenReturn(
-                Optional.empty()
-            )
-
-            assertThrows<IOException> {
-                webClient.getPage<HtmlPage>("http://localhost/report/${requestId.value}")
-            }.also {
-                assertThat(it).hasRootCauseInstanceOf(NotFoundException::class.java)
-            }
-        }
-
-        @Test
-        @WithMockUser(username = "admin", roles = ["ADMIN"])
-        fun testShouldShowEmptyPatientDetails() {
-            whenever(requestService.findRequestByPatientId(anyValueClass(), any<Pageable>())).thenReturn(Page.empty())
-
-            val page = webClient.getPage<HtmlPage>("http://localhost/patient/PSEUDO1")
-            assertThat(page.querySelectorAll("tbody tr")).isEmpty()
-            assertThat(page.querySelectorAll("div.notification.info")).hasSize(1)
-        }
-    }
-
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/web/LoginControllerTest.kt

@@ -1,88 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.web
-
-import dev.dnpm.etl.processor.config.AppConfiguration
-import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.security.TokenService
-import org.assertj.core.api.Assertions.assertThat
-import org.htmlunit.WebClient
-import org.htmlunit.html.HtmlPage
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.junit.jupiter.MockitoExtension
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.get
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder
-
-@WebMvcTest(controllers = [LoginController::class])
-@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
-@ContextConfiguration(
-    classes = [
-        LoginController::class,
-        AppConfiguration::class,
-        AppSecurityConfiguration::class
-    ]
-)
-@TestPropertySource(
-    properties = [
-        "app.pseudonymize.generator=BUILDIN",
-        "app.security.admin-user=admin",
-        "app.security.admin-password={noop}very-secret",
-        "app.security.enable-tokens=true"
-    ]
-)
-@MockitoBean(
-    types = [TokenService::class]
-)
-class LoginControllerTest {
-
-    private lateinit var mockMvc: MockMvc
-    private lateinit var webClient: WebClient
-
-    @BeforeEach
-    fun setup(@Autowired mockMvc: MockMvc) {
-        this.mockMvc = mockMvc
-        this.webClient = MockMvcWebClientBuilder.mockMvcSetup(mockMvc).build()
-    }
-
-    @Test
-    fun testShouldRequestLoginPage() {
-        mockMvc.get("/login").andExpect {
-            status { isOk() }
-            view { name("login") }
-        }
-    }
-
-    @Test
-    fun testShouldShowLoginForm() {
-        val page = webClient.getPage<HtmlPage>("http://localhost/login")
-        assertThat(
-            page.getElementsByTagName("main").first().firstElementChild.getAttribute("class")
-        ).isEqualTo("login-form")
-    }
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/web/StatisticsControllerTest.kt

@@ -1,73 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.web
-
-import dev.dnpm.etl.processor.config.AppConfiguration
-import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import org.htmlunit.WebClient
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.junit.jupiter.MockitoExtension
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.get
-import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder
-
-@WebMvcTest(controllers = [StatisticsController::class])
-@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
-@ContextConfiguration(
-    classes = [
-        StatisticsController::class,
-        AppConfiguration::class,
-        AppSecurityConfiguration::class
-    ]
-)
-@TestPropertySource(
-    properties = [
-        "app.pseudonymize.generator=BUILDIN",
-        "app.security.admin-user=admin",
-        "app.security.admin-password={noop}very-secret"
-    ]
-)
-class StatisticsControllerTest {
-
-    private lateinit var mockMvc: MockMvc
-    private lateinit var webClient: WebClient
-
-    @BeforeEach
-    fun setup(@Autowired mockMvc: MockMvc) {
-        this.mockMvc = mockMvc
-        this.webClient = MockMvcWebClientBuilder.mockMvcSetup(mockMvc).build()
-    }
-
-    @Test
-    fun testShouldRequestLoginPage() {
-        mockMvc.get("/statistics").andExpect {
-            status { isOk() }
-            view { name("statistics") }
-        }
-    }
-
-}

src/integrationTest/kotlin/dev/dnpm/etl/processor/web/StatisticsRestControllerTest.kt

@@ -1,314 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.web
-
-import dev.dnpm.etl.processor.Fingerprint
-import dev.dnpm.etl.processor.PatientId
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.config.AppConfiguration
-import dev.dnpm.etl.processor.config.AppSecurityConfiguration
-import dev.dnpm.etl.processor.monitoring.CountedState
-import dev.dnpm.etl.processor.monitoring.Request
-import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.monitoring.RequestType
-import dev.dnpm.etl.processor.randomRequestId
-import dev.dnpm.etl.processor.services.RequestService
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.hasSize
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.doAnswer
-import org.mockito.kotlin.whenever
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.http.MediaType.TEXT_EVENT_STREAM
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
-import org.springframework.test.context.bean.override.mockito.MockitoBean
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.test.web.reactive.server.WebTestClient
-import org.springframework.test.web.servlet.MockMvc
-import org.springframework.test.web.servlet.client.MockMvcWebTestClient
-import org.springframework.test.web.servlet.get
-import org.springframework.web.context.WebApplicationContext
-import reactor.core.publisher.Sinks
-import reactor.test.StepVerifier
-import java.time.Instant
-import java.time.ZoneId
-import java.time.temporal.ChronoUnit
-
-
-@WebMvcTest(controllers = [StatisticsRestController::class])
-@ExtendWith(value = [MockitoExtension::class, SpringExtension::class])
-@ContextConfiguration(
-    classes = [
-        StatisticsRestController::class,
-        AppConfiguration::class,
-        AppSecurityConfiguration::class
-    ]
-)
-@TestPropertySource(
-    properties = [
-        "app.pseudonymize.generator=BUILDIN",
-        "app.security.admin-user=admin",
-        "app.security.admin-password={noop}very-secret"
-    ]
-)
-@MockitoBean(
-    types = [RequestService::class]
-)
-class StatisticsRestControllerTest {
-
-    private lateinit var mockMvc: MockMvc
-
-    private lateinit var statisticsUpdateProducer: Sinks.Many<Any>
-    private lateinit var requestService: RequestService
-
-    @BeforeEach
-    fun setup(
-        @Autowired mockMvc: MockMvc,
-        @Autowired statisticsUpdateProducer: Sinks.Many<Any>,
-        @Autowired requestService: RequestService
-    ) {
-        this.mockMvc = mockMvc
-        this.statisticsUpdateProducer = statisticsUpdateProducer
-        this.requestService = requestService
-    }
-
-    @Nested
-    inner class RequestStatesTest {
-        @Test
-        fun testShouldRequestStatesForMtbFiles() {
-            doAnswer { _ ->
-                listOf(
-                    CountedState(42, RequestStatus.WARNING),
-                    CountedState(1, RequestStatus.UNKNOWN)
-                )
-            }.whenever(requestService).countStates()
-
-            mockMvc.get("/statistics/requeststates").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(2))
-                    jsonPath("$[0].name", equalTo(RequestStatus.WARNING.name))
-                    jsonPath("$[0].value", equalTo(42))
-                    jsonPath("$[1].name", equalTo(RequestStatus.UNKNOWN.name))
-                    jsonPath("$[1].value", equalTo(1))
-                }
-            }
-        }
-
-        @Test
-        fun testShouldRequestStatesForDeletes() {
-            doAnswer { _ ->
-                listOf(
-                    CountedState(42, RequestStatus.SUCCESS),
-                    CountedState(1, RequestStatus.ERROR)
-                )
-            }.whenever(requestService).countDeleteStates()
-
-            mockMvc.get("/statistics/requeststates?delete=true").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(2))
-                    jsonPath("$[0].name", equalTo(RequestStatus.SUCCESS.name))
-                    jsonPath("$[0].value", equalTo(42))
-                    jsonPath("$[1].name", equalTo(RequestStatus.ERROR.name))
-                    jsonPath("$[1].value", equalTo(1))
-                }
-            }
-        }
-    }
-
-    @Nested
-    inner class PatientRequestStatesTest {
-        @Test
-        fun testShouldRequestPatientStatesForMtbFiles() {
-            doAnswer { _ ->
-                listOf(
-                    CountedState(42, RequestStatus.WARNING),
-                    CountedState(1, RequestStatus.UNKNOWN)
-                )
-            }.whenever(requestService).findPatientUniqueStates()
-
-            mockMvc.get("/statistics/requestpatientstates").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(2))
-                    jsonPath("$[0].name", equalTo(RequestStatus.WARNING.name))
-                    jsonPath("$[0].value", equalTo(42))
-                    jsonPath("$[1].name", equalTo(RequestStatus.UNKNOWN.name))
-                    jsonPath("$[1].value", equalTo(1))
-                }
-            }
-        }
-
-        @Test
-        fun testShouldRequestPatientStatesForDeletes() {
-            doAnswer { _ ->
-                listOf(
-                    CountedState(42, RequestStatus.SUCCESS),
-                    CountedState(1, RequestStatus.ERROR)
-                )
-            }.whenever(requestService).findPatientUniqueDeleteStates()
-
-            mockMvc.get("/statistics/requestpatientstates?delete=true").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(2))
-                    jsonPath("$[0].name", equalTo(RequestStatus.SUCCESS.name))
-                    jsonPath("$[0].value", equalTo(42))
-                    jsonPath("$[1].name", equalTo(RequestStatus.ERROR.name))
-                    jsonPath("$[1].value", equalTo(1))
-                }
-            }
-        }
-    }
-
-    @Nested
-    inner class LastMonthStatesTest {
-
-        @BeforeEach
-        fun setup() {
-            val zoneId = ZoneId.of("Europe/Berlin")
-            doAnswer { _ ->
-                listOf(
-                    Request(
-                        1,
-                        randomRequestId(),
-                        PatientPseudonym("TEST_12345678901"),
-                        PatientId("P1"),
-                        Fingerprint("0123456789abcdef1"),
-                        RequestType.MTB_FILE,
-                        RequestStatus.SUCCESS,
-                        Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).minus(2, ChronoUnit.DAYS).toInstant()
-                    ),
-                    Request(
-                        2,
-                        randomRequestId(),
-                        PatientPseudonym("TEST_12345678902"),
-                        PatientId("P2"),
-                        Fingerprint("0123456789abcdef2"),
-                        RequestType.MTB_FILE,
-                        RequestStatus.WARNING,
-                        Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).minus(2, ChronoUnit.DAYS).toInstant()
-                    ),
-                    Request(
-                        3,
-                        randomRequestId(),
-                        PatientPseudonym("TEST_12345678901"),
-                        PatientId("P2"),
-                        Fingerprint("0123456789abcdee1"),
-                        RequestType.DELETE,
-                        RequestStatus.ERROR,
-                        Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).minus(1, ChronoUnit.DAYS).toInstant()
-                    ),
-                    Request(
-                        4,
-                        randomRequestId(),
-                        PatientPseudonym("TEST_12345678902"),
-                        PatientId("P2"),
-                        Fingerprint("0123456789abcdef2"),
-                        RequestType.MTB_FILE,
-                        RequestStatus.DUPLICATION,
-                        Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).minus(1, ChronoUnit.DAYS).toInstant()
-                    ),
-                    Request(
-                        5,
-                        randomRequestId(),
-                        PatientPseudonym("TEST_12345678902"),
-                        PatientId("P2"),
-                        Fingerprint("0123456789abcdef2"),
-                        RequestType.DELETE,
-                        RequestStatus.UNKNOWN,
-                        Instant.now().atZone(zoneId).truncatedTo(ChronoUnit.DAYS).toInstant()
-                    ),
-                )
-            }.whenever(requestService).findAll()
-        }
-
-        @Test
-        fun testShouldRequestLastMonthForMtbFiles() {
-            mockMvc.get("/statistics/requestslastmonth").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(31))
-                }.also {
-                    jsonPath("$[28].nameValues.error", equalTo(0))
-                    jsonPath("$[28].nameValues.warning", equalTo(1))
-                    jsonPath("$[28].nameValues.success", equalTo(1))
-                    jsonPath("$[28].nameValues.duplication", equalTo(0))
-                    jsonPath("$[28].nameValues.unknown", equalTo(0))
-                    jsonPath("$[29].nameValues.error", equalTo(0))
-                    jsonPath("$[29].nameValues.warning", equalTo(0))
-                    jsonPath("$[29].nameValues.success", equalTo(0))
-                    jsonPath("$[29].nameValues.duplication", equalTo(1))
-                    jsonPath("$[29].nameValues.unknown", equalTo(0))
-                }
-            }
-        }
-
-        @Test
-        fun testShouldRequestLastMonthForDeletes() {
-            mockMvc.get("/statistics/requestslastmonth?delete=true").andExpect {
-                status { isOk() }.also {
-                    jsonPath("$", hasSize<Int>(31))
-                }.also {
-                    jsonPath("$[29].nameValues.error", equalTo(1))
-                    jsonPath("$[29].nameValues.warning", equalTo(0))
-                    jsonPath("$[29].nameValues.success", equalTo(0))
-                    jsonPath("$[29].nameValues.duplication", equalTo(0))
-                    jsonPath("$[29].nameValues.unknown", equalTo(0))
-                    jsonPath("$[30].nameValues.error", equalTo(0))
-                    jsonPath("$[30].nameValues.warning", equalTo(0))
-                    jsonPath("$[30].nameValues.success", equalTo(0))
-                    jsonPath("$[30].nameValues.duplication", equalTo(0))
-                    jsonPath("$[30].nameValues.unknown", equalTo(1))
-                }
-            }
-        }
-    }
-
-    @Nested
-    inner class SseTest {
-        private lateinit var webClient: WebTestClient
-
-        @BeforeEach
-        fun setup(
-            applicationContext: WebApplicationContext,
-        ) {
-            this.webClient = MockMvcWebTestClient
-                .bindToApplicationContext(applicationContext).build()
-        }
-
-        @Test
-        fun testShouldRequestSSE() {
-            statisticsUpdateProducer.emitComplete { _, _ -> true }
-
-            val result = webClient.get().uri("http://localhost/statistics/events").accept(TEXT_EVENT_STREAM).exchange()
-                .expectStatus().isOk()
-                .expectHeader().contentType(TEXT_EVENT_STREAM)
-                .returnResult(String::class.java)
-
-            StepVerifier.create(result.responseBody)
-                .expectComplete()
-                .verify()
-        }
-    }
-
-}

src/main/java/dev/dnpm/etl/processor/consent/ConsentDomain.java

@@ -1,13 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-public enum ConsentDomain {
-    /**
-     * MII Broad consent
-     */
-    BROAD_CONSENT,
-
-    /**
-     * GenomDe Modellvorhaben §64e
-     */
-    MODELLVORHABEN_64E
-}

src/main/java/dev/dnpm/etl/processor/consent/GicsConsentService.java

@@ -1,307 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.parser.DataFormatException;
-import dev.dnpm.etl.processor.config.AppFhirConfig;
-import dev.dnpm.etl.processor.config.GIcsConfigProperties;
-import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.r4.model.*;
-import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.retry.TerminatedRetryException;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.net.URI;
-import java.util.Date;
-
-/**
- * Service to request Consent from remote gICS installation
- *
- * @since 0.11
- */
-public class GicsConsentService implements IConsentService {
-
-    private final Logger log = LoggerFactory.getLogger(GicsConsentService.class);
-
-    public static final String IS_CONSENTED_ENDPOINT = "/$isConsented";
-    public static final String IS_POLICY_STATES_FOR_PERSON_ENDPOINT = "/$currentPolicyStatesForPerson";
-
-    private final RetryTemplate retryTemplate;
-    private final RestTemplate restTemplate;
-    private final FhirContext fhirContext;
-    private final GIcsConfigProperties gIcsConfigProperties;
-
-    public GicsConsentService(
-        GIcsConfigProperties gIcsConfigProperties,
-        RetryTemplate retryTemplate,
-        RestTemplate restTemplate,
-        AppFhirConfig appFhirConfig
-    ) {
-        this.retryTemplate = retryTemplate;
-        this.restTemplate = restTemplate;
-        this.fhirContext = appFhirConfig.fhirContext();
-        this.gIcsConfigProperties = gIcsConfigProperties;
-        log.info("GicsConsentService initialized...");
-    }
-
-    protected Parameters getFhirRequestParameters(
-        String personIdentifierValue
-    ) {
-        var result = new Parameters();
-        result.addParameter(
-            new ParametersParameterComponent()
-                .setName("personIdentifier")
-                .setValue(
-                    new Identifier()
-                        .setValue(personIdentifierValue)
-                        .setSystem(this.gIcsConfigProperties.getPersonIdentifierSystem())
-                )
-        );
-        result.addParameter(
-            new ParametersParameterComponent()
-                .setName("domain")
-                .setValue(
-                    new StringType()
-                        .setValue(this.gIcsConfigProperties.getBroadConsentDomainName())
-                )
-        );
-        result.addParameter(
-            new ParametersParameterComponent()
-                .setName("policy")
-                .setValue(
-                    new Coding()
-                        .setCode(this.gIcsConfigProperties.getBroadConsentPolicyCode())
-                        .setSystem(this.gIcsConfigProperties.getBroadConsentPolicySystem())
-                )
-        );
-
-        /*
-         * is mandatory parameter, but we ignore it via additional configuration parameter
-         * 'ignoreVersionNumber'.
-         */
-        result.addParameter(
-            new ParametersParameterComponent()
-                .setName("version")
-                .setValue(new StringType().setValue("1.1")
-                )
-        );
-
-        /* add config parameter with:
-         * ignoreVersionNumber -> true ->> Reason is we cannot know which policy version each patient
-         * has possibly signed or not, therefore we are happy with any version found.
-         * unknownStateIsConsideredAsDecline -> true
-         */
-        var config = new ParametersParameterComponent()
-            .setName("config")
-            .addPart(
-                new ParametersParameterComponent()
-                    .setName("ignoreVersionNumber")
-                    .setValue(new BooleanType().setValue(true))
-            )
-            .addPart(
-                new ParametersParameterComponent()
-                    .setName("unknownStateIsConsideredAsDecline")
-                    .setValue(new BooleanType().setValue(false))
-            );
-
-        result.addParameter(config);
-
-        return result;
-    }
-
-    private URI endpointUri(String endpoint) {
-        assert this.gIcsConfigProperties.getUri() != null;
-        return UriComponentsBuilder.fromUriString(this.gIcsConfigProperties.getUri()).path(endpoint).build().toUri();
-    }
-
-    private HttpHeaders headersWithHttpBasicAuth() {
-        assert this.gIcsConfigProperties.getUri() != null;
-
-        var headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_XML);
-
-        if (
-            StringUtils.isBlank(this.gIcsConfigProperties.getUsername())
-                || StringUtils.isBlank(this.gIcsConfigProperties.getPassword())
-        ) {
-            return headers;
-        }
-
-        headers.setBasicAuth(this.gIcsConfigProperties.getUsername(), this.gIcsConfigProperties.getPassword());
-        return headers;
-    }
-
-    protected String callGicsApi(Parameters parameter, String endpoint) {
-        var parameterAsXml = fhirContext.newXmlParser().encodeResourceToString(parameter);
-        HttpEntity<String> requestEntity = new HttpEntity<>(parameterAsXml, this.headersWithHttpBasicAuth());
-        try {
-            var responseEntity = retryTemplate.execute(
-                ctx -> restTemplate.exchange(endpointUri(endpoint), HttpMethod.POST, requestEntity, String.class)
-            );
-
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                return responseEntity.getBody();
-            } else {
-                var msg = String.format(
-                    "Trusted party system reached but request failed! code: '%s' response: '%s'",
-                    responseEntity.getStatusCode(), responseEntity.getBody());
-                log.error(msg);
-                return null;
-            }
-        } catch (RestClientException e) {
-            var msg = String.format("Get consents status request failed reason: '%s",
-                                    e.getMessage());
-            log.error(msg);
-            return null;
-
-        } catch (TerminatedRetryException terminatedRetryException) {
-            var msg = String.format(
-                "Get consents status process has been terminated. termination reason: '%s",
-                terminatedRetryException.getMessage());
-            log.error(msg);
-            return null;
-        }
-    }
-
-    @Override
-    public TtpConsentStatus getTtpBroadConsentStatus(String personIdentifierValue) {
-        var consentStatusResponse = callGicsApi(
-            getFhirRequestParameters(personIdentifierValue),
-            GicsConsentService.IS_CONSENTED_ENDPOINT
-        );
-        return evaluateConsentResponse(consentStatusResponse);
-    }
-
-    protected Bundle currentConsentForPersonAndTemplate(
-        String personIdentifierValue,
-        ConsentDomain consentDomain,
-        Date requestDate
-    ) {
-
-        var requestParameter = buildRequestParameterCurrentPolicyStatesForPerson(
-            personIdentifierValue,
-            requestDate,
-            consentDomain
-        );
-
-        var consentDataSerialized = callGicsApi(requestParameter,
-                                                GicsConsentService.IS_POLICY_STATES_FOR_PERSON_ENDPOINT);
-
-        if (consentDataSerialized == null) {
-            // error occurred - should not process further!
-            throw new IllegalStateException(
-                "consent data request failed - stopping processing! - try again or fix other problems first.");
-        }
-        var iBaseResource = fhirContext.newJsonParser()
-                                       .parseResource(consentDataSerialized);
-        if (iBaseResource instanceof OperationOutcome) {
-            // log error  - very likely a configuration error
-            String errorMessage =
-                "Consent request failed! Check outcome:\n " + consentDataSerialized;
-            log.error(errorMessage);
-            throw new IllegalStateException(errorMessage);
-        } else if (iBaseResource instanceof Bundle bundle) {
-            return bundle;
-        } else {
-            String errorMessage = "Consent request failed! Unexpected response received! ->  "
-                + consentDataSerialized;
-            log.error(errorMessage);
-            throw new IllegalStateException(errorMessage);
-        }
-    }
-
-    @NotNull
-    private String getConsentDomainName(ConsentDomain targetConsentDomain) {
-        return switch (targetConsentDomain) {
-            case BROAD_CONSENT -> gIcsConfigProperties.getBroadConsentDomainName();
-            case MODELLVORHABEN_64E -> gIcsConfigProperties.getGenomDeConsentDomainName();
-        };
-    }
-
-    protected Parameters buildRequestParameterCurrentPolicyStatesForPerson(
-        String personIdentifierValue,
-        Date requestDate,
-        ConsentDomain consentDomain
-    ) {
-        var requestParameter = new Parameters();
-        requestParameter.addParameter(
-            new ParametersParameterComponent()
-                .setName("personIdentifier")
-                .setValue(
-                    new Identifier()
-                        .setValue(personIdentifierValue)
-                        .setSystem(this.gIcsConfigProperties.getPersonIdentifierSystem())
-                )
-        );
-
-        requestParameter.addParameter(
-            new ParametersParameterComponent()
-                .setName("domain")
-                .setValue(new StringType().setValue(getConsentDomainName(consentDomain)))
-        );
-
-        Parameters nestedConfigParameters = new Parameters();
-        nestedConfigParameters
-            .addParameter(
-                new ParametersParameterComponent()
-                    .setName("idMatchingType")
-                    .setValue(new Coding()
-                                  .setSystem("https://ths-greifswald.de/fhir/CodeSystem/gics/IdMatchingType")
-                                  .setCode("AT_LEAST_ONE")
-                    )
-            )
-            .addParameter("ignoreVersionNumber", false)
-            .addParameter("unknownStateIsConsideredAsDecline", false)
-            .addParameter("requestDate", new DateType().setValue(requestDate));
-
-        requestParameter.addParameter(
-            new ParametersParameterComponent().setName("config").addPart().setResource(nestedConfigParameters)
-        );
-
-        return requestParameter;
-    }
-
-    private TtpConsentStatus evaluateConsentResponse(String consentStatusResponse) {
-        if (consentStatusResponse == null) {
-            return TtpConsentStatus.FAILED_TO_ASK;
-        }
-        try {
-            var response = fhirContext.newJsonParser().parseResource(consentStatusResponse);
-
-            if (response instanceof Parameters responseParameters) {
-
-                var responseValue = responseParameters.getParameter("consented").getValue();
-                var isConsented = responseValue.castToBoolean(responseValue);
-                if (!isConsented.hasValue()) {
-                    return TtpConsentStatus.FAILED_TO_ASK;
-                }
-                if (isConsented.booleanValue()) {
-                    return TtpConsentStatus.BROAD_CONSENT_GIVEN;
-                } else {
-                    return TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED;
-                }
-            } else if (response instanceof OperationOutcome outcome) {
-                log.error("failed to get consent status from ttp. probably configuration error. "
-                              + "outcome: '{}'", fhirContext.newJsonParser().encodeToString(outcome));
-
-            }
-        } catch (DataFormatException dfe) {
-            log.error("failed to parse response to FHIR R4 resource.", dfe);
-        }
-        return TtpConsentStatus.FAILED_TO_ASK;
-    }
-
-    @Override
-    public Bundle getConsent(String patientId, Date requestDate, ConsentDomain consentDomain) {
-        return currentConsentForPersonAndTemplate(patientId, consentDomain, requestDate);
-    }
-}

src/main/java/dev/dnpm/etl/processor/consent/IConsentService.java

@@ -1,27 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-import java.util.Date;
-import org.hl7.fhir.r4.model.Bundle;
-
-public interface IConsentService {
-
-    /**
-     * Get broad consent status for a patient identifier
-     *
-     * @param personIdentifierValue patient identifier used for consent data
-     * @return status of broad consent
-     * @apiNote cannot not differ between not asked and rejected
-     *
-     */
-    TtpConsentStatus getTtpBroadConsentStatus(String personIdentifierValue);
-
-    /**
-     * Get broad consent policies with respect to a request date
-     *
-     * @param personIdentifierValue patient identifier used for consent data
-     * @param requestDate           target date until consent data should be considered
-     * @return consent policies as bundle; <p>if empty patient has not been asked, yet.</p>
-     */
-    Bundle getConsent(String personIdentifierValue, Date requestDate, ConsentDomain consentDomain);
-
-}

src/main/java/dev/dnpm/etl/processor/consent/MtbFileConsentService.java

@@ -1,31 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-import java.util.Date;
-import org.hl7.fhir.r4.model.Bundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class MtbFileConsentService implements IConsentService {
-
-    private static final Logger log = LoggerFactory.getLogger(MtbFileConsentService.class);
-
-    public MtbFileConsentService() {
-        log.info("ConsentCheckFileBased initialized...");
-    }
-
-    @Override
-    public TtpConsentStatus getTtpBroadConsentStatus(String personIdentifierValue) {
-        return TtpConsentStatus.UNKNOWN_CHECK_FILE;
-    }
-
-    /**
-     * EMPTY METHOD: NOT IMPLEMENTED
-     *
-     * @return empty bundle
-     */
-    @Override
-    public Bundle getConsent(String personIdentifierValue, Date requestDate,
-        ConsentDomain consentDomain) {
-        return new Bundle();
-    }
-}

src/main/java/dev/dnpm/etl/processor/consent/TtpConsentStatus.java

@@ -1,38 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-public enum TtpConsentStatus {
-    /**
-     * Valid consent found
-     */
-    BROAD_CONSENT_GIVEN,
-    /**
-     * Missing or rejected...actually unknown
-     */
-    BROAD_CONSENT_MISSING_OR_REJECTED,
-    /**
-     * No Broad consent policy found
-     */
-    BROAD_CONSENT_MISSING,
-    /**
-     * Research policy has been rejected
-     */
-    BROAD_CONSENT_REJECTED,
-
-    GENOM_DE_CONSENT_SEQUENCING_PERMIT,
-    /**
-     * No GenomDE consent policy found
-     */
-    GENOM_DE_CONSENT_MISSING,
-    /**
-     * GenomDE consent policy found, but has been rejected
-     */
-    GENOM_DE_SEQUENCING_REJECTED,
-    /**
-     * Consent status is validate via file property 'consent.status'
-     */
-    UNKNOWN_CHECK_FILE,
-    /**
-     * Due technical problems consent status is unknown
-     */
-    FAILED_TO_ASK
-}

src/main/java/dev/dnpm/etl/processor/pseudonym/Generator.java

@@ -23,6 +23,4 @@ public interface Generator {
 
     String generate(String id);
 
-    String generateGenomDeTan(String id);
-
 }

src/main/java/dev/dnpm/etl/processor/pseudonym/GpasPseudonymGenerator.java

@@ -21,92 +21,91 @@ package dev.dnpm.etl.processor.pseudonym;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.parser.IParser;
-import dev.dnpm.etl.processor.config.AppFhirConfig;
 import dev.dnpm.etl.processor.config.GPasConfigProperties;
-import java.net.URI;
-import java.net.URISyntaxException;
-import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.core5.net.URIBuilder;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager;
+import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
+import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent;
 import org.hl7.fhir.r4.model.StringType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.*;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.retry.support.RetryTemplate;
-import org.springframework.web.client.HttpClientErrorException.BadRequest;
-import org.springframework.web.client.HttpClientErrorException.Unauthorized;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Base64;
+
 public class GpasPseudonymGenerator implements Generator {
 
-    private final FhirContext r4Context;
+    private final static FhirContext r4Context = FhirContext.forR4();
     private final String gPasUrl;
+    private final String psnTargetDomain;
     private final HttpHeaders httpHeader;
     private final RetryTemplate retryTemplate;
     private final Logger log = LoggerFactory.getLogger(GpasPseudonymGenerator.class);
-    private final RestTemplate restTemplate;
-    private final @NotNull String genomDeTanDomain;
-    private final @NotNull String pidPsnDomain;
-    protected final static String createOrGetPsn = "$pseudonymizeAllowCreate";
-    protected final static String createMultiDomainPsn = "$pseudonymize-secondary";
-    private final static String SINGLE_PSN_PART_NAME = "pseudonym";
-    private final static String MULTI_PSN_PART_NAME = "value";
 
-    public GpasPseudonymGenerator(GPasConfigProperties gpasCfg, RetryTemplate retryTemplate,
+    private final RestTemplate restTemplate;
-        RestTemplate restTemplate, AppFhirConfig appFhirConfig) {
+
+    private SSLContext customSslContext;
+
+    public GpasPseudonymGenerator(GPasConfigProperties gpasCfg, RetryTemplate retryTemplate) {
         this.retryTemplate = retryTemplate;
-        this.restTemplate = restTemplate;
+        this.restTemplate = getRestTemplete();
+
         this.gPasUrl = gpasCfg.getUri();
-        this.pidPsnDomain = gpasCfg.getPatientDomain();
+        this.psnTargetDomain = gpasCfg.getTarget();
-        this.genomDeTanDomain = gpasCfg.getGenomDeTanDomain();
-        this.r4Context = appFhirConfig.fhirContext();
         httpHeader = getHttpHeaders(gpasCfg.getUsername(), gpasCfg.getPassword());
 
-        log.debug("{} has been initialized", this.getClass().getName());
+        try {
+            if (StringUtils.isNotBlank(gpasCfg.getSslCaLocation())) {
+                customSslContext = getSslContext(gpasCfg.getSslCaLocation());
+                log.warn(String.format("%s has been initialized with SSL certificate %s. This is deprecated in favor of including Root CA.",
+                    this.getClass().getName(), gpasCfg.getSslCaLocation()));
+            }
+        } catch (IOException | KeyManagementException | KeyStoreException | CertificateException |
+                 NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+
+        log.debug(String.format("%s has been initialized", this.getClass().getName()));
 
     }
 
     @Override
     public String generate(String id) {
-        return generate(id, PsnDomainType.SINGLE_PSN_DOMAIN);
+        var gPasRequestBody = getGpasRequestBody(id);
-    }
+        var responseEntity = getGpasPseudonym(gPasRequestBody);
+        var gPasPseudonymResult = (Parameters) r4Context.newJsonParser()
+            .parseResource(responseEntity.getBody());
 
-    @Override
+        return unwrapPseudonym(gPasPseudonymResult);
-    public String generateGenomDeTan(String id) {
-        return generate(id, PsnDomainType.MULTI_PSN_DOMAIN);
-    }
-
-    protected String generate(String id, PsnDomainType domainType) {
-        switch (domainType) {
-            case SINGLE_PSN_DOMAIN -> {
-                final var requestBody = createSinglePsnRequestBody(id, pidPsnDomain);
-                final var responseEntity = getGpasPseudonym(requestBody, createOrGetPsn);
-                final var gPasPseudonymResult = (Parameters) r4Context.newJsonParser()
-                    .parseResource(responseEntity.getBody());
-
-                return unwrapPseudonym(gPasPseudonymResult, SINGLE_PSN_PART_NAME);
-            }
-            case MULTI_PSN_DOMAIN -> {
-                final var requestBody = createMultiPsnRequestBody(id, genomDeTanDomain);
-                final var responseEntity = getGpasPseudonym(requestBody, createMultiDomainPsn);
-                final var gPasPseudonymResult = (Parameters) r4Context.newJsonParser()
-                    .parseResource(responseEntity.getBody());
-
-                return unwrapPseudonym(gPasPseudonymResult, MULTI_PSN_PART_NAME);
-            }
-        }
-        throw new NotImplementedException(
-            "give domain type '%s' is unexpected and is currently not supported!".formatted(
-                domainType));
     }
 
     @NotNull
-    public static String unwrapPseudonym(Parameters gPasPseudonymResult, String targetPartName) {
+    public static String unwrapPseudonym(Parameters gPasPseudonymResult) {
         final var parameters = gPasPseudonymResult.getParameter().stream().findFirst();
 
         if (parameters.isEmpty()) {
@@ -114,7 +113,7 @@ public class GpasPseudonymGenerator implements Generator {
         }
 
         final var identifier = (Identifier) parameters.get().getPart().stream()
-            .filter(a -> a.getName().equals(targetPartName))
+            .filter(a -> a.getName().equals("pseudonym"))
             .findFirst()
             .orElseGet(ParametersParameterComponent::new).getValue();
 
@@ -136,80 +135,42 @@ public class GpasPseudonymGenerator implements Generator {
         return psnValue.replaceAll(forbiddenCharsRegex, "_");
     }
 
+
     @NotNull
-    protected ResponseEntity<String> getGpasPseudonym(String gPasRequestBody, String apiEndpoint) {
+    protected ResponseEntity<String> getGpasPseudonym(String gPasRequestBody) {
 
         HttpEntity<String> requestEntity = new HttpEntity<>(gPasRequestBody, this.httpHeader);
+        ResponseEntity<String> responseEntity;
 
         try {
-            var targetUrl = buildRequestUrl(apiEndpoint);
+            responseEntity = retryTemplate.execute(
-            ResponseEntity<String> responseEntity = retryTemplate.execute(
+                ctx -> restTemplate.exchange(gPasUrl, HttpMethod.POST, requestEntity,
-                ctx -> restTemplate.exchange(targetUrl, HttpMethod.POST, requestEntity,
                     String.class));
+
             if (responseEntity.getStatusCode().is2xxSuccessful()) {
                 log.debug("API request succeeded. Response: {}", responseEntity.getStatusCode());
-                return responseEntity;
+            } else {
-            }
+                log.warn("API request unsuccessful. Response: {}", requestEntity.getBody());
-        } catch (RestClientException rce) {
+                throw new PseudonymRequestFailed("API request unsuccessful gPas unsuccessful.");
-            if (rce instanceof BadRequest) {
-                String msg = "gPas or request configuration is incorrect. Please check both."
-                    + rce.getMessage();
-                log.debug(
-                    msg);
-                throw new PseudonymRequestFailed(msg, rce);
-            }
-            if (rce instanceof Unauthorized) {
-                var msg = "gPas access credentials are invalid  check your configuration. msg:  '%s".formatted(
-                    rce.getMessage());
-                log.error(msg);
-                throw new PseudonymRequestFailed(msg, rce);
             }
+
+            return responseEntity;
         } catch (Exception unexpected) {
             throw new PseudonymRequestFailed(
                 "API request due unexpected error unsuccessful gPas unsuccessful.", unexpected);
         }
-        throw new PseudonymRequestFailed(
-            "API request due unexpected error unsuccessful gPas unsuccessful.");
-
     }
 
-    protected URI buildRequestUrl(String apiEndpoint) throws URISyntaxException {
+    protected String getGpasRequestBody(String id) {
-        var gPasUrl1 = gPasUrl;
+        var requestParameters = new Parameters();
-        if (gPasUrl.lastIndexOf("/") == gPasUrl.length() - 1) {
-            gPasUrl1 = gPasUrl.substring(0, gPasUrl.length() - 1);
-        }
-        var urlBuilder = new URIBuilder(new URI(gPasUrl1)).appendPath(apiEndpoint);
-
-        return urlBuilder.build();
-    }
-
-    protected String createSinglePsnRequestBody(String id, String targetDomain) {
-        final var requestParameters = new Parameters();
         requestParameters.addParameter().setName("target")
-            .setValue(new StringType().setValue(targetDomain));
+            .setValue(new StringType().setValue(psnTargetDomain));
         requestParameters.addParameter().setName("original")
             .setValue(new StringType().setValue(id));
         final IParser iParser = r4Context.newJsonParser();
         return iParser.encodeResourceToString(requestParameters);
     }
 
-    protected String createMultiPsnRequestBody(String id, String targetDomain) {
-        final var param = new Parameters();
-        ParametersParameterComponent targetParam = param.addParameter().setName("original");
-        targetParam.addPart(
-            new ParametersParameterComponent().setName("target")
-                .setValue(new StringType(targetDomain)));
-        targetParam.addPart(
-            new ParametersParameterComponent().setName("value").setValue(new StringType(id)));
-        targetParam
-            .addPart(new ParametersParameterComponent().setName("count").setValue(
-                new StringType("1")));
-
-        final IParser iParser = r4Context.newJsonParser();
-        return iParser.encodeResourceToString(param);
-    }
-
-
     @NotNull
     protected HttpHeaders getHttpHeaders(String gPasUserName, String gPasPassword) {
         var headers = new HttpHeaders();
@@ -219,7 +180,67 @@ public class GpasPseudonymGenerator implements Generator {
             return headers;
         }
 
-        headers.setBasicAuth(gPasUserName, gPasPassword);
+        String authHeader = gPasUserName + ":" + gPasPassword;
+        byte[] authHeaderBytes = authHeader.getBytes();
+        byte[] encodedAuthHeaderBytes = Base64.getEncoder().encode(authHeaderBytes);
+        String encodedAuthHeader = new String(encodedAuthHeaderBytes);
+
+        if (StringUtils.isNotBlank(gPasUserName) && StringUtils.isNotBlank(gPasPassword)) {
+            headers.set("Authorization", "Basic " + encodedAuthHeader);
+        }
+
         return headers;
     }
+
+    /**
+     * Read SSL root certificate and return SSLContext
+     *
+     * @param certificateLocation file location to root certificate (PEM)
+     * @return initialized SSLContext
+     * @throws IOException              file cannot be read
+     * @throws CertificateException     in case we have an invalid certificate of type X.509
+     * @throws KeyStoreException        keystore cannot be initialized
+     * @throws NoSuchAlgorithmException missing trust manager algorithmus
+     * @throws KeyManagementException   key management failed at init SSLContext
+     */
+    @Nullable
+    protected SSLContext getSslContext(String certificateLocation)
+        throws IOException, CertificateException, KeyStoreException, KeyManagementException, NoSuchAlgorithmException {
+
+        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+
+        FileInputStream fis = new FileInputStream(certificateLocation);
+        X509Certificate ca = (X509Certificate) CertificateFactory.getInstance("X.509")
+            .generateCertificate(new BufferedInputStream(fis));
+
+        ks.load(null, null);
+        ks.setCertificateEntry(Integer.toString(1), ca);
+
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(
+            TrustManagerFactory.getDefaultAlgorithm());
+        tmf.init(ks);
+
+        SSLContext sslContext = SSLContext.getInstance("TLS");
+        sslContext.init(null, tmf.getTrustManagers(), null);
+
+        return sslContext;
+    }
+
+    protected RestTemplate getRestTemplete() {
+        if (customSslContext == null) {
+            return new RestTemplate();
+        }
+        final var sslsf = new SSLConnectionSocketFactory(customSslContext);
+        final Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create()
+            .register("https", sslsf).register("http", new PlainConnectionSocketFactory()).build();
+
+        final BasicHttpClientConnectionManager connectionManager = new BasicHttpClientConnectionManager(
+            socketFactoryRegistry);
+        final CloseableHttpClient httpClient = HttpClients.custom()
+            .setConnectionManager(connectionManager).build();
+
+        final HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(
+            httpClient);
+        return new RestTemplate(requestFactory);
+    }
 }

src/main/java/dev/dnpm/etl/processor/pseudonym/PsnDomainType.java

@@ -1,12 +0,0 @@
-package dev.dnpm.etl.processor.pseudonym;
-
-public enum PsnDomainType {
-    /**
-     * one pseudonym per original value
-     */
-    SINGLE_PSN_DOMAIN,
-    /**
-     * multiple pseudonymes for one original value
-     */
-    MULTI_PSN_DOMAIN
-}

src/main/kotlin/dev/dnpm/etl/processor/config/AppConfigProperties.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -21,13 +21,19 @@ package dev.dnpm.etl.processor.config
 
 import dev.dnpm.etl.processor.security.Role
 import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty
 
 @ConfigurationProperties(AppConfigProperties.NAME)
 data class AppConfigProperties(
+    var bwhcUri: String?,
+    @get:DeprecatedConfigurationProperty(
+        reason = "Deprecated in favor of 'app.pseudonymize.generator'",
+        replacement = "app.pseudonymize.generator"
+    )
+    var pseudonymizer: PseudonymGenerator = PseudonymGenerator.BUILDIN,
     var transformations: List<TransformationProperties> = listOf(),
     var maxRetryAttempts: Int = 3,
-    var duplicationDetection: Boolean = true,
+    var duplicationDetection: Boolean = true
-    var genomDeTestSubmission: Boolean = false
 ) {
     companion object {
         const val NAME = "app"
@@ -47,87 +53,22 @@ data class PseudonymizeConfigProperties(
 @ConfigurationProperties(GPasConfigProperties.NAME)
 data class GPasConfigProperties(
     val uri: String?,
-    val patientDomain: String = "etl-processor",
+    val target: String = "etl-processor",
-    val genomDeTanDomain: String = "ccdn",
     val username: String?,
     val password: String?,
+    @get:DeprecatedConfigurationProperty(
+        reason = "Deprecated in favor of including Root CA"
+    )
+    val sslCaLocation: String?
 ) {
     companion object {
         const val NAME = "app.pseudonymize.gpas"
     }
 }
 
-@ConfigurationProperties(ConsentConfigProperties.NAME)
-data class ConsentConfigProperties(
-    var service: ConsentService = ConsentService.NONE
-) {
-    companion object {
-        const val NAME = "app.consent"
-    }
-}
-
-@ConfigurationProperties(GIcsConfigProperties.NAME)
-data class GIcsConfigProperties(
-    /**
-     * Base URL to gICS System
-     *
-     */
-    val uri: String?,
-    val username: String? = null,
-    val password: String? = null,
-
-    /**
-     * gICS specific system
-     * **/
-    val personIdentifierSystem: String =
-        "https://ths-greifswald.de/fhir/gics/identifiers/Patienten-ID",
-
-    /**
-     * Domain of broad consent resources
-     **/
-    val broadConsentDomainName: String = "MII",
-
-    /**
-     * Domain of Modelvorhaben 64e consent resources
-     **/
-    val genomDeConsentDomainName: String = "GenomDE_MV",
-
-    /**
-     * Value to expect in case of positiv consent
-     */
-    val broadConsentPolicyCode: String = "2.16.840.1.113883.3.1937.777.24.5.3.6",
-
-    /**
-     * Consent Policy which should be used for consent check
-     */
-    val broadConsentPolicySystem: String = "urn:oid:2.16.840.1.113883.3.1937.777.24.5.3",
-
-    /**
-     * Value to expect in case of positiv consent
-     */
-    val genomeDePolicyCode: String = "sequencing",
-
-    /**
-     * Consent Policy which should be used for consent check
-     */
-    val genomeDePolicySystem: String = "https://ths-greifswald.de/fhir/CodeSystem/gics/Policy/GenomDE_MV",
-
-    /**
-     * Consent version (fixed version)
-     *
-     */
-    val genomeDeConsentVersion: String = "2.0"
-) {
-    companion object {
-        const val NAME = "app.consent.gics"
-    }
-}
-
 @ConfigurationProperties(RestTargetProperties.NAME)
 data class RestTargetProperties(
     val uri: String?,
-    val username: String?,
-    val password: String?
 ) {
     companion object {
         const val NAME = "app.rest"
@@ -138,8 +79,18 @@ data class RestTargetProperties(
 data class KafkaProperties(
     val inputTopic: String?,
     val outputTopic: String = "etl-processor",
+    @get:DeprecatedConfigurationProperty(
+        reason = "Deprecated",
+        replacement = "outputTopic"
+    )
+    val topic: String = outputTopic,
     val outputResponseTopic: String = "${outputTopic}_response",
-    val groupId: String = "${outputTopic}_group",
+    @get:DeprecatedConfigurationProperty(
+        reason = "Deprecated",
+        replacement = "outputResponseTopic"
+    )
+    val responseTopic: String = outputResponseTopic,
+    val groupId: String = "${topic}_group",
     val servers: String = ""
 ) {
     companion object {
@@ -165,11 +116,6 @@ enum class PseudonymGenerator {
     GPAS
 }
 
-enum class ConsentService {
-    NONE,
-    GICS
-}
-
 data class TransformationProperties(
     val path: String,
     val from: String,

src/main/kotlin/dev/dnpm/etl/processor/config/AppConfiguration.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,29 +20,21 @@
 package dev.dnpm.etl.processor.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.consent.MtbFileConsentService
-import dev.dnpm.etl.processor.consent.GicsConsentService
-import dev.dnpm.etl.processor.consent.IConsentService
 import dev.dnpm.etl.processor.monitoring.*
 import dev.dnpm.etl.processor.pseudonym.AnonymizingGenerator
 import dev.dnpm.etl.processor.pseudonym.Generator
 import dev.dnpm.etl.processor.pseudonym.GpasPseudonymGenerator
 import dev.dnpm.etl.processor.pseudonym.PseudonymizeService
-import dev.dnpm.etl.processor.security.TokenRepository
+import dev.dnpm.etl.processor.services.TokenRepository
-import dev.dnpm.etl.processor.security.TokenService
+import dev.dnpm.etl.processor.services.TokenService
-import dev.dnpm.etl.processor.services.ConsentProcessor
 import dev.dnpm.etl.processor.services.Transformation
 import dev.dnpm.etl.processor.services.TransformationService
 import org.slf4j.LoggerFactory
-import org.springframework.boot.autoconfigure.condition.AnyNestedCondition
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Conditional
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.ConfigurationCondition
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration
 import org.springframework.retry.RetryCallback
 import org.springframework.retry.RetryContext
 import org.springframework.retry.RetryListener
@@ -52,7 +44,6 @@ import org.springframework.retry.support.RetryTemplateBuilder
 import org.springframework.scheduling.annotation.EnableScheduling
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.provisioning.InMemoryUserDetailsManager
-import org.springframework.web.client.HttpClientErrorException
 import org.springframework.web.client.RestTemplate
 import reactor.core.publisher.Sinks
 import kotlin.time.Duration.Companion.seconds
@@ -64,9 +55,7 @@ import kotlin.time.toJavaDuration
     value = [
         AppConfigProperties::class,
         PseudonymizeConfigProperties::class,
-        GPasConfigProperties::class,
+        GPasConfigProperties::class
-        ConsentConfigProperties::class,
-        GIcsConfigProperties::class
     ]
 )
 @EnableScheduling
@@ -79,31 +68,29 @@ class AppConfiguration {
         return RestTemplate()
     }
 
-    @Bean
-    fun appFhirConfig(): AppFhirConfig {
-        return AppFhirConfig()
-    }
-
     @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "GPAS")
     @Bean
-    fun gpasPseudonymGenerator(
+    fun gpasPseudonymGenerator(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate): Generator {
-        configProperties: GPasConfigProperties,
+        return GpasPseudonymGenerator(configProperties, retryTemplate)
-        retryTemplate: RetryTemplate,
-        restTemplate: RestTemplate,
-        appFhirConfig: AppFhirConfig
-    ): Generator {
-        logger.info("Selected 'GpasPseudonym Generator'")
-        return GpasPseudonymGenerator(configProperties, retryTemplate, restTemplate, appFhirConfig)
     }
 
-    @ConditionalOnProperty(
+    @ConditionalOnProperty(value = ["app.pseudonymize.generator"], havingValue = "BUILDIN", matchIfMissing = true)
-        value = ["app.pseudonymize.generator"],
-        havingValue = "BUILDIN",
-        matchIfMissing = true
-    )
     @Bean
     fun buildinPseudonymGenerator(): Generator {
-        logger.info("Selected 'BUILDIN Pseudonym Generator'")
+        return AnonymizingGenerator()
+    }
+
+    @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
+    @ConditionalOnMissingBean
+    @Bean
+    fun gpasPseudonymGeneratorOnDeprecatedProperty(configProperties: GPasConfigProperties, retryTemplate: RetryTemplate): Generator {
+        return GpasPseudonymGenerator(configProperties, retryTemplate)
+    }
+
+    @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "BUILDIN")
+    @ConditionalOnMissingBean
+    @Bean
+    fun buildinPseudonymGeneratorOnDeprecatedProperty(): Generator {
         return AnonymizingGenerator()
     }
 
@@ -116,21 +103,17 @@ class AppConfiguration {
     }
 
     @Bean
-    fun reportService(): ReportService {
+    fun reportService(objectMapper: ObjectMapper): ReportService {
-        return ReportService(getObjectMapper())
+        return ReportService(objectMapper)
-    }
-
-    @Bean
-    fun getObjectMapper(): ObjectMapper {
-        return JacksonConfig().objectMapper()
     }
 
     @Bean
     fun transformationService(
+        objectMapper: ObjectMapper,
         configProperties: AppConfigProperties
     ): TransformationService {
         logger.info("Apply ${configProperties.transformations.size} transformation rules")
-        return TransformationService(getObjectMapper(), configProperties.transformations.map {
+        return TransformationService(objectMapper, configProperties.transformations.map {
             Transformation.of(it.path) from it.from to it.to
         })
     }
@@ -139,8 +122,6 @@ class AppConfiguration {
     fun retryTemplate(configProperties: AppConfigProperties): RetryTemplate {
         return RetryTemplateBuilder()
             .notRetryOn(IllegalArgumentException::class.java)
-            .notRetryOn(HttpClientErrorException.BadRequest::class.java)
-            .notRetryOn(HttpClientErrorException.UnprocessableEntity::class.java)
             .exponentialBackoff(2.seconds.toJavaDuration(), 1.25, 5.seconds.toJavaDuration())
             .customPolicy(SimpleRetryPolicy(configProperties.maxRetryAttempts))
             .withListener(object : RetryListener {
@@ -149,11 +130,7 @@ class AppConfiguration {
                     callback: RetryCallback<T, E>,
                     throwable: Throwable
                 ) {
-                    logger.warn(
+                    logger.warn("Error occured: {}. Retrying {}", throwable.message, context.retryCount)
-                        "Error occured: {}. Retrying {}",
-                        throwable.message,
-                        context.retryCount
-                    )
                 }
             })
             .build()
@@ -161,11 +138,7 @@ class AppConfiguration {
 
     @ConditionalOnProperty(value = ["app.security.enable-tokens"], havingValue = "true")
     @Bean
-    fun tokenService(
+    fun tokenService(userDetailsManager: InMemoryUserDetailsManager, passwordEncoder: PasswordEncoder, tokenRepository: TokenRepository): TokenService {
-        userDetailsManager: InMemoryUserDetailsManager,
-        passwordEncoder: PasswordEncoder,
-        tokenRepository: TokenRepository
-    ): TokenService {
         return TokenService(userDetailsManager, passwordEncoder, tokenRepository)
     }
 
@@ -186,11 +159,7 @@ class AppConfiguration {
         gPasConfigProperties: GPasConfigProperties,
         connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
     ): ConnectionCheckService {
-        return GPasConnectionCheckService(
+        return GPasConnectionCheckService(restTemplate, gPasConfigProperties, connectionCheckUpdateProducer)
-            restTemplate,
-            gPasConfigProperties,
-            connectionCheckUpdateProducer
-        )
     }
 
     @ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
@@ -201,81 +170,8 @@ class AppConfiguration {
         gPasConfigProperties: GPasConfigProperties,
         connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
     ): ConnectionCheckService {
-        return GPasConnectionCheckService(
+        return GPasConnectionCheckService(restTemplate, gPasConfigProperties, connectionCheckUpdateProducer)
-            restTemplate,
-            gPasConfigProperties,
-            connectionCheckUpdateProducer
-        )
-    }
-
-    @Bean
-    fun jdbcConfiguration(): AbstractJdbcConfiguration {
-        return AppJdbcConfiguration()
-    }
-
-    @Conditional(GicsEnabledCondition::class)
-    @Bean
-    fun gicsConsentService(
-        gIcsConfigProperties: GIcsConfigProperties,
-        retryTemplate: RetryTemplate,
-        restTemplate: RestTemplate,
-        appFhirConfig: AppFhirConfig
-    ): IConsentService {
-        return GicsConsentService(
-            gIcsConfigProperties,
-            retryTemplate,
-            restTemplate,
-            appFhirConfig
-        )
-    }
-
-    @Conditional(GicsEnabledCondition::class)
-    @Bean
-    fun consentProcessor(
-        configProperties: AppConfigProperties,
-        gIcsConfigProperties: GIcsConfigProperties,
-        getObjectMapper: ObjectMapper,
-        appFhirConfig: AppFhirConfig,
-        gicsConsentService: IConsentService
-    ): ConsentProcessor {
-        return ConsentProcessor(
-            configProperties,
-            gIcsConfigProperties,
-            getObjectMapper,
-            appFhirConfig.fhirContext(),
-            gicsConsentService
-        )
-    }
-
-    @Conditional(GicsEnabledCondition::class)
-    @Bean
-    fun gIcsConnectionCheckService(
-        restTemplate: RestTemplate,
-        gIcsConfigProperties: GIcsConfigProperties,
-        connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
-    ): ConnectionCheckService {
-        return GIcsConnectionCheckService(
-            restTemplate,
-            gIcsConfigProperties,
-            connectionCheckUpdateProducer
-        )
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    fun iGetConsentService(): IConsentService {
-        return MtbFileConsentService()
     }
 
 }
 
-class GicsEnabledCondition :
-    AnyNestedCondition(ConfigurationCondition.ConfigurationPhase.REGISTER_BEAN) {
-
-    @ConditionalOnProperty(name = ["app.consent.service"], havingValue = "gics")
-    @ConditionalOnProperty(name = ["app.consent.gics.uri"])
-    class OnGicsServiceSelected {
-        // Just for Condition
-    }
-
-}

src/main/kotlin/dev/dnpm/etl/processor/config/AppFhirConfig.kt

@@ -1,16 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-import ca.uhn.fhir.context.FhirContext
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-
-
-@Configuration
-class AppFhirConfig {
-    private val fhirCtx: FhirContext = FhirContext.forR4()
-
-    @Bean
-    fun fhirContext(): FhirContext {
-        return fhirCtx
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/config/AppJdbcConfiguration.kt

@@ -1,25 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-import dev.dnpm.etl.processor.Fingerprint
-import org.springframework.context.annotation.Configuration
-import org.springframework.core.convert.converter.Converter
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration
-
-@Configuration
-class AppJdbcConfiguration : AbstractJdbcConfiguration() {
-    override fun userConverters(): MutableList<*> {
-        return mutableListOf(StringToFingerprintConverter(), FingerprintToStringConverter())
-    }
-}
-
-class StringToFingerprintConverter : Converter<String, Fingerprint> {
-    override fun convert(source: String): Fingerprint {
-        return Fingerprint(source)
-    }
-}
-
-class FingerprintToStringConverter : Converter<Fingerprint, String> {
-    override fun convert(source: Fingerprint): String {
-        return source.value
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,7 +20,6 @@
 package dev.dnpm.etl.processor.config
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
 import dev.dnpm.etl.processor.input.KafkaInputListener
 import dev.dnpm.etl.processor.monitoring.ConnectionCheckResult
 import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
@@ -72,7 +71,7 @@ class AppKafkaConfiguration {
         kafkaProperties: KafkaProperties,
         kafkaResponseProcessor: KafkaResponseProcessor
     ): KafkaMessageListenerContainer<String, String> {
-        val containerProperties = ContainerProperties(kafkaProperties.outputResponseTopic)
+        val containerProperties = ContainerProperties(kafkaProperties.responseTopic)
         containerProperties.messageListener = kafkaResponseProcessor
         return KafkaMessageListenerContainer(consumerFactory, containerProperties)
     }
@@ -101,10 +100,9 @@ class AppKafkaConfiguration {
     @ConditionalOnProperty(value = ["app.kafka.input-topic"])
     fun kafkaInputListener(
         requestProcessor: RequestProcessor,
-        objectMapper: ObjectMapper,
+        objectMapper: ObjectMapper
-        consentEvaluator: ConsentEvaluator
     ): KafkaInputListener {
-        return KafkaInputListener(requestProcessor, consentEvaluator, objectMapper)
+        return KafkaInputListener(requestProcessor, objectMapper)
     }
 
     @Bean

src/main/kotlin/dev/dnpm/etl/processor/config/AppRestConfiguration.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -21,10 +21,9 @@ package dev.dnpm.etl.processor.config
 
 import dev.dnpm.etl.processor.monitoring.ConnectionCheckResult
 import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
-import dev.dnpm.etl.processor.monitoring.ReportService
 import dev.dnpm.etl.processor.monitoring.RestConnectionCheckService
 import dev.dnpm.etl.processor.output.MtbFileSender
-import dev.dnpm.etl.processor.output.RestDipMtbFileSender
+import dev.dnpm.etl.processor.output.RestMtbFileSender
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -53,11 +52,10 @@ class AppRestConfiguration {
     fun restMtbFileSender(
         restTemplate: RestTemplate,
         restTargetProperties: RestTargetProperties,
-        retryTemplate: RetryTemplate,
+        retryTemplate: RetryTemplate
-        reportService: ReportService,
     ): MtbFileSender {
-        logger.info("Selected 'RestDipMtbFileSender'")
+        logger.info("Selected 'RestMtbFileSender'")
-        return RestDipMtbFileSender(restTemplate, restTargetProperties, retryTemplate, reportService)
+        return RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
     }
 
     @Bean

src/main/kotlin/dev/dnpm/etl/processor/config/AppSecurityConfiguration.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2023  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -21,7 +21,7 @@ package dev.dnpm.etl.processor.config
 
 import dev.dnpm.etl.processor.security.UserRole
 import dev.dnpm.etl.processor.security.UserRoleRepository
-import dev.dnpm.etl.processor.security.UserRoleService
+import dev.dnpm.etl.processor.services.UserRoleService
 import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
@@ -44,8 +44,6 @@ import org.springframework.security.web.SecurityFilterChain
 import java.util.*
 
 
-private const val LOGIN_PATH = "/login"
-
 @Configuration
 @EnableConfigurationProperties(
     value = [
@@ -87,17 +85,11 @@ class AppSecurityConfiguration(
 
     @Bean
     @ConditionalOnProperty(value = ["app.security.enable-oidc"], havingValue = "true")
-    fun filterChainOidc(
+    fun filterChainOidc(http: HttpSecurity, passwordEncoder: PasswordEncoder, userRoleRepository: UserRoleRepository, sessionRegistry: SessionRegistry): SecurityFilterChain {
-        http: HttpSecurity,
-        passwordEncoder: PasswordEncoder,
-        userRoleRepository: UserRoleRepository,
-        sessionRegistry: SessionRegistry
-    ): SecurityFilterChain {
         http {
-            authorizeHttpRequests {
+            authorizeRequests {
                 authorize("/configs/**", hasRole("ADMIN"))
-                authorize("/mtbfile/**", hasAnyRole("MTBFILE", "ADMIN", "USER"))
+                authorize("/mtbfile/**", hasAnyRole("MTBFILE"))
-                authorize("/mtb/**", hasAnyRole("MTBFILE", "ADMIN", "USER"))
                 authorize("/report/**", hasAnyRole("ADMIN", "USER"))
                 authorize("*.css", permitAll)
                 authorize("*.ico", permitAll)
@@ -112,15 +104,15 @@ class AppSecurityConfiguration(
                 realmName = "ETL-Processor"
             }
             formLogin {
-                loginPage = LOGIN_PATH
+                loginPage = "/login"
             }
             oauth2Login {
-                loginPage = LOGIN_PATH
+                loginPage = "/login"
             }
             sessionManagement {
                 sessionConcurrency {
                     maximumSessions = 1
-                    expiredUrl = "$LOGIN_PATH?expired"
+                    expiredUrl = "/login?expired"
                 }
                 sessionFixation {
                     newSession()
@@ -133,22 +125,13 @@ class AppSecurityConfiguration(
 
     @Bean
     @ConditionalOnProperty(value = ["app.security.enable-oidc"], havingValue = "true")
-    fun grantedAuthoritiesMapper(
+    fun grantedAuthoritiesMapper(userRoleRepository: UserRoleRepository, appSecurityConfigProperties: SecurityConfigProperties): GrantedAuthoritiesMapper {
-        userRoleRepository: UserRoleRepository,
-        appSecurityConfigProperties: SecurityConfigProperties
-    ): GrantedAuthoritiesMapper {
         return GrantedAuthoritiesMapper { grantedAuthority ->
             grantedAuthority.filterIsInstance<OidcUserAuthority>()
                 .onEach {
                     val userRole = userRoleRepository.findByUsername(it.userInfo.preferredUsername)
                     if (userRole.isEmpty) {
-                        userRoleRepository.save(
+                        userRoleRepository.save(UserRole(null, it.userInfo.preferredUsername, appSecurityConfigProperties.defaultNewUserRole))
-                            UserRole(
-                                null,
-                                it.userInfo.preferredUsername,
-                                appSecurityConfigProperties.defaultNewUserRole
-                            )
-                        )
                     }
                 }
                 .map {
@@ -162,10 +145,9 @@ class AppSecurityConfiguration(
     @ConditionalOnProperty(value = ["app.security.enable-oidc"], havingValue = "false", matchIfMissing = true)
     fun filterChain(http: HttpSecurity, passwordEncoder: PasswordEncoder): SecurityFilterChain {
         http {
-            authorizeHttpRequests {
+            authorizeRequests {
                 authorize("/configs/**", hasRole("ADMIN"))
-                authorize("/mtbfile/**", hasAnyRole("MTBFILE", "ADMIN"))
+                authorize("/mtbfile/**", hasAnyRole("MTBFILE"))
-                authorize("/mtb/**", hasAnyRole("MTBFILE", "ADMIN"))
                 authorize("/report/**", hasRole("ADMIN"))
                 authorize(anyRequest, permitAll)
             }
@@ -173,7 +155,7 @@ class AppSecurityConfiguration(
                 realmName = "ETL-Processor"
             }
             formLogin {
-                loginPage = LOGIN_PATH
+                loginPage = "/login"
             }
             csrf { disable() }
         }

src/main/kotlin/dev/dnpm/etl/processor/config/ConsentResourceDeserializer.kt

@@ -1,18 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-import com.fasterxml.jackson.core.JsonParser
-
-import com.fasterxml.jackson.databind.DeserializationContext
-import com.fasterxml.jackson.databind.JsonDeserializer
-import com.fasterxml.jackson.databind.JsonNode
-import org.hl7.fhir.r4.model.Consent
-
-class ConsentResourceDeserializer : JsonDeserializer<Consent>() {
-    override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): Consent {
-
-        val jsonNode = p?.readValueAsTree<JsonNode>()
-        val json = jsonNode?.toString()
-
-        return JacksonConfig.fhirContext().newJsonParser().parseResource(json) as Consent
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/config/ConsentResourceSerializer.kt

@@ -1,15 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-import com.fasterxml.jackson.core.JsonGenerator
-import com.fasterxml.jackson.databind.JsonSerializer
-import com.fasterxml.jackson.databind.SerializerProvider
-import org.hl7.fhir.r4.model.Consent
-
-class ConsentResourceSerializer : JsonSerializer<Consent>() {
-    override fun serialize(
-        value: Consent, gen: JsonGenerator, serializers: SerializerProvider
-    ) {
-        val json = JacksonConfig.fhirContext().newJsonParser().encodeResourceToString(value)
-        gen.writeRawValue(json)
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/config/FhirResourceModule.kt

@@ -1,12 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-
-import com.fasterxml.jackson.databind.module.SimpleModule
-import org.hl7.fhir.r4.model.Consent
-
-class FhirResourceModule : SimpleModule() {
-    init {
-        addSerializer(Consent::class.java, ConsentResourceSerializer())
-        addDeserializer(Consent::class.java, ConsentResourceDeserializer())
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/config/JacksonConfig.kt

@@ -1,27 +0,0 @@
-package dev.dnpm.etl.processor.config
-
-import ca.uhn.fhir.context.FhirContext
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
-
-@Configuration
-class JacksonConfig {
-
-    companion object {
-        var fhirContext: FhirContext = FhirContext.forR4()
-
-        @JvmStatic
-        fun fhirContext(): FhirContext {
-            return fhirContext
-        }
-    }
-
-    @Bean
-    fun objectMapper(): ObjectMapper = ObjectMapper().registerModule(FhirResourceModule())
-        .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).registerModule(
-            JavaTimeModule()
-        )
-}

src/main/kotlin/dev/dnpm/etl/processor/consent/ConsentEvaluator.kt

@@ -1,66 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.consent
-
-import dev.pcvolkmer.mv64e.mtb.ConsentProvision
-import dev.pcvolkmer.mv64e.mtb.ModelProjectConsentPurpose
-import dev.pcvolkmer.mv64e.mtb.Mtb
-import org.springframework.stereotype.Service
-
-/**
- * Evaluates consent using provided consent service and file based consent information
- */
-@Service
-class ConsentEvaluator(
-    private val consentService: IConsentService
-) {
-    fun check(mtbFile: Mtb): ConsentEvaluation {
-        val ttpConsentStatus = consentService.getTtpBroadConsentStatus(mtbFile.patient.id)
-        val consentGiven = ttpConsentStatus == TtpConsentStatus.BROAD_CONSENT_GIVEN
-                || ttpConsentStatus == TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT
-                // Aktuell nur Modellvorhaben Consent im File
-                || ttpConsentStatus == TtpConsentStatus.UNKNOWN_CHECK_FILE && mtbFile.metadata?.modelProjectConsent?.provisions?.any {
-                    it.purpose == ModelProjectConsentPurpose.SEQUENCING
-                            && it.type == ConsentProvision.PERMIT
-                } == true
-
-        return ConsentEvaluation(ttpConsentStatus, consentGiven)
-    }
-}
-
-data class ConsentEvaluation(private val ttpConsentStatus: TtpConsentStatus, private val consentGiven: Boolean) {
-    /**
-     * Checks if any required consent is present
-     */
-    fun hasConsent(): Boolean {
-        return consentGiven
-    }
-
-    /**
-     * Returns the consent status
-     */
-    fun getStatus(): TtpConsentStatus {
-        if (ttpConsentStatus == TtpConsentStatus.UNKNOWN_CHECK_FILE) {
-            // in case ttp check is disabled - we propagate rejected status anyway
-            return TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED
-        }
-        return ttpConsentStatus
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,56 +20,29 @@
 package dev.dnpm.etl.processor.input
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.CustomMediaType
+import de.ukw.ccc.bwhc.dto.Consent
-import dev.dnpm.etl.processor.PatientId
+import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.dnpm.etl.processor.RequestId
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.pcvolkmer.mv64e.mtb.Mtb
 import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.slf4j.LoggerFactory
-import org.springframework.http.MediaType
 import org.springframework.kafka.listener.MessageListener
-import java.nio.charset.Charset
 
 class KafkaInputListener(
     private val requestProcessor: RequestProcessor,
-    private val consentEvaluator: ConsentEvaluator,
     private val objectMapper: ObjectMapper
 ) : MessageListener<String, String> {
     private val logger = LoggerFactory.getLogger(KafkaInputListener::class.java)
 
-    override fun onMessage(record: ConsumerRecord<String, String>) {
+    override fun onMessage(data: ConsumerRecord<String, String>) {
-        when (guessMimeType(record)) {
+        val mtbFile = objectMapper.readValue(data.value(), MtbFile::class.java)
-            MediaType.APPLICATION_JSON_VALUE -> handleDnpmV2Message(record)
+        val firstRequestIdHeader = data.headers().headers("requestId")?.firstOrNull()
-            CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE -> handleDnpmV2Message(record)
-            else -> {
-                /* ignore other messages */
-            }
-        }
-    }
-
-    private fun guessMimeType(record: ConsumerRecord<String, String>): String? {
-        if (record.headers().headers("contentType").toList().isEmpty()) {
-            // Fallback if no contentType set (old behavior)
-            return MediaType.APPLICATION_JSON_VALUE
-        }
-
-        return record.headers().headers("contentType")?.firstOrNull()?.value()?.toString(Charset.forName("UTF-8"))
-    }
-
-    private fun handleDnpmV2Message(record: ConsumerRecord<String, String>) {
-        val mtbFile = objectMapper.readValue(record.value(), Mtb::class.java)
-        val patientId = PatientId(mtbFile.patient.id)
-        val firstRequestIdHeader = record.headers().headers("requestId")?.firstOrNull()
         val requestId = if (null != firstRequestIdHeader) {
-            RequestId(String(firstRequestIdHeader.value()))
+            String(firstRequestIdHeader.value())
         } else {
-            RequestId("")
+            ""
         }
 
-        if (consentEvaluator.check(mtbFile).hasConsent()) {
+        if (mtbFile.consent.status == Consent.Status.ACTIVE) {
             logger.debug("Accepted MTB File for processing")
             if (requestId.isBlank()) {
                 requestProcessor.processMtbFile(mtbFile)
@@ -79,15 +52,10 @@ class KafkaInputListener(
         } else {
             logger.debug("Accepted MTB File and process deletion")
             if (requestId.isBlank()) {
-                requestProcessor.processDeletion(patientId, TtpConsentStatus.UNKNOWN_CHECK_FILE)
+                requestProcessor.processDeletion(mtbFile.patient.id)
             } else {
-                requestProcessor.processDeletion(
+                requestProcessor.processDeletion(mtbFile.patient.id, requestId)
-                    patientId,
-                    requestId,
-                    TtpConsentStatus.UNKNOWN_CHECK_FILE
-                )
             }
         }
     }
-
 }

src/main/kotlin/dev/dnpm/etl/processor/input/MtbFileRestController.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -19,23 +19,19 @@
 
 package dev.dnpm.etl.processor.input
 
-import dev.dnpm.etl.processor.CustomMediaType
+import de.ukw.ccc.bwhc.dto.Consent
-import dev.dnpm.etl.processor.PatientId
+import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.pcvolkmer.mv64e.mtb.Mtb
 import org.slf4j.LoggerFactory
-import org.springframework.http.MediaType
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 
 @RestController
-@RequestMapping(path = ["mtbfile", "mtb"])
+@RequestMapping(path = ["mtbfile"])
 class MtbFileRestController(
     private val requestProcessor: RequestProcessor,
-    private val consentEvaluator: ConsentEvaluator
 ) {
+
     private val logger = LoggerFactory.getLogger(MtbFileRestController::class.java)
 
     @GetMapping
@@ -43,24 +39,22 @@ class MtbFileRestController(
         return ResponseEntity.ok("Test")
     }
 
-    @PostMapping(consumes = [MediaType.APPLICATION_JSON_VALUE, CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE])
+    @PostMapping
-    fun mtbFile(@RequestBody mtbFile: Mtb): ResponseEntity<Unit> {
+    fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity<Void> {
-        val consentEvaluation = consentEvaluator.check(mtbFile)
+        if (mtbFile.consent.status == Consent.Status.ACTIVE) {
-        if (consentEvaluation.hasConsent()) {
+            logger.debug("Accepted MTB File for processing")
-            logger.debug("Accepted MTB File (DNPM V2) for processing")
             requestProcessor.processMtbFile(mtbFile)
         } else {
-            logger.debug("Accepted MTB File (DNPM V2) and process deletion")
+            logger.debug("Accepted MTB File and process deletion")
-            val patientId = PatientId(mtbFile.patient.id)
+            requestProcessor.processDeletion(mtbFile.patient.id)
-            requestProcessor.processDeletion(patientId, consentEvaluation.getStatus())
         }
         return ResponseEntity.accepted().build()
     }
 
     @DeleteMapping(path = ["{patientId}"])
-    fun deleteData(@PathVariable patientId: String): ResponseEntity<Unit> {
+    fun deleteData(@PathVariable patientId: String): ResponseEntity<Void> {
         logger.debug("Accepted patient ID to process deletion")
-        requestProcessor.processDeletion(PatientId(patientId), TtpConsentStatus.UNKNOWN_CHECK_FILE)
+        requestProcessor.processDeletion(patientId)
         return ResponseEntity.accepted().build()
     }
 

src/main/kotlin/dev/dnpm/etl/processor/monitoring/ConnectionCheckService.kt

@@ -20,25 +20,28 @@
 
 package dev.dnpm.etl.processor.monitoring
 
-import dev.dnpm.etl.processor.config.GIcsConfigProperties
 import dev.dnpm.etl.processor.config.GPasConfigProperties
 import dev.dnpm.etl.processor.config.RestTargetProperties
 import jakarta.annotation.PostConstruct
 import org.apache.kafka.clients.consumer.Consumer
 import org.apache.kafka.common.errors.TimeoutException
 import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.http.*
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpHeaders
+import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import org.springframework.http.MediaType
+import org.springframework.http.RequestEntity
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.web.client.RestTemplate
 import org.springframework.web.util.UriComponentsBuilder
 import reactor.core.publisher.Sinks
-import java.time.Instant
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toJavaDuration
 
-fun interface ConnectionCheckService {
+interface ConnectionCheckService {
 
-    fun connectionAvailable(): ConnectionCheckResult
+    fun connectionAvailable(): Boolean
 
 }
 
@@ -48,33 +51,9 @@ sealed class ConnectionCheckResult {
 
     abstract val available: Boolean
 
-    abstract val timestamp: Instant
+    data class KafkaConnectionCheckResult(override val available: Boolean) : ConnectionCheckResult()
-
+    data class RestConnectionCheckResult(override val available: Boolean) : ConnectionCheckResult()
-    abstract val lastChange: Instant
+    data class GPasConnectionCheckResult(override val available: Boolean) : ConnectionCheckResult()
-
-    data class KafkaConnectionCheckResult(
-        override val available: Boolean,
-        override val timestamp: Instant,
-        override val lastChange: Instant
-    ) : ConnectionCheckResult()
-
-    data class RestConnectionCheckResult(
-        override val available: Boolean,
-        override val timestamp: Instant,
-        override val lastChange: Instant
-    ) : ConnectionCheckResult()
-
-    data class GPasConnectionCheckResult(
-        override val available: Boolean,
-        override val timestamp: Instant,
-        override val lastChange: Instant
-    ) : ConnectionCheckResult()
-
-    data class GIcsConnectionCheckResult(
-        override val available: Boolean,
-        override val timestamp: Instant,
-        override val lastChange: Instant
-    ) : ConnectionCheckResult()
 }
 
 class KafkaConnectionCheckService(
@@ -83,33 +62,25 @@ class KafkaConnectionCheckService(
     private val connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
 ) : OutputConnectionCheckService {
 
-    private var result = ConnectionCheckResult.KafkaConnectionCheckResult(false, Instant.now(), Instant.now())
+    private var connectionAvailable: Boolean = false
+
 
     @PostConstruct
     @Scheduled(cron = "0 * * * * *")
     fun check() {
-        result = try {
+        connectionAvailable = try {
-            val available = null != consumer.listTopics(5.seconds.toJavaDuration())
+            null != consumer.listTopics(5.seconds.toJavaDuration())
-            ConnectionCheckResult.KafkaConnectionCheckResult(
+        } catch (e: TimeoutException) {
-                available,
+            false
-                Instant.now(),
-                if (result.available == available) { result.lastChange } else { Instant.now() }
-            )
-        } catch (_: TimeoutException) {
-            ConnectionCheckResult.KafkaConnectionCheckResult(
-                false,
-                Instant.now(),
-                if (!result.available) { result.lastChange } else { Instant.now() }
-            )
         }
         connectionCheckUpdateProducer.emitNext(
-            result,
+            ConnectionCheckResult.KafkaConnectionCheckResult(connectionAvailable),
             Sinks.EmitFailureHandler.FAIL_FAST
         )
     }
 
-    override fun connectionAvailable(): ConnectionCheckResult.KafkaConnectionCheckResult {
+    override fun connectionAvailable(): Boolean {
-        return this.result
+        return this.connectionAvailable
     }
 
 }
@@ -121,41 +92,27 @@ class RestConnectionCheckService(
     private val connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
 ) : OutputConnectionCheckService {
 
-    private var result = ConnectionCheckResult.RestConnectionCheckResult(false, Instant.now(), Instant.now())
+    private var connectionAvailable: Boolean = false
 
     @PostConstruct
     @Scheduled(cron = "0 * * * * *")
     fun check() {
-        result = try {
+        connectionAvailable = try {
-            val available = restTemplate.getForEntity(
+            restTemplate.getForEntity(
-                UriComponentsBuilder.fromUriString(restTargetProperties.uri.toString())
+                restTargetProperties.uri?.replace("/etl/api", "").toString(),
-                    .pathSegment("mtb")
-                    .pathSegment("kaplan-meier")
-                    .pathSegment("config")
-                    .toUriString(),
                 String::class.java
             ).statusCode == HttpStatus.OK
-
+        } catch (e: Exception) {
-            ConnectionCheckResult.RestConnectionCheckResult(
+            false
-                available,
-                Instant.now(),
-                if (result.available == available) { result.lastChange } else { Instant.now() }
-            )
-        } catch (_: Exception) {
-            ConnectionCheckResult.RestConnectionCheckResult(
-                false,
-                Instant.now(),
-                if (!result.available) { result.lastChange } else { Instant.now() }
-            )
         }
         connectionCheckUpdateProducer.emitNext(
-            result,
+            ConnectionCheckResult.RestConnectionCheckResult(connectionAvailable),
             Sinks.EmitFailureHandler.FAIL_FAST
         )
     }
 
-    override fun connectionAvailable(): ConnectionCheckResult.RestConnectionCheckResult {
+    override fun connectionAvailable(): Boolean {
-        return this.result
+        return this.connectionAvailable
     }
 }
 
@@ -166,101 +123,40 @@ class GPasConnectionCheckService(
     private val connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
 ) : ConnectionCheckService {
 
-    private var result = ConnectionCheckResult.GPasConnectionCheckResult(false, Instant.now(), Instant.now())
+    private var connectionAvailable: Boolean = false
 
     @PostConstruct
     @Scheduled(cron = "0 * * * * *")
     fun check() {
-        result = try {
+        connectionAvailable = try {
             val uri = UriComponentsBuilder.fromUriString(
-                gPasConfigProperties.uri?.replace("/\$pseudonymizeAllowCreate", "/metadata").toString()
+                gPasConfigProperties.uri?.replace("/\$pseudonymizeAllowCreate", "/\$pseudonymize").toString()
-            ).build().toUri()
+            )
+                .queryParam("target", gPasConfigProperties.target)
+                .queryParam("original", "???")
+                .build().toUri()
 
             val headers = HttpHeaders()
             headers.contentType = MediaType.APPLICATION_JSON
             if (!gPasConfigProperties.username.isNullOrBlank() && !gPasConfigProperties.password.isNullOrBlank()) {
                 headers.setBasicAuth(gPasConfigProperties.username, gPasConfigProperties.password)
             }
-
+            restTemplate.exchange(
-            val available = restTemplate.exchange(
                 uri,
                 HttpMethod.GET,
                 HttpEntity<Void>(headers),
                 Void::class.java
             ).statusCode == HttpStatus.OK
-
+        } catch (e: Exception) {
-            ConnectionCheckResult.GPasConnectionCheckResult(
+            false
-                available,
-                Instant.now(),
-                if (result.available == available) { result.lastChange } else { Instant.now() }
-            )
-        } catch (_: Exception) {
-            ConnectionCheckResult.GPasConnectionCheckResult(
-                false,
-                Instant.now(),
-                if (!result.available) { result.lastChange } else { Instant.now() }
-            )
         }
         connectionCheckUpdateProducer.emitNext(
-            result,
+            ConnectionCheckResult.GPasConnectionCheckResult(connectionAvailable),
             Sinks.EmitFailureHandler.FAIL_FAST
         )
     }
 
-    override fun connectionAvailable(): ConnectionCheckResult.GPasConnectionCheckResult {
+    override fun connectionAvailable(): Boolean {
-        return this.result
+        return this.connectionAvailable
-    }
-}
-
-class GIcsConnectionCheckService(
-    private val restTemplate: RestTemplate,
-    private val gIcsConfigProperties: GIcsConfigProperties,
-    @Qualifier("connectionCheckUpdateProducer")
-    private val connectionCheckUpdateProducer: Sinks.Many<ConnectionCheckResult>
-) : ConnectionCheckService {
-
-    private var result = ConnectionCheckResult.GIcsConnectionCheckResult(false, Instant.now(), Instant.now())
-
-    @PostConstruct
-    @Scheduled(cron = "0 * * * * *")
-    fun check() {
-        result = try {
-
-            val uri = UriComponentsBuilder.fromUriString(
-                gIcsConfigProperties.uri.toString()).path("/metadata").build().toUri()
-
-            val headers = HttpHeaders()
-            headers.contentType = MediaType.APPLICATION_JSON
-            if (!gIcsConfigProperties.username.isNullOrBlank() && !gIcsConfigProperties.password.isNullOrBlank()) {
-                headers.setBasicAuth(gIcsConfigProperties.username, gIcsConfigProperties.password)
-            }
-
-            val available = restTemplate.exchange(
-                uri,
-                HttpMethod.GET,
-                HttpEntity<Void>(headers),
-                Void::class.java
-            ).statusCode == HttpStatus.OK
-
-            ConnectionCheckResult.GIcsConnectionCheckResult(
-                available,
-                Instant.now(),
-                if (result.available == available) { result.lastChange } else { Instant.now() }
-            )
-        } catch (_: Exception) {
-            ConnectionCheckResult.GIcsConnectionCheckResult(
-                false,
-                Instant.now(),
-                if (!result.available) { result.lastChange } else { Instant.now() }
-            )
-        }
-        connectionCheckUpdateProducer.emitNext(
-            result,
-            Sinks.EmitFailureHandler.FAIL_FAST
-        )
-    }
-
-    override fun connectionAvailable(): ConnectionCheckResult.GIcsConnectionCheckResult {
-        return this.result
     }
 }

src/main/kotlin/dev/dnpm/etl/processor/monitoring/ReportService.kt

@@ -19,15 +19,11 @@
 
 package dev.dnpm.etl.processor.monitoring
 
-import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.databind.JsonMappingException
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.monitoring.ReportService.Issue
-import dev.dnpm.etl.processor.monitoring.ReportService.Severity
-import java.util.Optional
 
 class ReportService(
     private val objectMapper: ObjectMapper
@@ -58,11 +54,7 @@ class ReportService(
     private data class DataQualityReport(val issues: List<Issue>)
 
     @JsonIgnoreProperties(ignoreUnknown = true)
-    data class Issue(
+    data class Issue(val severity: Severity, val message: String)
-        val severity: Severity,
-        @JsonAlias("details") val message: String,
-        val path: Optional<String> = Optional.empty()
-    )
 
     enum class Severity(@JsonValue val value: String) {
         FATAL("fatal"),
@@ -71,12 +63,3 @@ class ReportService(
         INFO("info")
     }
 }
-
-fun List<Issue>.asRequestStatus(): RequestStatus {
-    val severity = this.minOfOrNull { it.severity }
-    return when (severity) {
-        Severity.FATAL, Severity.ERROR -> RequestStatus.ERROR
-        Severity.WARNING -> RequestStatus.WARNING
-        else -> RequestStatus.SUCCESS
-    }
-}

src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt

@@ -19,12 +19,10 @@
 
 package dev.dnpm.etl.processor.monitoring
 
-import dev.dnpm.etl.processor.*
 import org.springframework.data.annotation.Id
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jdbc.repository.query.Query
-import org.springframework.data.relational.core.mapping.Column
 import org.springframework.data.relational.core.mapping.Embedded
 import org.springframework.data.relational.core.mapping.Table
 import org.springframework.data.repository.CrudRepository
@@ -32,48 +30,26 @@ import org.springframework.data.repository.PagingAndSortingRepository
 import java.time.Instant
 import java.util.*
 
+typealias RequestId = UUID
+
 @Table("request")
 data class Request(
     @Id val id: Long? = null,
-    val uuid: RequestId = randomRequestId(),
+    val uuid: String = RequestId.randomUUID().toString(),
-    val patientPseudonym: PatientPseudonym,
+    val patientId: String,
-    val pid: PatientId,
+    val pid: String,
-    @Column("fingerprint")
+    val fingerprint: String,
-    val fingerprint: Fingerprint,
     val type: RequestType,
     var status: RequestStatus,
     var processedAt: Instant = Instant.now(),
     @Embedded.Nullable var report: Report? = null
-) {
+)
-    constructor(
-        uuid: RequestId,
-        patientPseudonym: PatientPseudonym,
-        pid: PatientId,
-        fingerprint: Fingerprint,
-        type: RequestType,
-        status: RequestStatus
-    ) :
-            this(null, uuid, patientPseudonym, pid, fingerprint, type, status, Instant.now())
 
-    constructor(
-        uuid: RequestId,
-        patientPseudonym: PatientPseudonym,
-        pid: PatientId,
-        fingerprint: Fingerprint,
-        type: RequestType,
-        status: RequestStatus,
-        processedAt: Instant
-    ) :
-            this(null, uuid, patientPseudonym, pid, fingerprint, type, status, processedAt)
-}
-
-@JvmRecord
 data class Report(
     val description: String,
     val dataQualityReport: String = ""
 )
 
-@JvmRecord
 data class CountedState(
     val count: Int,
     val status: RequestStatus,
@@ -81,17 +57,17 @@ data class CountedState(
 
 interface RequestRepository : CrudRepository<Request, Long>, PagingAndSortingRepository<Request, Long> {
 
-    fun findAllByPatientPseudonymOrderByProcessedAtDesc(patientId: PatientPseudonym): List<Request>
+    fun findAllByPatientIdOrderByProcessedAtDesc(patientId: String): List<Request>
 
-    fun findByUuidEquals(uuid: RequestId): Optional<Request>
+    fun findByUuidEquals(uuid: String): Optional<Request>
 
-    fun findRequestByPatientPseudonym(patientPseudonym: PatientPseudonym, pageable: Pageable): Page<Request>
+    fun findRequestByPatientId(patientId: String, pageable: Pageable): Page<Request>
 
     @Query("SELECT count(*) AS count, status FROM request WHERE type = 'MTB_FILE' GROUP BY status ORDER BY status, count DESC;")
     fun countStates(): List<CountedState>
 
     @Query("SELECT count(*) AS count, status FROM (" +
-            "SELECT status, rank() OVER (PARTITION BY patient_pseudonym ORDER BY processed_at DESC) AS rank FROM request " +
+            "SELECT status, rank() OVER (PARTITION BY patient_id ORDER BY processed_at DESC) AS rank FROM request " +
             "WHERE type = 'MTB_FILE' AND status NOT IN ('DUPLICATION') " +
             ") rank WHERE rank = 1 GROUP BY status ORDER BY status, count DESC;")
     fun findPatientUniqueStates(): List<CountedState>
@@ -100,7 +76,7 @@ interface RequestRepository : CrudRepository<Request, Long>, PagingAndSortingRep
     fun countDeleteStates(): List<CountedState>
 
     @Query("SELECT count(*) AS count, status FROM (" +
-            "SELECT status, rank() OVER (PARTITION BY patient_pseudonym ORDER BY processed_at DESC) AS rank FROM request " +
+            "SELECT status, rank() OVER (PARTITION BY patient_id ORDER BY processed_at DESC) AS rank FROM request " +
             "WHERE type = 'DELETE'" +
             ") rank WHERE rank = 1 GROUP BY status ORDER BY status, count DESC;")
     fun findPatientUniqueDeleteStates(): List<CountedState>

src/main/kotlin/dev/dnpm/etl/processor/monitoring/RequestStatus.kt

@@ -24,6 +24,5 @@ enum class RequestStatus(val value: String) {
     WARNING("warning"),
     ERROR("error"),
     UNKNOWN("unknown"),
-    DUPLICATION("duplication"),
+    DUPLICATION("duplication")
-    NO_CONSENT("no-consent")
 }

src/main/kotlin/dev/dnpm/etl/processor/output/KafkaMtbFileSender.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,12 +20,10 @@
 package dev.dnpm.etl.processor.output
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.CustomMediaType
+import de.ukw.ccc.bwhc.dto.Consent
+import de.ukw.ccc.bwhc.dto.MtbFile
 import dev.dnpm.etl.processor.config.KafkaProperties
 import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.pcvolkmer.mv64e.mtb.Mtb
-import dev.pcvolkmer.mv64e.mtb.MvhMetadata
-import org.apache.kafka.clients.producer.ProducerRecord
 import org.slf4j.LoggerFactory
 import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.retry.support.RetryTemplate
@@ -39,25 +37,14 @@ class KafkaMtbFileSender(
 
     private val logger = LoggerFactory.getLogger(KafkaMtbFileSender::class.java)
 
-    override fun <T> send(request: MtbFileRequest<T>): MtbFileSender.Response {
+    override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
         return try {
             return retryTemplate.execute<MtbFileSender.Response, Exception> {
-                val record =
+                val result = kafkaTemplate.send(
-                    ProducerRecord(
+                    kafkaProperties.topic,
-                        kafkaProperties.outputTopic,
+                    key(request),
-                        key(request),
+                    objectMapper.writeValueAsString(Data(request.requestId, request.mtbFile))
-                        objectMapper.writeValueAsString(request),
+                )
-                    )
-                record.headers().add("requestId", request.requestId.value.toByteArray())
-                when (request) {
-                    is DnpmV2MtbFileRequest -> record.headers()
-                        .add(
-                            "contentType",
-                            CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE.toByteArray()
-                        )
-                }
-
-                val result = kafkaTemplate.send(record)
                 if (result.get() != null) {
                     logger.debug("Sent file via KafkaMtbFileSender")
                     MtbFileSender.Response(RequestStatus.UNKNOWN)
@@ -71,26 +58,24 @@ class KafkaMtbFileSender(
         }
     }
 
-    override fun send(request: DeleteRequest): MtbFileSender.Response {
+    override fun send(request: MtbFileSender.DeleteRequest): MtbFileSender.Response {
-        val dummyMtbFile = Mtb.builder()
+        val dummyMtbFile = MtbFile.builder()
-            .metadata(MvhMetadata())
+            .withConsent(
+                Consent.builder()
+                    .withPatient(request.patientId)
+                    .withStatus(Consent.Status.REJECTED)
+                    .build()
+            )
             .build()
 
         return try {
             return retryTemplate.execute<MtbFileSender.Response, Exception> {
-                val record =
+                val result = kafkaTemplate.send(
-                    ProducerRecord(
+                    kafkaProperties.topic,
-                        kafkaProperties.outputTopic,
+                    key(request),
-                        key(request),
+                    objectMapper.writeValueAsString(Data(request.requestId, dummyMtbFile))
-                        objectMapper.writeValueAsString(
+                )
-                            DnpmV2MtbFileRequest(
+
-                                request.requestId,
-                                dummyMtbFile
-                            )
-                        )
-                    )
-                record.headers().add("requestId", request.requestId.value.toByteArray())
-                val result = kafkaTemplate.send(record)
                 if (result.get() != null) {
                     logger.debug("Sent deletion request via KafkaMtbFileSender")
                     MtbFileSender.Response(RequestStatus.UNKNOWN)
@@ -105,14 +90,16 @@ class KafkaMtbFileSender(
     }
 
     override fun endpoint(): String {
-        return "${this.kafkaProperties.servers} (${this.kafkaProperties.outputTopic}/${this.kafkaProperties.outputResponseTopic})"
+        return "${this.kafkaProperties.servers} (${this.kafkaProperties.topic}/${this.kafkaProperties.responseTopic})"
     }
 
-    private fun key(request: MtbRequest): String {
+    private fun key(request: MtbFileSender.MtbFileRequest): String {
-        return when (request) {
+        return "{\"pid\": \"${request.mtbFile.patient.id}\"}"
-            is DnpmV2MtbFileRequest -> "{\"pid\": \"${request.content.patient.id}\"}"
-            is DeleteRequest -> "{\"pid\": \"${request.patientId.value}\"}"
-            else -> throw IllegalArgumentException("Unsupported request type: ${request::class.simpleName}")
-        }
     }
+
+    private fun key(request: MtbFileSender.DeleteRequest): String {
+        return "{\"pid\": \"${request.patientId}\"}"
+    }
+
+    data class Data(val requestId: String, val content: MtbFile)
 }

src/main/kotlin/dev/dnpm/etl/processor/output/MtbFileSender.kt

@@ -19,17 +19,23 @@
 
 package dev.dnpm.etl.processor.output
 
+import de.ukw.ccc.bwhc.dto.MtbFile
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import org.springframework.http.HttpStatusCode
 
 interface MtbFileSender {
-    fun <T> send(request: MtbFileRequest<T>): Response
+    fun send(request: MtbFileRequest): Response
 
     fun send(request: DeleteRequest): Response
 
     fun endpoint(): String
 
     data class Response(val status: RequestStatus, val body: String = "")
+
+    data class MtbFileRequest(val requestId: String, val mtbFile: MtbFile)
+
+    data class DeleteRequest(val requestId: String, val patientId: String)
+
 }
 
 fun Int.asRequestStatus(): RequestStatus {

src/main/kotlin/dev/dnpm/etl/processor/output/MtbRequest.kt

@@ -1,49 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.output
-
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.RequestId
-import dev.pcvolkmer.mv64e.mtb.Mtb
-
-interface MtbRequest {
-    val requestId: RequestId
-}
-
-sealed interface MtbFileRequest<out T> : MtbRequest {
-    override val requestId: RequestId
-    val content: T
-
-    fun patientPseudonym(): PatientPseudonym
-}
-
-data class DnpmV2MtbFileRequest(
-    override val requestId: RequestId,
-    override val content: Mtb
-) : MtbFileRequest<Mtb> {
-    override fun patientPseudonym(): PatientPseudonym {
-        return PatientPseudonym(content.patient.id)
-    }
-}
-
-data class DeleteRequest(
-    override val requestId: RequestId,
-    val patientId: PatientPseudonym
-) : MtbRequest

src/main/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSender.kt

@@ -1,55 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.output
-
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.config.RestTargetProperties
-import dev.dnpm.etl.processor.monitoring.ReportService
-import org.springframework.retry.support.RetryTemplate
-import org.springframework.web.client.RestTemplate
-import org.springframework.web.util.UriComponentsBuilder
-
-class RestDipMtbFileSender(
-    restTemplate: RestTemplate,
-    private val restTargetProperties: RestTargetProperties,
-    retryTemplate: RetryTemplate,
-    reportService: ReportService
-) : RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate, reportService) {
-
-    override fun sendUrl(): String {
-        return UriComponentsBuilder
-            .fromUriString(restTargetProperties.uri.toString())
-            .pathSegment("mtb")
-            .pathSegment("etl")
-            .pathSegment("patient-record")
-            .toUriString()
-    }
-
-    override fun deleteUrl(patientId: PatientPseudonym): String {
-        return UriComponentsBuilder
-            .fromUriString(restTargetProperties.uri.toString())
-            .pathSegment("mtb")
-            .pathSegment("etl")
-            .pathSegment("patient")
-            .pathSegment(patientId.value)
-            .toUriString()
-    }
-
-}

src/main/kotlin/dev/dnpm/etl/processor/output/RestMtbFileSender.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -19,71 +19,62 @@
 
 package dev.dnpm.etl.processor.output
 
-import dev.dnpm.etl.processor.CustomMediaType
-import dev.dnpm.etl.processor.PatientPseudonym
 import dev.dnpm.etl.processor.config.RestTargetProperties
-import dev.dnpm.etl.processor.monitoring.ReportService
 import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.monitoring.asRequestStatus
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpEntity
 import org.springframework.http.HttpHeaders
 import org.springframework.http.MediaType
 import org.springframework.retry.support.RetryTemplate
 import org.springframework.web.client.RestClientException
-import org.springframework.web.client.RestClientResponseException
 import org.springframework.web.client.RestTemplate
 
-abstract class RestMtbFileSender(
+class RestMtbFileSender(
     private val restTemplate: RestTemplate,
     private val restTargetProperties: RestTargetProperties,
-    private val retryTemplate: RetryTemplate,
+    private val retryTemplate: RetryTemplate
-    private val reportService: ReportService
 ) : MtbFileSender {
 
     private val logger = LoggerFactory.getLogger(RestMtbFileSender::class.java)
 
-    abstract fun sendUrl(): String
+    override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
-
-    abstract fun deleteUrl(patientId: PatientPseudonym): String
-
-    override fun <T> send(request: MtbFileRequest<T>): MtbFileSender.Response {
         try {
             return retryTemplate.execute<MtbFileSender.Response, Exception> {
-                val headers = getHttpHeaders(request)
+                val headers = HttpHeaders()
-                val entityReq = HttpEntity(request.content, headers)
+                headers.contentType = MediaType.APPLICATION_JSON
+                val entityReq = HttpEntity(request.mtbFile, headers)
                 val response = restTemplate.postForEntity(
-                    sendUrl(),
+                    "${restTargetProperties.uri}/MTBFile",
                     entityReq,
                     String::class.java
                 )
                 if (!response.statusCode.is2xxSuccessful) {
                     logger.warn("Error sending to remote system: {}", response.body)
                     return@execute MtbFileSender.Response(
-                        reportService.deserialize(response.body).asRequestStatus(),
+                        response.statusCode.asRequestStatus(),
                         "Status-Code: ${response.statusCode.value()}"
                     )
                 }
                 logger.debug("Sent file via RestMtbFileSender")
-                return@execute MtbFileSender.Response(reportService.deserialize(response.body).asRequestStatus(), response.body.orEmpty())
+                return@execute MtbFileSender.Response(response.statusCode.asRequestStatus(), response.body.orEmpty())
             }
         } catch (e: IllegalArgumentException) {
             logger.error("Not a valid URI to export to: '{}'", restTargetProperties.uri!!)
-        } catch (e: RestClientResponseException) {
+        } catch (e: RestClientException) {
             logger.info(restTargetProperties.uri!!.toString())
-            logger.error("Request data not accepted by remote system", e)
+            logger.error("Cannot send data to remote system", e)
-            return MtbFileSender.Response(reportService.deserialize(e.responseBodyAsString).asRequestStatus(), e.responseBodyAsString)
         }
         return MtbFileSender.Response(RequestStatus.ERROR, "Sonstiger Fehler bei der Übertragung")
     }
 
-    override fun send(request: DeleteRequest): MtbFileSender.Response {
+    override fun send(request: MtbFileSender.DeleteRequest): MtbFileSender.Response {
         try {
             return retryTemplate.execute<MtbFileSender.Response, Exception> {
-                val headers = getHttpHeaders(request)
+                val headers = HttpHeaders()
+                headers.contentType = MediaType.APPLICATION_JSON
                 val entityReq = HttpEntity(null, headers)
                 restTemplate.delete(
-                    deleteUrl(request.patientId),
+                    "${restTargetProperties.uri}/Patient/${request.patientId}",
                     entityReq,
                     String::class.java
                 )
@@ -103,21 +94,4 @@ abstract class RestMtbFileSender(
         return this.restTargetProperties.uri.orEmpty()
     }
 
-    private fun getHttpHeaders(request: MtbRequest): HttpHeaders {
-        val username = restTargetProperties.username
-        val password = restTargetProperties.password
-        val headers = HttpHeaders()
-        headers.contentType = when (request) {
-            is DnpmV2MtbFileRequest -> CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON
-            else -> MediaType.APPLICATION_JSON
-        }
-
-        if (username.isNullOrBlank() || password.isNullOrBlank()) {
-            return headers
-        }
-
-        headers.setBasicAuth(username, password)
-        return headers
-    }
-
 }

src/main/kotlin/dev/dnpm/etl/processor/pseudonym/AnonymizingGenerator.kt

@@ -21,12 +21,9 @@ package dev.dnpm.etl.processor.pseudonym
 
 import org.apache.commons.codec.binary.Base32
 import org.apache.commons.codec.digest.DigestUtils
-import java.security.SecureRandom
+
 
 class AnonymizingGenerator : Generator {
-    companion object fun getSecureRandom() : SecureRandom {
-        return  SecureRandom()
-    }
 
     override fun generate(id: String): String {
         return Base32().encodeAsString(DigestUtils.sha256(id))
@@ -34,14 +31,4 @@ class AnonymizingGenerator : Generator {
             .lowercase()
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
-    override fun generateGenomDeTan(id: String?): String {
-
-        val bytes = ByteArray(64 / 2)
-        getSecureRandom().nextBytes(bytes)
-
-        return bytes.joinToString("") { "%02x".format(it) }
-
-    }
-
 }

src/main/kotlin/dev/dnpm/etl/processor/pseudonym/PseudonymizeService.kt

@@ -19,8 +19,6 @@
 
 package dev.dnpm.etl.processor.pseudonym
 
-import dev.dnpm.etl.processor.PatientId
-import dev.dnpm.etl.processor.PatientPseudonym
 import dev.dnpm.etl.processor.config.PseudonymizeConfigProperties
 
 class PseudonymizeService(
@@ -28,17 +26,13 @@ class PseudonymizeService(
     private val configProperties: PseudonymizeConfigProperties
 ) {
 
-    fun patientPseudonym(patientId: PatientId): PatientPseudonym {
+    fun patientPseudonym(patientId: String): String {
         return when (generator) {
-            is GpasPseudonymGenerator -> PatientPseudonym(generator.generate(patientId.value))
+            is GpasPseudonymGenerator -> generator.generate(patientId)
-            else -> PatientPseudonym("${configProperties.prefix}_${generator.generate(patientId.value)}")
+            else -> "${configProperties.prefix}_${generator.generate(patientId)}"
         }
     }
 
-    fun genomDeTan(patientId: PatientId): String {
-        return generator.generateGenomDeTan(patientId.value)
-    }
-
     fun prefix(): String {
         return configProperties.prefix
     }

src/main/kotlin/dev/dnpm/etl/processor/pseudonym/extensions.kt

@@ -19,96 +19,53 @@
 
 package dev.dnpm.etl.processor.pseudonym
 
-import dev.dnpm.etl.processor.PatientId
+import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.pcvolkmer.mv64e.mtb.ModelProjectConsent
-import dev.pcvolkmer.mv64e.mtb.Mtb
-import dev.pcvolkmer.mv64e.mtb.MvhMetadata
 import org.apache.commons.codec.digest.DigestUtils
 
 /** Replaces patient ID with generated patient pseudonym
- *
- * @since 0.11.0
  *
  * @param pseudonymizeService The pseudonymizeService to be used
+ *
  * @return The MTB file containing patient pseudonymes
  */
-infix fun Mtb.pseudonymizeWith(pseudonymizeService: PseudonymizeService) {
+infix fun MtbFile.pseudonymizeWith(pseudonymizeService: PseudonymizeService) {
-    val patientPseudonym = pseudonymizeService.patientPseudonym(PatientId(this.patient.id)).value
+    val patientPseudonym = pseudonymizeService.patientPseudonym(this.patient.id)
 
-    this.episodesOfCare?.forEach { it.patient.id = patientPseudonym }
+    this.episode?.patient = patientPseudonym
-    this.carePlans?.forEach {
+    this.carePlans?.forEach { it.patient = patientPseudonym }
-        it.patient.id = patientPseudonym
-        it.rebiopsyRequests?.forEach { it.patient.id = patientPseudonym }
-        it.histologyReevaluationRequests?.forEach { it.patient.id = patientPseudonym }
-        it.medicationRecommendations.forEach { it.patient.id = patientPseudonym }
-        it.studyEnrollmentRecommendations?.forEach { it.patient.id = patientPseudonym }
-        it.procedureRecommendations?.forEach { it.patient.id = patientPseudonym }
-        it.geneticCounselingRecommendation.patient.id = patientPseudonym
-    }
-    this.diagnoses?.forEach { it.patient.id = patientPseudonym }
-    this.guidelineTherapies?.forEach { it.patient.id = patientPseudonym }
-    this.guidelineProcedures?.forEach { it.patient.id = patientPseudonym }
     this.patient.id = patientPseudonym
-    this.claims?.forEach { it.patient.id = patientPseudonym }
+    this.claims?.forEach { it.patient = patientPseudonym }
-    this.claimResponses?.forEach { it.patient.id = patientPseudonym }
+    this.consent?.patient = patientPseudonym
-    this.diagnoses?.forEach { it.patient.id = patientPseudonym }
+    this.claimResponses?.forEach { it.patient = patientPseudonym }
-    this.familyMemberHistories?.forEach { it.patient.id = patientPseudonym }
+    this.diagnoses?.forEach { it.patient = patientPseudonym }
+    this.ecogStatus?.forEach { it.patient = patientPseudonym }
+    this.familyMemberDiagnoses?.forEach { it.patient = patientPseudonym }
+    this.geneticCounsellingRequests?.forEach { it.patient = patientPseudonym }
+    this.histologyReevaluationRequests?.forEach { it.patient = patientPseudonym }
     this.histologyReports?.forEach {
-        it.patient.id = patientPseudonym
+        it.patient = patientPseudonym
-        it.results.tumorMorphology?.patient?.id = patientPseudonym
+        it.tumorMorphology?.patient = patientPseudonym
-        it.results.tumorCellContent?.patient?.id = patientPseudonym
-    }
-    this.ngsReports?.forEach {
-        it.patient.id = patientPseudonym
-        it.results.simpleVariants?.forEach { it.patient.id = patientPseudonym }
-        it.results.copyNumberVariants?.forEach { it.patient.id = patientPseudonym }
-        it.results.dnaFusions?.forEach { it.patient.id = patientPseudonym }
-        it.results.rnaFusions?.forEach { it.patient.id = patientPseudonym }
-        it.results.tumorCellContent?.patient?.id = patientPseudonym
-        it.results.brcaness?.patient?.id = patientPseudonym
-        it.results.tmb?.patient?.id = patientPseudonym
-        it.results.hrdScore?.patient?.id = patientPseudonym
-    }
-    this.ihcReports?.forEach {
-        it.patient.id = patientPseudonym
-        it.results.msiMmr?.forEach { it.patient.id = patientPseudonym }
-        it.results.proteinExpression?.forEach { it.patient.id = patientPseudonym }
-    }
-    this.responses?.forEach { it.patient.id = patientPseudonym }
-    this.specimens?.forEach { it.patient.id = patientPseudonym }
-    this.priorDiagnosticReports?.forEach { it.patient.id = patientPseudonym }
-    this.performanceStatus?.forEach { it.patient.id = patientPseudonym }
-    this.systemicTherapies?.forEach {
-        it.history?.forEach {
-            it.patient.id = patientPseudonym
-        }
-    }
-    this.followUps?.forEach {
-        it.patient.id = patientPseudonym
-    }
-
-    this.msiFindings?.forEach { it -> it.patient.id = patientPseudonym }
-
-    this.metadata?.researchConsents?.forEach { it ->
-        val entry = it ?: return@forEach
-        if (entry.contains("patient")) {
-            // here we expect only a patient reference any other data like display
-            // need to be removed, since may contain unsecure data
-            entry.remove("patient")
-            entry["patient"] = mapOf("reference" to "Patient/$patientPseudonym")
-        }
     }
+    this.lastGuidelineTherapies?.forEach { it.patient = patientPseudonym }
+    this.molecularPathologyFindings?.forEach { it.patient = patientPseudonym }
+    this.molecularTherapies?.forEach { molecularTherapy -> molecularTherapy.history.forEach { it.patient = patientPseudonym } }
+    this.ngsReports?.forEach { it.patient = patientPseudonym }
+    this.previousGuidelineTherapies?.forEach { it.patient = patientPseudonym }
+    this.rebiopsyRequests?.forEach { it.patient = patientPseudonym }
+    this.recommendations?.forEach { it.patient = patientPseudonym }
+    this.responses?.forEach { it.patient = patientPseudonym }
+    this.studyInclusionRequests?.forEach { it.patient = patientPseudonym }
+    this.specimens?.forEach { it.patient = patientPseudonym }
 }
 
 /**
  * Creates new hash of content IDs with given prefix except for patient IDs
  *
- * @since 0.11.0
- *
  * @param pseudonymizeService The pseudonymizeService to be used
+ *
  * @return The MTB file containing rehashed content IDs
  */
-infix fun Mtb.anonymizeContentWith(pseudonymizeService: PseudonymizeService) {
+infix fun MtbFile.anonymizeContentWith(pseudonymizeService: PseudonymizeService) {
     val prefix = pseudonymizeService.prefix()
 
     fun anonymize(id: String): String {
@@ -116,199 +73,153 @@ infix fun Mtb.anonymizeContentWith(pseudonymizeService: PseudonymizeService) {
         return "$prefix$hash"
     }
 
-    this.episodesOfCare?.forEach {
+    this.episode?.apply {
-        it?.apply { id = id?.let(::anonymize) }
+        id = id?.let {
-        it.diagnoses?.forEach { it ->
+            anonymize(it)
-            it?.id = it.id?.let(::anonymize)
         }
     }
-
     this.carePlans?.onEach { carePlan ->
         carePlan?.apply {
             id = id?.let { anonymize(it) }
-
+            diagnosis = diagnosis?.let { anonymize(it) }
-            diagnoses?.forEach { it -> it?.id = it.id?.let(::anonymize) }
+            geneticCounsellingRequest = geneticCounsellingRequest?.let { anonymize(it) }
-            geneticCounselingRecommendation?.apply {
+            rebiopsyRequests = rebiopsyRequests.map { it?.let { anonymize(it) } }
-                id = geneticCounselingRecommendation.id?.let(::anonymize)
+            recommendations = recommendations.map { it?.let { anonymize(it) } }
+            studyInclusionRequests = studyInclusionRequests.map { it?.let { anonymize(it) } }
+        }
+    }
+    this.claims?.onEach { claim ->
+        claim?.apply {
+            id = id?.let { anonymize(it) }
+            therapy = therapy?.let { anonymize(it) }
+        }
+    }
+    this.claimResponses?.onEach { claimResponse ->
+        claimResponse?.apply {
+            id = id?.let { anonymize(it) }
+            claim = claim?.let { anonymize(it) }
+        }
+    }
+    this.consent?.apply {
+        id = id?.let { anonymize(it) }
+    }
+    this.diagnoses?.onEach { diagnosis ->
+        diagnosis?.apply {
+            id = id?.let { anonymize(it) }
+            histologyResults = histologyResults?.map { it?.let { anonymize(it) } }
+        }
+    }
+    this.ecogStatus?.onEach { ecogStatus ->
+        ecogStatus?.apply {
+            id = id?.let { anonymize(it) }
+        }
+    }
+    this.familyMemberDiagnoses?.onEach { familyMemberDiagnosis ->
+        familyMemberDiagnosis?.apply {
+            id = id?.let { anonymize(it) }
+        }
+    }
+    this.geneticCounsellingRequests?.onEach { geneticCounsellingRequest -> 
+        geneticCounsellingRequest?.apply { 
+            id = id?.let { anonymize(it) }
+        }
+    }
+    this.histologyReevaluationRequests?.onEach { histologyReevaluationRequest ->
+        histologyReevaluationRequest?.apply {
+            id = id?.let { anonymize(it) }
+            specimen = specimen?.let { anonymize(it) }
+        }
+    }
+    this.histologyReports?.onEach { histologyReport ->
+        histologyReport?.apply {
+            id = id?.let { anonymize(it) }
+            specimen = specimen?.let { anonymize(it) }
+            tumorMorphology?.apply {
+                id = id?.let { anonymize(it) }
+                specimen = specimen?.let { anonymize(it) }
             }
-            rebiopsyRequests?.forEach { it ->
+            tumorCellContent?.apply {
-                it.id = it.id?.let(::anonymize)
+                id = id?.let { anonymize(it) }
-                it.tumorEntity?.id = it.tumorEntity?.id?.let(::anonymize)
+                specimen = specimen?.let { anonymize(it) }
             }
-            histologyReevaluationRequests?.forEach { it ->
+        }
-                it.id = it?.id?.let(::anonymize)
+    }
-                it.specimen?.id = it.specimen?.id?.let(::anonymize)
+    this.lastGuidelineTherapies?.onEach { lastGuidelineTherapy ->
-            }
+        lastGuidelineTherapy?.apply {
-
+            id = id?.let { anonymize(it) }
-            medicationRecommendations?.forEach { it ->
+            diagnosis = diagnosis?.let { anonymize(it) }
-                it.id = it?.id?.let(::anonymize)
+        }
-                it.supportingVariants?.forEach { it ->
+    }
-                    it.variant?.id = it.variant?.id?.let(::anonymize)
+    this.molecularPathologyFindings?.onEach { molecularPathologyFinding ->
-                }
+        molecularPathologyFinding?.apply {
-                it.reason?.id = it.reason?.id?.let(::anonymize)
+            id = id?.let { anonymize(it) }
-            }
+            specimen = specimen?.let { anonymize(it) }
-            reason?.id = reason?.id?.let(::anonymize)
+        }
-            studyEnrollmentRecommendations?.forEach { it ->
+    }
-                it?.reason?.id = it.reason?.id?.let(::anonymize)
+    this.molecularTherapies?.onEach { molecularTherapy ->
-            }
+        molecularTherapy?.apply {
-
+            history?.onEach { history ->
-            procedureRecommendations?.forEach { it ->
+                history?.apply {
-
+                    id = id?.let { anonymize(it) }
-                it.id = it?.id?.let(::anonymize)
+                    basedOn = basedOn?.let { anonymize(it) }
-                it.supportingVariants?.forEach { it ->
-                    it.variant?.id = it.variant?.id?.let(::anonymize)
-                }
-
-                it.reason?.id = it.reason?.id?.let(::anonymize)
-
-                studyEnrollmentRecommendations?.forEach { it ->
-
-                    it.id = it?.id?.let(::anonymize)
-                    it.supportingVariants.forEach { it ->
-                        it.variant?.id = it?.variant?.id?.let(::anonymize)
-                    }
-                    responses?.forEach { it ->
-                        it.id = it?.id?.let(::anonymize)
-                        it.id = it?.id?.let(::anonymize)
-                    }
                 }
             }
         }
     }
-
+    this.ngsReports?.onEach { ngsReport ->
-
+        ngsReport?.apply {
-    this.responses?.forEach { it ->
+            id = id?.let { anonymize(it) }
-
+            specimen = specimen?.let { anonymize(it) }
-        it?.id = it.id?.let(::anonymize)
+            tumorCellContent?.apply {
-        it?.therapy?.id = it.therapy?.id?.let(::anonymize)
+                id = id?.let { anonymize(it) }
-
+                specimen = specimen?.let { anonymize(it) }
-    }
+            }
-
+            simpleVariants?.onEach { simpleVariant ->
-    this.diagnoses?.forEach { it ->
+                simpleVariant?.apply {
-
+                    id = id?.let { anonymize(it) }
-        it.id = it?.id?.let(::anonymize)
+                }
-        it.histology?.forEach { it -> it.id = it?.id?.let(::anonymize) }
+            }
-    }
-
-    this.ngsReports?.forEach { it ->
-        it.id = it?.id?.let(::anonymize)
-        it.results?.tumorCellContent?.id = it.results.tumorCellContent?.id?.let(::anonymize)
-        it.results?.tumorCellContent?.specimen?.id =
-            it.results?.tumorCellContent?.specimen?.id?.let(::anonymize)
-        it.results?.rnaFusions?.forEach { it ->
-            it?.id = it.id?.let(::anonymize)
         }
-        it.results?.simpleVariants?.forEach { it ->
+    }
-            it?.id = it.id?.let(::anonymize)
+    this.previousGuidelineTherapies?.onEach { previousGuidelineTherapy ->
-            it?.transcriptId?.value = it.transcriptId?.value?.let(::anonymize)
+        previousGuidelineTherapy?.apply {
+            id = id?.let { anonymize(it) }
+            diagnosis = diagnosis?.let { anonymize(it) }
+            medication.forEach { medication ->
+                medication?.apply {
+                    id = id?.let { anonymize(it) }
+                }
+            }
         }
-        it.results?.tmb?.id = it.results?.tmb?.id?.let(::anonymize)
-        it.results?.tmb?.specimen?.id = it.results?.tmb?.specimen?.id?.let(::anonymize)
-
-        it.results?.brcaness?.id = it.results?.brcaness?.id?.let(::anonymize)
-        it.results?.brcaness?.specimen?.id = it.results?.brcaness?.specimen?.id?.let(::anonymize)
-        it.results?.copyNumberVariants?.forEach { it -> it?.id = it.id?.let(::anonymize) }
-        it.results?.hrdScore?.id = it.results?.hrdScore?.id?.let(::anonymize)
-        it.results?.hrdScore?.specimen?.id = it.results?.hrdScore?.specimen?.id?.let(::anonymize)
-        it.results?.rnaSeqs?.forEach { it -> it?.id = it.id?.let(::anonymize) }
-        it.results?.dnaFusions?.forEach { it -> it?.id = it.id?.let(::anonymize) }
-        it.specimen?.id = it?.specimen?.id?.let(::anonymize)
-
     }
-
+    this.rebiopsyRequests?.onEach { rebiopsyRequest ->
-    this.histologyReports?.forEach { it ->
+        rebiopsyRequest?.apply {
-        it.id = it?.id?.let(::anonymize)
+            id = id?.let { anonymize(it) }
-        it.results?.tumorCellContent?.id = it.results?.tumorCellContent?.id?.let(::anonymize)
+            specimen = specimen?.let { anonymize(it) }
-        it.results?.tumorCellContent?.specimen?.id =
+        }
-            it.results?.tumorCellContent?.specimen?.id?.let(::anonymize)
+    }
-
+    this.recommendations?.onEach { recommendation ->
-        it.results?.tumorMorphology?.id = it.results?.tumorMorphology?.id?.let(::anonymize)
+        recommendation?.apply {
-        it.results?.tumorMorphology?.specimen?.id =
+            id = id?.let { anonymize(it) }
-            it.results?.tumorMorphology?.specimen?.id?.let(::anonymize)
+            diagnosis = diagnosis?.let { anonymize(it) }
-        it.specimen?.id = it.specimen?.id?.let(::anonymize)
+            ngsReport = ngsReport?.let { anonymize(it) }
-
+        }
-    }
+    }
-    this.claimResponses?.forEach { it ->
+    this.responses?.onEach { response ->
-        it.id = it?.id?.let(::anonymize)
+        response?.apply {
-        it.claim?.id = it.claim?.id?.let(::anonymize)
+            id = id?.let { anonymize(it) }
-    }
+            therapy = therapy?.let { anonymize(it) }
-    this.claims?.forEach { it ->
+        }
-
+    }
-        it.id = it?.id?.let(::anonymize)
+    this.studyInclusionRequests?.onEach { studyInclusionRequest ->
-        it.recommendation?.id = it.recommendation?.id?.let(::anonymize)
+        studyInclusionRequest?.apply {
-
+            id = id?.let { anonymize(it) }
-    }
+            reason = reason?.let { anonymize(it) }
-    this.familyMemberHistories?.forEach { it -> it.id = it?.id?.let(::anonymize) }
+        }
-    this.guidelineProcedures?.forEach { it ->
+    }
-        it.id = it?.id?.let(::anonymize)
+    this.specimens?.onEach { specimen ->
-        it.reason?.id = it.reason?.id?.let(::anonymize)
+        specimen?.apply {
-        it.basedOn?.id = it.basedOn?.id?.let(::anonymize)
+            id = id?.let { anonymize(it) }
-
-    }
-
-    this.guidelineTherapies?.forEach { it ->
-        it.id = it?.id?.let(::anonymize)
-        it.reason?.id = it.reason?.id?.let(::anonymize)
-        it.basedOn?.id = it.basedOn?.id?.let(::anonymize)
-    }
-    this.ihcReports?.forEach { it ->
-        it.id = it?.id?.let(::anonymize)
-        it.specimen?.id = it.specimen?.id?.let(::anonymize)
-        it.results.proteinExpression.forEach { it -> it?.id = it.id.let(::anonymize) }
-    }
-
-    this.msiFindings?.forEach { it ->
-
-        it.id = it?.id?.let(::anonymize)
-        it.specimen?.id = it.specimen?.id?.let(::anonymize)
-    }
-
-    this.performanceStatus?.forEach { it -> it.id = it?.id?.let(::anonymize) }
-
-    this.priorDiagnosticReports?.forEach { it ->
-
-        it.id = it?.id?.let(::anonymize)
-        it.specimen?.id = it.specimen?.id?.let(::anonymize)
-    }
-
-    this.specimens?.forEach { it ->
-
-        it.id = it?.id?.let(::anonymize)
-        it.diagnosis?.id = it.diagnosis?.id?.let(::anonymize)
-
-    }
-
-    this.systemicTherapies?.forEach { it ->
-
-        it.history?.forEach { it ->
-
-            it.id = it?.id?.let(::anonymize)
-            it.reason?.id = it.reason?.id?.let(::anonymize)
-            it.basedOn?.id = it.basedOn?.id?.let(::anonymize)
         }
-
     }
 }
-
-fun Mtb.ensureMetaDataIsInitialized() {
-    // init metadata if necessary
-    if (this.metadata == null) {
-        val mvhMetadata = MvhMetadata.builder().build()
-        this.metadata = mvhMetadata
-    }
-    if (this.metadata.researchConsents == null) {
-        this.metadata.researchConsents = mutableListOf()
-    }
-    if (this.metadata.modelProjectConsent == null) {
-        this.metadata.modelProjectConsent = ModelProjectConsent()
-        this.metadata.modelProjectConsent.provisions = mutableListOf()
-    } else if (this.metadata.modelProjectConsent.provisions != null) {
-        // make sure list can be changed
-        this.metadata.modelProjectConsent.provisions =
-            this.metadata.modelProjectConsent.provisions.toMutableList()
-    }
-}
-
-infix fun Mtb.addGenomDeTan(pseudonymizeService: PseudonymizeService) {
-    this.metadata.transferTan = pseudonymizeService.genomDeTan(PatientId(this.patient.id))
-}

src/main/kotlin/dev/dnpm/etl/processor/services/ConsentProcessor.kt

@@ -1,273 +0,0 @@
-package dev.dnpm.etl.processor.services
-
-import ca.uhn.fhir.context.FhirContext
-import com.fasterxml.jackson.core.JsonProcessingException
-import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.config.AppConfigProperties
-import dev.dnpm.etl.processor.config.GIcsConfigProperties
-import dev.dnpm.etl.processor.consent.ConsentDomain
-import dev.dnpm.etl.processor.consent.IConsentService
-import dev.dnpm.etl.processor.consent.MtbFileConsentService
-import dev.dnpm.etl.processor.pseudonym.ensureMetaDataIsInitialized
-import dev.pcvolkmer.mv64e.mtb.*
-import org.apache.commons.lang3.NotImplementedException
-import org.hl7.fhir.r4.model.*
-import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.Consent.ConsentState
-import org.hl7.fhir.r4.model.Consent.ProvisionComponent
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import org.springframework.stereotype.Service
-import java.io.IOException
-import java.time.Clock
-import java.time.Instant
-import java.util.*
-
-@Service
-class ConsentProcessor(
-    private val appConfigProperties: AppConfigProperties,
-    private val gIcsConfigProperties: GIcsConfigProperties,
-    private val objectMapper: ObjectMapper,
-    private val fhirContext: FhirContext,
-    private val consentService: IConsentService
-) {
-    private var logger: Logger = LoggerFactory.getLogger("ConsentProcessor")
-
-    /**
-     * In case an instance of {@link  ICheckConsent} is active, consent will be embedded and checked.
-     *
-     * Logic:
-     *  * <c>true</c> IF consent check is disabled.
-     *  * <c>true</c> IF broad consent (BC) has been given.
-     *  * <c>true</c> BC has been asked AND declined but genomDe consent has been consented.
-     *  * ELSE <c>false</c> is returned.
-     *
-     * @param mtbFile File v2 (will be enriched with consent data)
-     * @return true if consent is given
-     *
-     */
-    fun consentGatedCheckAndTryEmbedding(mtbFile: Mtb): Boolean {
-        if (consentService is MtbFileConsentService) {
-            // consent check is disabled
-            return true
-        }
-
-        mtbFile.ensureMetaDataIsInitialized()
-
-        val personIdentifierValue = mtbFile.patient.id
-        val requestDate = Date.from(Instant.now(Clock.systemUTC()))
-
-        // 1. Broad consent Entry exists?
-        // 1.1. -> yes and research consent is given -> send mtb file
-        // 1.2. -> no -> return status error - consent has not been asked
-        // 2. ->  Broad consent found but rejected -> is GenomDe consent provision 'sequencing' given?
-        // 2.1 -> yes -> send mtb file
-        // 2.2 -> no ->  warn/info no consent given
-
-        /*
-         * broad consent
-         */
-        val broadConsent = consentService.getConsent(
-            personIdentifierValue, requestDate, ConsentDomain.BROAD_CONSENT
-        )
-        val broadConsentHasBeenAsked = broadConsent.entry.isNotEmpty()
-
-        // fast exit - if patient has not been asked, we can skip and exit
-        if (!broadConsentHasBeenAsked) return false
-
-        val genomeDeConsent = consentService.getConsent(
-            personIdentifierValue, requestDate, ConsentDomain.MODELLVORHABEN_64E
-        )
-
-        addGenomeDbProvisions(mtbFile, genomeDeConsent)
-
-        if (genomeDeConsent.entry.isNotEmpty()) setGenomDeSubmissionType(mtbFile)
-
-        embedBroadConsentResources(mtbFile, broadConsent)
-
-        val broadConsentStatus = getProvisionTypeByPolicyCode(
-            broadConsent, requestDate, ConsentDomain.BROAD_CONSENT
-        )
-
-        val genomDeSequencingStatus = getProvisionTypeByPolicyCode(
-            genomeDeConsent, requestDate, ConsentDomain.MODELLVORHABEN_64E
-        )
-
-        if (Consent.ConsentProvisionType.NULL == broadConsentStatus) {
-            // bc not asked
-            return false
-        }
-        if (Consent.ConsentProvisionType.PERMIT == broadConsentStatus || Consent.ConsentProvisionType.PERMIT == genomDeSequencingStatus) return true
-
-        return false
-    }
-
-    fun embedBroadConsentResources(mtbFile: Mtb, broadConsent: Bundle) {
-        for (entry in broadConsent.entry) {
-            val resource = entry.resource
-            if (resource is Consent) {
-                // since jackson convertValue does not work here,
-                // we need another step to back to string, before we convert to object map
-                val asJsonString = fhirContext.newJsonParser().encodeResourceToString(resource)
-                try {
-                    val mapOfJson: HashMap<String?, Any?>? =
-                        objectMapper.readValue<HashMap<String?, Any?>?>(
-                            asJsonString, object : TypeReference<HashMap<String?, Any?>?>() {})
-                    mtbFile.metadata.researchConsents.add(mapOfJson)
-                } catch (e: JsonProcessingException) {
-                    throw RuntimeException(e)
-                }
-            }
-        }
-    }
-
-    fun addGenomeDbProvisions(mtbFile: Mtb, consentGnomeDe: Bundle) {
-        for (entry in consentGnomeDe.entry) {
-            val resource = entry.resource
-            if (resource !is Consent) {
-                continue
-            }
-
-            // We expect only one provision in collection, therefore get first or none
-            val provisions = resource.provision.provision
-            if (provisions.isEmpty()) {
-                continue
-            }
-
-            val provisionComponent: ProvisionComponent = provisions.first()
-
-            var provisionCode: String? = null
-            if (provisionComponent.code != null && provisionComponent.code.isNotEmpty()) {
-                val codableConcept: CodeableConcept = provisionComponent.code.first()
-                if (codableConcept.coding != null && codableConcept.coding.isNotEmpty()) {
-                    provisionCode = codableConcept.coding.first().code
-                }
-            }
-
-            if (provisionCode != null) {
-                try {
-                    val modelProjectConsentPurpose =
-                        ModelProjectConsentPurpose.forValue(provisionCode)
-
-                    if (ModelProjectConsentPurpose.SEQUENCING == modelProjectConsentPurpose) {
-                        // CONVENTION: wrapping date is date of SEQUENCING consent
-                        mtbFile.metadata.modelProjectConsent.date = resource.dateTime
-                    }
-
-                    val provision = Provision.builder()
-                        .type(ConsentProvision.valueOf(provisionComponent.type.name))
-                        .date(provisionComponent.period.start)
-                        .purpose(modelProjectConsentPurpose).build()
-
-                    mtbFile.metadata.modelProjectConsent.provisions.add(provision)
-                } catch (ioe: IOException) {
-                    logger.error(
-                        "Provision code '$provisionCode' is unknown and cannot be mapped.",
-                        ioe.toString()
-                    )
-                }
-            }
-
-            if (mtbFile.metadata.modelProjectConsent.provisions.isNotEmpty()) {
-                mtbFile.metadata.modelProjectConsent.version =
-                    gIcsConfigProperties.genomeDeConsentVersion
-            }
-        }
-    }
-
-    private fun setGenomDeSubmissionType(mtbFile: Mtb) {
-        if (appConfigProperties.genomDeTestSubmission) {
-            mtbFile.metadata.type = MvhSubmissionType.TEST
-            logger.info("genomeDe submission mit TEST")
-        } else {
-            mtbFile.metadata.type = when (mtbFile.metadata.type) {
-                null -> MvhSubmissionType.INITIAL
-                else -> mtbFile.metadata.type
-            }
-        }
-    }
-
-    /**
-     * @param consentBundle consent resource
-     * @param requestDate   date which must be within validation period of provision
-     * @return type of provision, will be [org.hl7.fhir.r4.model.Consent.ConsentProvisionType.NULL] if none is found.
-     */
-    fun getProvisionTypeByPolicyCode(
-        consentBundle: Bundle, requestDate: Date?, consentDomain: ConsentDomain
-    ): Consent.ConsentProvisionType {
-        val code: String?
-        val system: String?
-        if (ConsentDomain.BROAD_CONSENT == consentDomain) {
-            code = gIcsConfigProperties.broadConsentPolicyCode
-            system = gIcsConfigProperties.broadConsentPolicySystem
-        } else if (ConsentDomain.MODELLVORHABEN_64E == consentDomain) {
-            code = gIcsConfigProperties.genomeDePolicyCode
-            system = gIcsConfigProperties.genomeDePolicySystem
-        } else {
-            throw NotImplementedException("unknown consent domain " + consentDomain.name)
-        }
-
-        val provisionTypeByPolicyCode = getProvisionTypeByPolicyCode(
-            consentBundle, code, system, requestDate
-        )
-        return provisionTypeByPolicyCode
-    }
-
-    /**
-     * @param consentBundle            consent resource
-     * @param targetCode   policyRule and provision code value
-     * @param targetSystem policyRule and provision system value
-     * @param requestDate              date which must be within validation period of provision
-     * @return type of provision, will be [org.hl7.fhir.r4.model.Consent.ConsentProvisionType.NULL] if none is found.
-     */
-    fun getProvisionTypeByPolicyCode(
-        consentBundle: Bundle, targetCode: String?, targetSystem: String?, requestDate: Date?
-    ): Consent.ConsentProvisionType {
-        val entriesOfInterest = consentBundle.entry.filter { entry ->
-            val isConsentResource =
-                entry.resource.isResource && entry.resource.resourceType == ResourceType.Consent
-            val consentIsActive = (entry.resource as Consent).status == ConsentState.ACTIVE
-
-            isConsentResource && consentIsActive && checkCoding(
-                targetCode, targetSystem, (entry.resource as Consent).policyRule.coding
-            ) && isRequestDateInRange(requestDate, (entry.resource as Consent).provision.period)
-        }.map { entry: BundleEntryComponent ->
-            val consent = (entry.getResource() as Consent)
-            consent.provision.provision.filter { subProvision ->
-                isRequestDateInRange(requestDate, subProvision.period)
-                // search coding entries of current provision for code and system
-                subProvision.code.map { c -> c.coding }.flatten().firstOrNull { code ->
-                    targetCode.equals(code.code) && targetSystem.equals(code.system)
-                } != null
-            }.map { subProvision ->
-                subProvision
-            }
-        }.flatten()
-
-        if (entriesOfInterest.isNotEmpty()) {
-            return entriesOfInterest.first().type
-        }
-        return Consent.ConsentProvisionType.NULL
-    }
-
-    fun checkCoding(
-        researchAllowedPolicyOid: String?,
-        researchAllowedPolicySystem: String?,
-        policyRules: Collection<Coding>
-    ): Boolean {
-        return policyRules.find { code ->
-            researchAllowedPolicySystem.equals(code.getSystem()) && (researchAllowedPolicyOid.equals(
-                code.getCode()
-            ))
-        } != null
-    }
-
-    fun isRequestDateInRange(requestDate: Date?, provPeriod: Period): Boolean {
-        val isRequestDateAfterOrEqualStart = provPeriod.start.compareTo(requestDate)
-        val isRequestDateBeforeOrEqualEnd = provPeriod.end.compareTo(requestDate)
-        return isRequestDateAfterOrEqualStart <= 0 && isRequestDateBeforeOrEqualEnd >= 0
-    }
-
-}

src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2023  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,28 +20,18 @@
 package dev.dnpm.etl.processor.services
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.*
+import de.ukw.ccc.bwhc.dto.MtbFile
 import dev.dnpm.etl.processor.config.AppConfigProperties
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.monitoring.Report
 import dev.dnpm.etl.processor.monitoring.Request
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.monitoring.RequestType
-import dev.dnpm.etl.processor.output.DeleteRequest
-import dev.dnpm.etl.processor.output.DnpmV2MtbFileRequest
-import dev.dnpm.etl.processor.output.MtbFileRequest
 import dev.dnpm.etl.processor.output.MtbFileSender
 import dev.dnpm.etl.processor.pseudonym.PseudonymizeService
-import dev.dnpm.etl.processor.pseudonym.addGenomDeTan
 import dev.dnpm.etl.processor.pseudonym.anonymizeContentWith
 import dev.dnpm.etl.processor.pseudonym.pseudonymizeWith
-import dev.pcvolkmer.mv64e.mtb.ConsentProvision
-import dev.pcvolkmer.mv64e.mtb.ModelProjectConsentPurpose
-import dev.pcvolkmer.mv64e.mtb.Mtb
 import org.apache.commons.codec.binary.Base32
 import org.apache.commons.codec.digest.DigestUtils
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import java.time.Instant
@@ -55,63 +45,38 @@ class RequestProcessor(
     private val requestService: RequestService,
     private val objectMapper: ObjectMapper,
     private val applicationEventPublisher: ApplicationEventPublisher,
-    private val appConfigProperties: AppConfigProperties,
+    private val appConfigProperties: AppConfigProperties
-    private val consentProcessor: ConsentProcessor?
 ) {
 
-    private var logger: Logger = LoggerFactory.getLogger("RequestProcessor")
+    fun processMtbFile(mtbFile: MtbFile) {
-
+        processMtbFile(mtbFile, UUID.randomUUID().toString())
-    fun processMtbFile(mtbFile: Mtb) {
-        processMtbFile(mtbFile, randomRequestId())
     }
 
+    fun processMtbFile(mtbFile: MtbFile, requestId: String) {
+        val pid = mtbFile.patient.id
 
-    fun processMtbFile(mtbFile: Mtb, requestId: RequestId) {
+        mtbFile pseudonymizeWith pseudonymizeService
-        val pid = PatientId(extractPatientIdentifier(mtbFile))
+        mtbFile anonymizeContentWith pseudonymizeService
 
-        val isConsentOk =
+        val request = MtbFileSender.MtbFileRequest(requestId, transformationService.transform(mtbFile))
-            consentProcessor != null && consentProcessor.consentGatedCheckAndTryEmbedding(mtbFile) || consentProcessor == null
-        if (isConsentOk) {
-            if (isGenomDeConsented(mtbFile)) {
-                mtbFile addGenomDeTan pseudonymizeService
-            }
-            mtbFile pseudonymizeWith pseudonymizeService
-            mtbFile anonymizeContentWith pseudonymizeService
-            val request = DnpmV2MtbFileRequest(requestId, transformationService.transform(mtbFile))
-            saveAndSend(request, pid)
-        } else {
-            logger.warn("consent check failed file will not be processed further!")
-            applicationEventPublisher.publishEvent(
-                ResponseEvent(
-                    requestId, Instant.now(), RequestStatus.NO_CONSENT
-                )
-            )
-        }
-    }
 
-    private fun isGenomDeConsented(mtbFile: Mtb): Boolean {
-        val isModelProjectConsented = mtbFile.metadata?.modelProjectConsent?.provisions?.any { p ->
-            p.purpose == ModelProjectConsentPurpose.SEQUENCING && p.type == ConsentProvision.PERMIT
-        } == true
-        return isModelProjectConsented
-    }
-
-    private fun <T> saveAndSend(request: MtbFileRequest<T>, pid: PatientId) {
         requestService.save(
             Request(
-                request.requestId,
+                uuid = requestId,
-                request.patientPseudonym(),
+                patientId = request.mtbFile.patient.id,
-                pid,
+                pid = pid,
-                fingerprint(request),
+                fingerprint = fingerprint(request.mtbFile),
-                RequestType.MTB_FILE,
+                status = RequestStatus.UNKNOWN,
-                RequestStatus.UNKNOWN
+                type = RequestType.MTB_FILE
             )
         )
 
-        if (appConfigProperties.duplicationDetection && isDuplication(request)) {
+        if (appConfigProperties.duplicationDetection && isDuplication(mtbFile)) {
             applicationEventPublisher.publishEvent(
                 ResponseEvent(
-                    request.requestId, Instant.now(), RequestStatus.DUPLICATION
+                    requestId,
+                    Instant.now(),
+                    RequestStatus.DUPLICATION
                 )
             )
             return
@@ -121,78 +86,67 @@ class RequestProcessor(
 
         applicationEventPublisher.publishEvent(
             ResponseEvent(
-                request.requestId,
+                requestId,
                 Instant.now(),
                 responseStatus.status,
                 when (responseStatus.status) {
-                    RequestStatus.ERROR, RequestStatus.WARNING -> Optional.of(responseStatus.body)
+                    RequestStatus.WARNING -> Optional.of(responseStatus.body)
                     else -> Optional.empty()
                 }
             )
         )
     }
 
-    private fun <T> isDuplication(pseudonymizedMtbFileRequest: MtbFileRequest<T>): Boolean {
+    private fun isDuplication(pseudonymizedMtbFile: MtbFile): Boolean {
-        val patientPseudonym = when (pseudonymizedMtbFileRequest) {
-            is DnpmV2MtbFileRequest -> PatientPseudonym(pseudonymizedMtbFileRequest.content.patient.id)
-        }
-
         val lastMtbFileRequestForPatient =
-            requestService.lastMtbFileRequestForPatientPseudonym(patientPseudonym)
+            requestService.lastMtbFileRequestForPatientPseudonym(pseudonymizedMtbFile.patient.id)
-        val isLastRequestDeletion =
+        val isLastRequestDeletion = requestService.isLastRequestWithKnownStatusDeletion(pseudonymizedMtbFile.patient.id)
-            requestService.isLastRequestWithKnownStatusDeletion(patientPseudonym)
 
-        return null != lastMtbFileRequestForPatient && !isLastRequestDeletion && lastMtbFileRequestForPatient.fingerprint == fingerprint(
+        return null != lastMtbFileRequestForPatient
-            pseudonymizedMtbFileRequest
+                && !isLastRequestDeletion
-        )
+                && lastMtbFileRequestForPatient.fingerprint == fingerprint(pseudonymizedMtbFile)
     }
 
-    fun processDeletion(patientId: PatientId, isConsented: TtpConsentStatus) {
+    fun processDeletion(patientId: String) {
-        processDeletion(patientId, randomRequestId(), isConsented)
+        processDeletion(patientId, UUID.randomUUID().toString())
     }
 
-    fun processDeletion(patientId: PatientId, requestId: RequestId, isConsented: TtpConsentStatus) {
+    fun processDeletion(patientId: String, requestId: String) {
         try {
             val patientPseudonym = pseudonymizeService.patientPseudonym(patientId)
 
-            val requestStatus: RequestStatus = when (isConsented) {
-                TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED, TtpConsentStatus.BROAD_CONSENT_MISSING, TtpConsentStatus.BROAD_CONSENT_REJECTED -> RequestStatus.NO_CONSENT
-                TtpConsentStatus.FAILED_TO_ASK -> RequestStatus.ERROR
-                TtpConsentStatus.BROAD_CONSENT_GIVEN, TtpConsentStatus.UNKNOWN_CHECK_FILE -> RequestStatus.UNKNOWN
-                TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT, TtpConsentStatus.GENOM_DE_CONSENT_MISSING, TtpConsentStatus.GENOM_DE_SEQUENCING_REJECTED -> {
-                    throw RuntimeException("processDelete should never deal with '" + isConsented.name + "' consent status. This is a bug and need to be fixed!")
-                }
-            }
-
             requestService.save(
                 Request(
-                    requestId,
+                    uuid = requestId,
-                    patientPseudonym,
+                    patientId = patientPseudonym,
-                    patientId,
+                    pid = patientId,
-                    fingerprint(patientPseudonym.value),
+                    fingerprint = fingerprint(patientPseudonym),
-                    RequestType.DELETE,
+                    status = RequestStatus.UNKNOWN,
-                    requestStatus
+                    type = RequestType.DELETE
                 )
             )
 
-            val responseStatus = sender.send(DeleteRequest(requestId, patientPseudonym))
+            val responseStatus = sender.send(MtbFileSender.DeleteRequest(requestId, patientPseudonym))
 
             applicationEventPublisher.publishEvent(
                 ResponseEvent(
-                    requestId, Instant.now(), responseStatus.status, when (responseStatus.status) {
+                    requestId,
+                    Instant.now(),
+                    responseStatus.status,
+                    when (responseStatus.status) {
                         RequestStatus.WARNING, RequestStatus.ERROR -> Optional.of(responseStatus.body)
                         else -> Optional.empty()
                     }
                 )
             )
 
-        } catch (_: Exception) {
+        } catch (e: Exception) {
             requestService.save(
                 Request(
                     uuid = requestId,
-                    patientPseudonym = emptyPatientPseudonym(),
+                    patientId = "???",
                     pid = patientId,
-                    fingerprint = Fingerprint.empty(),
+                    fingerprint = "",
                     status = RequestStatus.ERROR,
                     type = RequestType.DELETE,
                     report = Report("Fehler bei der Pseudonymisierung")
@@ -201,18 +155,14 @@ class RequestProcessor(
         }
     }
 
-    private fun <T> fingerprint(request: MtbFileRequest<T>): Fingerprint {
+    private fun fingerprint(mtbFile: MtbFile): String {
-        return when (request) {
+        return fingerprint(objectMapper.writeValueAsString(mtbFile))
-            is DnpmV2MtbFileRequest -> fingerprint(objectMapper.writeValueAsString(request.content))
-        }
     }
 
-    private fun fingerprint(s: String): Fingerprint {
+    private fun fingerprint(s: String): String {
-        return Fingerprint(
+        return Base32().encodeAsString(DigestUtils.sha256(s))
-            Base32().encodeAsString(DigestUtils.sha256(s)).replace("=", "").lowercase()
+            .replace("=", "")
-        )
+            .lowercase()
     }
 
 }
-
-private fun extractPatientIdentifier(mtbFile: Mtb): String = mtbFile.patient.id

src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt

@@ -19,13 +19,11 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.PatientPseudonym
+import dev.dnpm.etl.processor.monitoring.Request
-import dev.dnpm.etl.processor.RequestId
+import dev.dnpm.etl.processor.monitoring.RequestRepository
-import dev.dnpm.etl.processor.monitoring.*
+import dev.dnpm.etl.processor.monitoring.RequestStatus
-import org.springframework.data.domain.Page
+import dev.dnpm.etl.processor.monitoring.RequestType
-import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
-import java.util.*
 
 @Service
 class RequestService(
@@ -34,32 +32,15 @@ class RequestService(
 
     fun save(request: Request) = requestRepository.save(request)
 
-    fun findAll(): Iterable<Request> = requestRepository.findAll()
+    fun allRequestsByPatientPseudonym(patientPseudonym: String) = requestRepository
+        .findAllByPatientIdOrderByProcessedAtDesc(patientPseudonym)
 
-    fun findAll(pageable: Pageable): Page<Request> = requestRepository.findAll(pageable)
+    fun lastMtbFileRequestForPatientPseudonym(patientPseudonym: String) =
-
-    fun findByUuid(uuid: RequestId): Optional<Request> =
-        requestRepository.findByUuidEquals(uuid)
-
-    fun findRequestByPatientId(patientPseudonym: PatientPseudonym, pageable: Pageable): Page<Request> = requestRepository.findRequestByPatientPseudonym(patientPseudonym, pageable)
-
-    fun allRequestsByPatientPseudonym(patientPseudonym: PatientPseudonym) = requestRepository
-        .findAllByPatientPseudonymOrderByProcessedAtDesc(patientPseudonym)
-
-    fun lastMtbFileRequestForPatientPseudonym(patientPseudonym: PatientPseudonym) =
         Companion.lastMtbFileRequestForPatientPseudonym(allRequestsByPatientPseudonym(patientPseudonym))
 
-    fun isLastRequestWithKnownStatusDeletion(patientPseudonym: PatientPseudonym) =
+    fun isLastRequestWithKnownStatusDeletion(patientPseudonym: String) =
         Companion.isLastRequestWithKnownStatusDeletion(allRequestsByPatientPseudonym(patientPseudonym))
 
-    fun countStates(): Iterable<CountedState> = requestRepository.countStates()
-
-    fun countDeleteStates(): Iterable<CountedState> = requestRepository.countDeleteStates()
-
-    fun findPatientUniqueStates(): List<CountedState> = requestRepository.findPatientUniqueStates()
-
-    fun findPatientUniqueDeleteStates(): List<CountedState> = requestRepository.findPatientUniqueDeleteStates()
-
     companion object {
 
         fun lastMtbFileRequestForPatientPseudonym(allRequests: List<Request>) = allRequests

src/main/kotlin/dev/dnpm/etl/processor/services/ResponseProcessor.kt

@@ -19,8 +19,8 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.Report
+import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import org.slf4j.LoggerFactory
 import org.springframework.context.event.EventListener
@@ -31,7 +31,7 @@ import java.util.*
 
 @Service
 class ResponseProcessor(
-    private val requestService: RequestService,
+    private val requestRepository: RequestRepository,
     private val statisticsUpdateProducer: Sinks.Many<Any>
 ) {
 
@@ -39,7 +39,7 @@ class ResponseProcessor(
 
     @EventListener(classes = [ResponseEvent::class])
     fun handleResponseEvent(event: ResponseEvent) {
-        requestService.findByUuid(event.requestUuid).ifPresentOrElse({
+        requestRepository.findByUuidEquals(event.requestUuid).ifPresentOrElse({
             it.processedAt = event.timestamp
             it.status = event.status
 
@@ -70,19 +70,13 @@ class ResponseProcessor(
                     )
                 }
 
-                RequestStatus.NO_CONSENT -> {
-                    it.report = Report(
-                        "Einwilligung Status fehlt, widerrufen oder ungeklärt."
-                    )
-                }
-
                 else -> {
                     logger.error("Cannot process response: Unknown response!")
                     return@ifPresentOrElse
                 }
             }
 
-            requestService.save(it)
+            requestRepository.save(it)
 
             statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
         }, {
@@ -93,7 +87,7 @@ class ResponseProcessor(
 }
 
 data class ResponseEvent(
-    val requestUuid: RequestId,
+    val requestUuid: String,
     val timestamp: Instant,
     val status: RequestStatus,
     val body: Optional<String> = Optional.empty()

src/main/kotlin/dev/dnpm/etl/processor/services/TokenService.kt

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package dev.dnpm.etl.processor.security
+package dev.dnpm.etl.processor.services
 
 import jakarta.annotation.PostConstruct
 import org.springframework.data.annotation.Id

src/main/kotlin/dev/dnpm/etl/processor/services/TransformationService.kt

@@ -22,17 +22,11 @@ package dev.dnpm.etl.processor.services
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.jayway.jsonpath.JsonPath
 import com.jayway.jsonpath.PathNotFoundException
-import dev.pcvolkmer.mv64e.mtb.Mtb
+import de.ukw.ccc.bwhc.dto.MtbFile
 
 class TransformationService(private val objectMapper: ObjectMapper, private val transformations: List<Transformation>) {
-
+    fun transform(mtbFile: MtbFile): MtbFile {
-    fun transform(mtbFile: Mtb): Mtb {
+        var json = objectMapper.writeValueAsString(mtbFile)
-        val json = transform(objectMapper.writeValueAsString(mtbFile))
-        return objectMapper.readValue(json, Mtb::class.java)
-    }
-
-    private fun transform(content: String): String {
-        var json = content
 
         transformations.forEach { transformation ->
             val jsonPath = JsonPath.parse(json)
@@ -54,7 +48,7 @@ class TransformationService(private val objectMapper: ObjectMapper, private val
             json = jsonPath.jsonString()
         }
 
-        return json
+        return objectMapper.readValue(json, MtbFile::class.java)
     }
 
     fun getTransformations(): List<Transformation> {

src/main/kotlin/dev/dnpm/etl/processor/services/UserRoleService.kt

@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package dev.dnpm.etl.processor.security
+package dev.dnpm.etl.processor.services
 
+import dev.dnpm.etl.processor.security.Role
+import dev.dnpm.etl.processor.security.UserRole
+import dev.dnpm.etl.processor.security.UserRoleRepository
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.security.core.session.SessionRegistry
 import org.springframework.security.oauth2.core.oidc.user.OidcUser

src/main/kotlin/dev/dnpm/etl/processor/services/kafka/KafkaResponseProcessor.kt

@@ -22,7 +22,6 @@ package dev.dnpm.etl.processor.services.kafka
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.output.asRequestStatus
 import dev.dnpm.etl.processor.services.ResponseEvent
@@ -48,7 +47,7 @@ class KafkaResponseProcessor(
             Optional.empty()
         }.ifPresentOrElse({ responseBody ->
             val event = ResponseEvent(
-                RequestId(responseBody.requestId),
+                responseBody.requestId,
                 Instant.ofEpochMilli(data.timestamp()),
                 responseBody.statusCode.asRequestStatus(),
                 when (responseBody.statusCode.asRequestStatus()) {

src/main/kotlin/dev/dnpm/etl/processor/types.kt

@@ -1,63 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor
-
-import org.springframework.http.MediaType
-import java.util.*
-
-class Fingerprint(val value: String) {
-    override fun hashCode() = value.hashCode()
-
-    override fun equals(other: Any?) = other is Fingerprint && other.value == value
-
-    companion object {
-        fun empty() = Fingerprint("")
-    }
-}
-
-@JvmInline
-value class RequestId(val value: String) {
-
-    fun isBlank() = value.isBlank()
-
-}
-
-fun randomRequestId() = RequestId(UUID.randomUUID().toString())
-
-@JvmInline
-value class PatientId(val value: String)
-
-@JvmInline
-value class PatientPseudonym(val value: String)
-
-fun emptyPatientPseudonym() = PatientPseudonym("")
-
-/**
- * Custom MediaTypes
- *
- * @since 0.11.0
- */
-object CustomMediaType {
-    val APPLICATION_VND_DNPM_V2_MTB_JSON = MediaType("application", "vnd.dnpm.v2.mtb+json")
-    const val APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE = "application/vnd.dnpm.v2.mtb+json"
-
-    val APPLICATION_VND_DNPM_V2_RD_JSON = MediaType("application", "vnd.dnpm.v2.rd+json")
-    const val APPLICATION_VND_DNPM_V2_RD_JSON_VALUE = "application/vnd.dnpm.v2.rd+json"
-}

src/main/kotlin/dev/dnpm/etl/processor/web/ConfigController.kt

@@ -19,15 +19,18 @@
 
 package dev.dnpm.etl.processor.web
 
-import dev.dnpm.etl.processor.monitoring.*
+import dev.dnpm.etl.processor.monitoring.ConnectionCheckResult
+import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
+import dev.dnpm.etl.processor.monitoring.GPasConnectionCheckService
+import dev.dnpm.etl.processor.monitoring.OutputConnectionCheckService
 import dev.dnpm.etl.processor.output.MtbFileSender
 import dev.dnpm.etl.processor.pseudonym.Generator
 import dev.dnpm.etl.processor.security.Role
 import dev.dnpm.etl.processor.security.UserRole
-import dev.dnpm.etl.processor.security.Token
+import dev.dnpm.etl.processor.services.Token
-import dev.dnpm.etl.processor.security.TokenService
+import dev.dnpm.etl.processor.services.TokenService
 import dev.dnpm.etl.processor.services.TransformationService
-import dev.dnpm.etl.processor.security.UserRoleService
+import dev.dnpm.etl.processor.services.UserRoleService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.http.MediaType
 import org.springframework.http.codec.ServerSentEvent
@@ -53,20 +56,16 @@ class ConfigController(
     @GetMapping
     fun index(model: Model): String {
         val outputConnectionAvailable =
-            connectionCheckServices.filterIsInstance<OutputConnectionCheckService>().firstOrNull()?.connectionAvailable()
+            connectionCheckServices.filterIsInstance<OutputConnectionCheckService>().first().connectionAvailable()
 
         val gPasConnectionAvailable =
             connectionCheckServices.filterIsInstance<GPasConnectionCheckService>().firstOrNull()?.connectionAvailable()
 
-        val gIcsConnectionAvailable =
-            connectionCheckServices.filterIsInstance<GIcsConnectionCheckService>().firstOrNull()?.connectionAvailable()
-
         model.addAttribute("pseudonymGenerator", pseudonymGenerator.javaClass.simpleName)
         model.addAttribute("mtbFileSender", mtbFileSender.javaClass.simpleName)
         model.addAttribute("mtbFileEndpoint", mtbFileSender.endpoint())
         model.addAttribute("outputConnectionAvailable", outputConnectionAvailable)
         model.addAttribute("gPasConnectionAvailable", gPasConnectionAvailable)
-        model.addAttribute("gIcsConnectionAvailable", gIcsConnectionAvailable)
         model.addAttribute("tokensEnabled", tokenService != null)
         if (tokenService != null) {
             model.addAttribute("tokens", tokenService.findAll())
@@ -120,24 +119,6 @@ class ConfigController(
         return "configs/gPasConnectionAvailable"
     }
 
-    @GetMapping(params = ["gIcsConnectionAvailable"])
-    fun gIcsConnectionAvailable(model: Model): String {
-        val gIcsConnectionAvailable =
-            connectionCheckServices.filterIsInstance<GIcsConnectionCheckService>().firstOrNull()?.connectionAvailable()
-
-        model.addAttribute("mtbFileSender", mtbFileSender.javaClass.simpleName)
-        model.addAttribute("mtbFileEndpoint", mtbFileSender.endpoint())
-        model.addAttribute("gIcsConnectionAvailable", gIcsConnectionAvailable)
-        if (tokenService != null) {
-            model.addAttribute("tokensEnabled", true)
-            model.addAttribute("tokens", tokenService.findAll())
-        } else {
-            model.addAttribute("tokens", listOf<Token>())
-        }
-
-        return "configs/gIcsConnectionAvailable"
-    }
-
     @PostMapping(path = ["tokens"])
     fun addToken(@ModelAttribute("name") name: String, model: Model): String {
         if (tokenService == null) {
@@ -146,11 +127,10 @@ class ConfigController(
         } else {
             model.addAttribute("tokensEnabled", true)
             val result = tokenService.addToken(name)
-            result.onSuccess {
+            if (result.isSuccess) {
-                model.addAttribute("newTokenValue", it)
+                model.addAttribute("newTokenValue", result.getOrDefault(""))
                 model.addAttribute("success", true)
-            }
+            } else {
-            result.onFailure {
                 model.addAttribute("success", false)
             }
             model.addAttribute("tokens", tokenService.findAll())
@@ -202,14 +182,12 @@ class ConfigController(
     }
 
     @GetMapping(path = ["events"], produces = [MediaType.TEXT_EVENT_STREAM_VALUE])
-    @ResponseBody
     fun events(): Flux<ServerSentEvent<Any>> {
         return connectionCheckUpdateProducer.asFlux().map {
             val event = when (it) {
                 is ConnectionCheckResult.KafkaConnectionCheckResult -> "output-connection-check"
                 is ConnectionCheckResult.RestConnectionCheckResult -> "output-connection-check"
                 is ConnectionCheckResult.GPasConnectionCheckResult -> "gpas-connection-check"
-                is ConnectionCheckResult.GIcsConnectionCheckResult -> "gics-connection-check"
             }
 
             ServerSentEvent.builder<Any>()

src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt

@@ -20,10 +20,9 @@
 package dev.dnpm.etl.processor.web
 
 import dev.dnpm.etl.processor.NotFoundException
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.monitoring.ReportService
-import dev.dnpm.etl.processor.services.RequestService
+import dev.dnpm.etl.processor.monitoring.RequestId
+import dev.dnpm.etl.processor.monitoring.RequestRepository
 import org.springframework.data.domain.Pageable
 import org.springframework.data.domain.Sort
 import org.springframework.data.web.PageableDefault
@@ -36,7 +35,7 @@ import org.springframework.web.bind.annotation.RequestMapping
 @Controller
 @RequestMapping(path = ["/"])
 class HomeController(
-    private val requestService: RequestService,
+    private val requestRepository: RequestRepository,
     private val reportService: ReportService
 ) {
 
@@ -45,20 +44,20 @@ class HomeController(
         @PageableDefault(page = 0, size = 20, sort = ["processedAt"], direction = Sort.Direction.DESC) pageable: Pageable,
         model: Model
     ): String {
-        val requests = requestService.findAll(pageable)
+        val requests = requestRepository.findAll(pageable)
         model.addAttribute("requests", requests)
 
         return "index"
     }
 
-    @GetMapping(path = ["patient/{patientPseudonym}"])
+    @GetMapping(path = ["patient/{patientId}"])
     fun byPatient(
-        @PathVariable patientPseudonym: PatientPseudonym,
+        @PathVariable patientId: String,
         @PageableDefault(page = 0, size = 20, sort = ["processedAt"], direction = Sort.Direction.DESC) pageable: Pageable,
         model: Model
     ): String {
-        val requests = requestService.findRequestByPatientId(patientPseudonym, pageable)
+        val requests = requestRepository.findRequestByPatientId(patientId, pageable)
-        model.addAttribute("patientPseudonym", patientPseudonym.value)
+        model.addAttribute("patientId", patientId)
         model.addAttribute("requests", requests)
 
         return "index"
@@ -66,7 +65,7 @@ class HomeController(
 
     @GetMapping(path = ["/report/{id}"])
     fun report(@PathVariable id: RequestId, model: Model): String {
-        val request = requestService.findByUuid(id).orElse(null) ?: throw NotFoundException()
+        val request = requestRepository.findByUuidEquals(id.toString()).orElse(null) ?: throw NotFoundException()
         model.addAttribute("request", request)
         model.addAttribute("issues", reportService.deserialize(request.report?.dataQualityReport))
 

src/main/kotlin/dev/dnpm/etl/processor/web/StatisticsRestController.kt

@@ -19,9 +19,9 @@
 
 package dev.dnpm.etl.processor.web
 
+import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.monitoring.RequestType
-import dev.dnpm.etl.processor.services.RequestService
 import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.http.MediaType
 import org.springframework.http.codec.ServerSentEvent
@@ -41,15 +41,15 @@ import java.time.temporal.ChronoUnit
 class StatisticsRestController(
     @Qualifier("statisticsUpdateProducer")
     private val statisticsUpdateProducer: Sinks.Many<Any>,
-    private val requestService: RequestService
+    private val requestRepository: RequestRepository
 ) {
 
     @GetMapping(path = ["requeststates"])
     fun requestStates(@RequestParam(required = false, defaultValue = "false") delete: Boolean): List<NameValue> {
         val states = if (delete) {
-            requestService.countDeleteStates()
+            requestRepository.countDeleteStates()
         } else {
-            requestService.countStates()
+            requestRepository.countStates()
         }
 
         return states
@@ -79,7 +79,7 @@ class StatisticsRestController(
         }
 
         val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.of("Europe/Berlin"))
-        val data = requestService.findAll()
+        val data = requestRepository.findAll()
             .filter { it.type == requestType }
             .filter { it.processedAt.isAfter(Instant.now().minus(30, ChronoUnit.DAYS)) }
             .groupBy { formatter.format(it.processedAt) }
@@ -115,9 +115,9 @@ class StatisticsRestController(
     @GetMapping(path = ["requestpatientstates"])
     fun requestPatientStates(@RequestParam(required = false, defaultValue = "false") delete: Boolean): List<NameValue> {
         val states = if (delete) {
-            requestService.findPatientUniqueDeleteStates()
+            requestRepository.findPatientUniqueDeleteStates()
         } else {
-            requestService.findPatientUniqueStates()
+            requestRepository.findPatientUniqueStates()
         }
 
         return states.map {

src/main/resources/application-dev.yml

@@ -3,128 +3,17 @@ spring:
     compose:
       file: ./dev-compose.yml
 
-  security:
-    oauth2:
-      client:
-        registration:
-          custom:
-            client-name: App-Dev
-            client-id: app-dev
-            client-secret: very-secret-ae3f7a-5a9f-1190
-            scope:
-              - openid
-        provider:
-          custom:
-            issuer-uri: https://dnpm.dev/auth/realms/intern
-            user-name-attribute: name
-
-#  kafka:
-#    security:
-#      protocol: "SSL"
-#    ssl:
-#      key-store-type: "PEM"
-#      key-store-certificate-chain: -----BEGIN CERTIFICATE-----
-#        MIIDCzCCAfOgAwIBAgIUaXNh4PahaKeLUaab2rUPSVESx28wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODEyMTFaFw0zNTA4
-#        MTkxODEyMTFaMBUxEzARBgNVBAMMCkV4YW1wbGUgQ0EwggEiMA0GCSqGSIb3DQEB
-#        AQUAA4IBDwAwggEKAoIBAQCsqalqVOLFglVbX9oSHU91ebyL1kPyb/2N90UGQIcD
-#        UAjzKxxysId1Vdvtbbwgli6UgfPwlzFP2Wlw51h496yL4QU/9tNV956UJ1RoS/fG
-#        qBAEHctqavfMI27UQmIzw4pGMkGzEQxRMc6a9pdabBhbMMTJsjtmOv2YMYHj1HHK
-#        Dr7wTBTt2l0eRyCR0kZ8XGIMWhYowPa4EMpC7+4e5Nf/7LSJZWLLy9jXPpazsjkJ
-#        jEmDNlFfx2tZiq0Wz2Xj1pZSDLbcuIX4IHcLfMvagibfrCMX/h6+WuW42sWPRuBW
-#        wB6cHGlXs+K/gBBWxtD7sOTacO5hbHFsfaJOhSEIGoIpAgMBAAGjUzBRMB0GA1Ud
-#        DgQWBBT2S/C2++ECY+CSuN5KKql0umfbTDAfBgNVHSMEGDAWgBT2S/C2++ECY+CS
-#        uN5KKql0umfbTDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBj
-#        H4DdwqrOHg7sVsqiwDsZfTharpUDCYeG5XhrJQlnA9eKwyofTb929W/fjOwBdDtg
-#        9THT/omR0lA8/UyHtezMT6nMsCn4HG2mXvx6ghgvA3jrFTEY7R80dHkboLMTV3u4
-#        RYgC9S3BJPcbJYpM0cXzkp2T0F4FxWZlfqefuedHuX3zcCxpgVD56qQb2a131TX7
-#        O3UDJfVg8a65IFtehndqILgLVrf7w6+pbmDAlCg5RKrt2USEYyZXYdyTryJbdtn4
-#        BCLp0avYtSYVUGwgH0oUCpkjQRwMg1003TTz8SNnmE7mAXHYljyYejnjL8vBHfch
-#        8tTDVXQn08BT9H3jZTnF
-#        -----END CERTIFICATE-----
-#        -----BEGIN CERTIFICATE-----
-#        MIIC+TCCAeGgAwIBAgIUUoCwz8GS6xQ3mmI7RUUYSNPIOi4wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODE0NDhaFw0zNTA4
-#        MTkxODE0NDhaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEB
-#        BQADggEPADCCAQoCggEBAL9PW99MhhBwdEmTHyZgfnhfTrxZPrNU6z1UdV8b82Lk
-#        3p75o8eCKa9iOd7DDQlo75hQBhhX0+Xc3mucrstx5p8TYFMbypif8ojWh3LM++P8
-#        tz3ezQZlq86ycyKpm8dqlA03b227tFDfiYTev2eD2HN40BU7yDAYhhqd/QW8+MV2
-#        jkcRGv5cE21GZxWmPUpkVN+bNoBC8H90WmkST90LfeYF+wZnlsAJZH6AQzR1GnGD
-#        ICE5evMhC78hvRnpgeA310SyxssZEigkePL5lTZOBPY2IuzBqL05agyVTiVq4Xd6
-#        y3xOqXoxxOhZu06yd3nymorqeTgbF1fW8wQF0u3KsFECAwEAAaNCMEAwHQYDVR0O
-#        BBYEFHk9jMWRAAt2YsBSxUcOQVoWayoHMB8GA1UdIwQYMBaAFPZL8Lb74QJj4JK4
-#        3koqqXS6Z9tMMA0GCSqGSIb3DQEBCwUAA4IBAQBqabAA9INONDaLHqs9i9YQHm/g
-#        AnB7xRl/RFbERKKCTSMZUYM8oEaaH0W2ENoPMc/7xOB/R8a7Rm62PTr6syxwhZrY
-#        5NtGKJOD+rh90/5l83tulf93KqOJtGkiv6NBDvCNrITcA+UKRk/z4GcFi2YjWAl4
-#        wvY44lzTasMKSpjUQ5N0VNANcW3nVuEgPQ8rrr0NOK/5j4guPjsXDsixa47gqblA
-#        5xGfBKeVmEXdPbzawZfP4hPIw7DpX2m8Y0erswF1ZxkIV73V3TDsFSLcqSKSzZr6
-#        mtj8COlV9Us7zqaJbV5eOl7GN1T9orZJwZmX1Z46gCkkSLYDP/dqtl2j9JgN
-#        -----END CERTIFICATE-----
-#      ### For dev/testing purposes only!
-#      key-store-key: -----BEGIN PRIVATE KEY-----
-#        MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/T1vfTIYQcHRJ
-#        kx8mYH54X068WT6zVOs9VHVfG/Ni5N6e+aPHgimvYjneww0JaO+YUAYYV9Pl3N5r
-#        nK7LceafE2BTG8qYn/KI1odyzPvj/Lc93s0GZavOsnMiqZvHapQNN29tu7RQ34mE
-#        3r9ng9hzeNAVO8gwGIYanf0FvPjFdo5HERr+XBNtRmcVpj1KZFTfmzaAQvB/dFpp
-#        Ek/dC33mBfsGZ5bACWR+gEM0dRpxgyAhOXrzIQu/Ib0Z6YHgN9dEssbLGRIoJHjy
-#        +ZU2TgT2NiLswai9OWoMlU4lauF3est8Tql6McToWbtOsnd58pqK6nk4GxdX1vME
-#        BdLtyrBRAgMBAAECggEAC1wXfPlqxoQe65WAVoOJTvV90+JKvlRPCZu/wm+C8r7b
-#        Vz5Ekt6wQflHrWoQlpv0CivKSNzCONZ2IJazrGHti0mXwSeXzptEyApRDaiNVnrV
-#        mKdnrjcQThw7iPXgSaWS9/vwMmhgayLy5ABkBi4GhsjINlKP7wctw1vZP+N6NCNd
-#        Ql3taStvDKmG0SfJHF6/2o/XBpof3IJEL7ghbzyTTbWWaO34J1mJ8A+AmjGhj9GE
-#        Dp3XuOrO9W7MVd1nfZDtGBS8qf80AwROyodZZRma9vZuWJZ5aQFi2CnUEtU1T+Uv
-#        tW+F6tg2FOMr8M0Fb79wGIDwSF8u/QcTvwhEzZAfiQKBgQDioOofnE1oB1DOMnqZ
-#        SOFjs+vsirvS6G3lo27+HkE3TgvCHR4sk1305AiXtjmPu8iaUCo9qn18MtduY2RS
-#        CcKMOG/FxhmDyP5I29DhJRhvERIpJd0kcSDQOgtaoVPC1XzIlyTqte6nGX9kAnA/
-#        x/OOXrZ0hjhMNDcZzf2NasPYJQKBgQDYGqTobkVBk+eekNWklnTh41/649rUIgTu
-#        JStArtY2hgaEInYcGa2e7cEj7nIHA0iGy3EJ2yvwoUIyxtoXVcGohu2IrzlhS33T
-#        R4jA7nE2/yHZrEMEJovuSU0eMw7rgvEtL79Q0RToYnTY1EU6X/BBoFfiiEeNMHKz
-#        zjDOOQ6ZvQKBgGCWChIc0FSkwYiPtPZ9PCn89XCjk/cIPkYfiF9fT5Ydeh9pv4Fp
-#        8SI8yXi3HgMnGhDCV65eagqztGMEky3voO2X4/MbQaaL0+wDWxuJbsdvNBk7XOt6
-#        F20HP+2JUiR4Ti1DVWV+0k5/LG7YJzTXp/KmZQZ2aan4mv8xbn2F4h/NAoGAI4ou
-#        OLN53FEQtHkpSYoc6tFUBZTXdi+qE+g09sxKGmlsROrN9c0bSpnbO6eJRTH7CYAH
-#        tRFAZrB+jI87ar8FvEuEYQhALYoWxVpsWR5drCfFT2EPHG2icavIbQEEoSLFuyKx
-#        Gf9oqtcWVFqEkBcbEg/mpDC5Y7TmCEAOsrubdRkCgYEAl7B+EzIdG0rabGoti09q
-#        QXfyiTjR7nQYkhpLxMCeNlCpQ8Y15XSa8bm1UIGYqj/ZBpeBNhrj64IHoub5Vd43
-#        tzbb8yNgoLUd16TU1VvyccCMGQVPIF8RkDsAtEawV2eoXbHAstN99xbC8jsLNZRQ
-#        fcfgTiQaXRJmlVx6jfbfZd4=
-#        -----END PRIVATE KEY-----
-#      trust-store-type: "PEM"
-#      trust-store-certificates: -----BEGIN CERTIFICATE-----
-#        MIIDCzCCAfOgAwIBAgIUaXNh4PahaKeLUaab2rUPSVESx28wDQYJKoZIhvcNAQEL
-#        BQAwFTETMBEGA1UEAwwKRXhhbXBsZSBDQTAeFw0yNTA4MjExODEyMTFaFw0zNTA4
-#        MTkxODEyMTFaMBUxEzARBgNVBAMMCkV4YW1wbGUgQ0EwggEiMA0GCSqGSIb3DQEB
-#        AQUAA4IBDwAwggEKAoIBAQCsqalqVOLFglVbX9oSHU91ebyL1kPyb/2N90UGQIcD
-#        UAjzKxxysId1Vdvtbbwgli6UgfPwlzFP2Wlw51h496yL4QU/9tNV956UJ1RoS/fG
-#        qBAEHctqavfMI27UQmIzw4pGMkGzEQxRMc6a9pdabBhbMMTJsjtmOv2YMYHj1HHK
-#        Dr7wTBTt2l0eRyCR0kZ8XGIMWhYowPa4EMpC7+4e5Nf/7LSJZWLLy9jXPpazsjkJ
-#        jEmDNlFfx2tZiq0Wz2Xj1pZSDLbcuIX4IHcLfMvagibfrCMX/h6+WuW42sWPRuBW
-#        wB6cHGlXs+K/gBBWxtD7sOTacO5hbHFsfaJOhSEIGoIpAgMBAAGjUzBRMB0GA1Ud
-#        DgQWBBT2S/C2++ECY+CSuN5KKql0umfbTDAfBgNVHSMEGDAWgBT2S/C2++ECY+CS
-#        uN5KKql0umfbTDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBj
-#        H4DdwqrOHg7sVsqiwDsZfTharpUDCYeG5XhrJQlnA9eKwyofTb929W/fjOwBdDtg
-#        9THT/omR0lA8/UyHtezMT6nMsCn4HG2mXvx6ghgvA3jrFTEY7R80dHkboLMTV3u4
-#        RYgC9S3BJPcbJYpM0cXzkp2T0F4FxWZlfqefuedHuX3zcCxpgVD56qQb2a131TX7
-#        O3UDJfVg8a65IFtehndqILgLVrf7w6+pbmDAlCg5RKrt2USEYyZXYdyTryJbdtn4
-#        BCLp0avYtSYVUGwgH0oUCpkjQRwMg1003TTz8SNnmE7mAXHYljyYejnjL8vBHfch
-#        8tTDVXQn08BT9H3jZTnF
-#        -----END CERTIFICATE-----
-
 app:
-  rest:
+  #rest:
-    uri: http://localhost/api
+  #  uri: http://localhost:9000/bwhc/etl/api
-  #kafka:
+  kafka:
-  #  servers: localhost:9094
+    topic: test
-  #  group-id: "test1234"
+    response-topic: test_response
-  #  input-topic: test_input
+    servers: localhost:9094
-  #  output-topic: test_output
+  #security:
-  #  output-response-topic: test_response
+  #  admin-user: admin
-  security:
+  #  admin-password: "{noop}very-secret"
-    admin-user: admin
-    admin-password: "{noop}very-secret"
-    enable-oidc: "true"
 
 server:
   port: 8000
 
-

src/main/resources/application.yml

@@ -16,5 +16,6 @@ spring:
           content:
             enabled: true
             paths: /**/*.js,/**/*.css,/**/*.svg,/**/*.jpeg
+
 server:
   forward-headers-strategy: framework

src/main/resources/banner.txt

@@ -1,7 +0,0 @@
-                 __   _  _                   _   _
- _ __ _____   __/ /_ | || |   ___        ___| |_| |      _ __  _ __ ___   ___ ___  ___ ___  ___  _ __
-| '_ ` _ \ \ / / '_ \| || |_ / _ \_____ / _ \ __| |_____| '_ \| '__/ _ \ / __/ _ \/ __/ __|/ _ \| '__|
-| | | | | \ V /| (_) |__   _|  __/_____|  __/ |_| |_____| |_) | | | (_) | (_|  __/\__ \__ \ (_) | |
-|_| |_| |_|\_/  \___/   |_|  \___|      \___|\__|_|     | .__/|_|  \___/ \___\___||___/___/\___/|_|
-                                                        |_|
- :: mv64e-etl-processor ::        ${application.formatted-version}

src/main/resources/db/migration/mariadb/V0_4_0__RenamePatientPseudonym.sql

@@ -1 +0,0 @@
-ALTER TABLE request RENAME COLUMN patient_id TO patient_pseudonym;

src/main/resources/db/migration/postgresql/V0_4_0__RenamePatientPseudonym.sql

@@ -1 +0,0 @@
-ALTER TABLE request RENAME COLUMN patient_id TO patient_pseudonym;

src/main/resources/static/style.css

@@ -22,10 +22,6 @@
     --bg-gray-op: rgba(112, 128, 144, .35);
 }
 
-* {
-    font-family: sans-serif;
-}
-
 html {
     background: linear-gradient(-5deg, var(--bg-blue-op), transparent 10em);
     min-height: 100vh;
@@ -34,6 +30,7 @@ html {
 
 body {
     margin: 0 0 5em 0;
+    font-family: sans-serif;
     font-size: .8rem;
     color: var(--text);
 
@@ -622,10 +619,6 @@ input.inline:focus-visible {
     text-align: center;
 }
 
-.notification.info {
-    color: var(--bg-blue);
-}
-
 .notification.success {
     color: var(--bg-green);
 }
@@ -650,16 +643,14 @@ input.inline:focus-visible {
 
 .tab:hover,
 .tab.active {
-    background: var(--bg-gray);
+    background: var(--table-border);
-    color: white;
 }
 
 .tabcontent {
-    border: 2px solid var(--bg-gray);
+    border: 1px solid var(--table-border);
     border-radius: 0 .5em .5em .5em;
     display: none;
     padding: 1em;
-    background: white;
 }
 
 .tabcontent.active {
@@ -698,13 +689,3 @@ a.reload {
     padding: 1em;
     background: var(--bg-red-op);
 }
-
-.issue-message {
-    font-family: monospace;
-    font-weight: bolder;
-}
-
-.issue-path {
-    font-family: monospace;
-    line-height: 1rem;
-}

src/main/resources/templates/configs.html

@@ -49,11 +49,6 @@
                 </div>
             </section>
 
-            <section hx-ext="sse" th:sse-connect="@{/configs/events}">
-                <div th:insert="~{configs/gIcsConnectionAvailable.html}" th:hx-get="@{/configs?gIcsConnectionAvailable}" hx-trigger="sse:gics-connection-check">
-                </div>
-            </section>
-
             <section hx-ext="sse" th:sse-connect="@{/configs/events}">
                 <div th:insert="~{configs/outputConnectionAvailable.html}" th:hx-get="@{/configs?outputConnectionAvailable}" hx-trigger="sse:output-connection-check">
                 </div>

src/main/resources/templates/configs/gIcsConnectionAvailable.html

@@ -1,24 +0,0 @@
-<th:block th:if="${gIcsConnectionAvailable == null}">
-    <h2><span>🟦</span> gICS nicht konfiguriert - Einwilligung wird über Dateiinhalt geprüft</h2>
-</th:block>
-<th:block th:if="${gIcsConnectionAvailable != null}">
-    <h2><span th:if="${gIcsConnectionAvailable.available}">✅</span><span th:if="${not(gIcsConnectionAvailable.available)}">⚡</span> Verbindung zu gICS</h2>
-    <div>
-        Stand: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(gIcsConnectionAvailable.timestamp)}" th:text="${#temporals.formatISO(gIcsConnectionAvailable.timestamp)}"></time>
-        &nbsp;|&nbsp;
-        Letzte Änderung: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(gIcsConnectionAvailable.lastChange)}" th:text="${#temporals.formatISO(gIcsConnectionAvailable.lastChange)}"></time>
-    </div>
-    <div>
-        <span>Die Verbindung ist aktuell</span>
-        <strong th:if="${gIcsConnectionAvailable.available}" style="color: green">verfügbar.</strong>
-        <strong th:if="${not(gIcsConnectionAvailable.available)}" style="color: red">nicht verfügbar.</strong>
-    </div>
-    <div class="connection-display border">
-        <img th:src="@{/server.png}" alt="ETL-Processor" />
-        <span class="connection" th:classappend="${gIcsConnectionAvailable.available ? 'available' : ''}"></span>
-        <img th:src="@{/server.png}" alt="gICS" />
-        <span>ETL-Processor</span>
-        <span></span>
-        <span>gICS</span>
-    </div>
-</th:block>

src/main/resources/templates/configs/gPasConnectionAvailable.html

@@ -2,20 +2,15 @@
     <h2><span>🟦</span> gPAS nicht konfiguriert - Patienten-IDs werden intern anonymisiert</h2>
 </th:block>
 <th:block th:if="${gPasConnectionAvailable != null}">
-    <h2><span th:if="${gPasConnectionAvailable.available}">✅</span><span th:if="${not(gPasConnectionAvailable.available)}">⚡</span> Verbindung zu gPAS</h2>
+    <h2><span th:if="${gPasConnectionAvailable}">✅</span><span th:if="${not(gPasConnectionAvailable)}">⚡</span> Verbindung zu gPAS</h2>
     <div>
-        Stand: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(gPasConnectionAvailable.timestamp)}" th:text="${#temporals.formatISO(gPasConnectionAvailable.timestamp)}"></time>
+        Die Verbindung ist aktuell
-        &nbsp;|&nbsp;
+        <strong th:if="${gPasConnectionAvailable}" style="color: green">verfügbar.</strong>
-        Letzte Änderung: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(gPasConnectionAvailable.lastChange)}" th:text="${#temporals.formatISO(gPasConnectionAvailable.lastChange)}"></time>
+        <strong th:if="${not(gPasConnectionAvailable)}" style="color: red">nicht verfügbar.</strong>
-    </div>
-    <div>
-        <span>Die Verbindung ist aktuell</span>
-        <strong th:if="${gPasConnectionAvailable.available}" style="color: green">verfügbar.</strong>
-        <strong th:if="${not(gPasConnectionAvailable.available)}" style="color: red">nicht verfügbar.</strong>
     </div>
     <div class="connection-display border">
         <img th:src="@{/server.png}" alt="ETL-Processor" />
-        <span class="connection" th:classappend="${gPasConnectionAvailable.available ? 'available' : ''}"></span>
+        <span class="connection" th:classappend="${gPasConnectionAvailable ? 'available' : ''}"></span>
         <img th:src="@{/server.png}" alt="gPAS" />
         <span>ETL-Processor</span>
         <span></span>

src/main/resources/templates/configs/outputConnectionAvailable.html

@@ -1,27 +1,16 @@
-<th:block th:if="${outputConnectionAvailable == null}">
+<h2><span th:if="${outputConnectionAvailable}">✅</span><span th:if="${not(outputConnectionAvailable)}">⚡</span> MTB-File Verbindung</h2>
-    <h2><span>🟦</span> Keine Ausgabenkonfiguration</h2>
+<div>
-</th:block>
+    Verbindung über <code>[[ ${mtbFileSender} ]]</code>. Die Verbindung ist aktuell
-<th:block th:if="${outputConnectionAvailable != null}">
+    <strong th:if="${outputConnectionAvailable}" style="color: green">verfügbar.</strong>
-    <h2><span th:if="${outputConnectionAvailable.available}">✅</span><span th:if="${not(outputConnectionAvailable.available)}">⚡</span> MTB-File Verbindung</h2>
+    <strong th:if="${not(outputConnectionAvailable)}" style="color: red">nicht verfügbar.</strong>
-    <div>
+</div>
-        Stand: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(outputConnectionAvailable.timestamp)}" th:text="${#temporals.formatISO(outputConnectionAvailable.timestamp)}"></time>
+<div class="connection-display border">
-        &nbsp;|&nbsp;
+    <img th:src="@{/server.png}" alt="ETL-Processor" />
-        Letzte Änderung: <time style="font-weight: bold" th:datetime="${#temporals.formatISO(outputConnectionAvailable.lastChange)}" th:text="${#temporals.formatISO(outputConnectionAvailable.lastChange)}"></time>
+    <span class="connection" th:classappend="${outputConnectionAvailable ? 'available' : ''}"></span>
-    </div>
+    <img th:if="${mtbFileSender.startsWith('Rest')}" th:src="@{/server.png}" alt="bwHC-Backend" />
-    <div>
+    <img th:if="${mtbFileSender.startsWith('Kafka')}" th:src="@{/kafka.png}" alt="Kafka-Broker" />
-        Verbindung über <code>[[ ${mtbFileSender} ]]</code>. Die Verbindung ist aktuell
+    <span>ETL-Processor</span>
-        <strong th:if="${outputConnectionAvailable.available}" style="color: green">verfügbar.</strong>
+    <span></span>
-        <strong th:if="${not(outputConnectionAvailable.available)}" style="color: red">nicht verfügbar.</strong>
+    <span th:if="${mtbFileSender.startsWith('Rest')}">bwHC-Backend</span>
-    </div>
+    <span th:if="${mtbFileSender.startsWith('Kafka')}">Kafka-Broker</span>
-    <div class="connection-display border">
+</div>
-        <img th:src="@{/server.png}" alt="ETL-Processor" />
-        <span class="connection" th:classappend="${outputConnectionAvailable.available ? 'available' : ''}"></span>
-        <img th:if="${mtbFileSender.startsWith('Rest')}" th:src="@{/server.png}" alt="bwHC-Backend" />
-        <img th:if="${mtbFileSender.startsWith('Kafka')}" th:src="@{/kafka.png}" alt="Kafka-Broker" />
-        <span>ETL-Processor</span>
-        <span></span>
-        <span th:if="${mtbFileSender.startsWith('RestBwhc')}">bwHC-Backend</span>
-        <span th:if="${mtbFileSender.startsWith('RestDip')}">DNPM:DIP-Backend</span>
-        <span th:if="${mtbFileSender.startsWith('Kafka')}">Kafka-Broker</span>
-    </div>
-</th:block>

src/main/resources/templates/index.html

@@ -12,30 +12,26 @@
         <h1>Alle Anfragen<a id="reload-notify" class="reload" title="Neue Anfragen" th:href="@{/}">⟳</a></h1>
 
         <div>
-            <h2 th:if="${patientPseudonym != null}">
+            <h2 th:if="${patientId != null}">
-                Betreffend Patienten-Pseudonym <span class="monospace" th:text="${patientPseudonym}">***</span>
+                Betreffend Patienten-Pseudonym <span class="monospace" th:text="${patientId}">***</span>
-                <a class="btn btn-blue" th:if="${patientPseudonym != null}" th:href="@{/}">Alle anzeigen</a>
+                <a class="btn btn-blue" th:if="${patientId != null}" th:href="@{/}">Alle anzeigen</a>
             </h2>
         </div>
 
-        <div class="border" th:if="${requests.totalElements == 0}">
+        <div class="border">
-            <div class="notification info">Noch keine Anfragen eingegangen</div>
+            <div th:if="${patientId == null}" class="page-control">
-        </div>
-
-        <div class="border" th:if="${requests.totalElements > 0}">
-            <div th:if="${patientPseudonym == null}" class="page-control">
                 <a id="first-page-link" th:href="@{/(page=${0})}" title="Zum Anfang: Taste W" th:if="${not requests.isFirst()}">&larrb;</a><a th:if="${requests.isFirst()}">&larrb;</a>
                 <a id="prev-page-link" th:href="@{/(page=${requests.getNumber() - 1})}" title="Seite zurück: Taste A" th:if="${not requests.isFirst()}">&larr;</a><a th:if="${requests.isFirst()}">&larr;</a>
                 <span>Seite [[ ${requests.getNumber() + 1} ]] von [[ ${requests.getTotalPages()} ]]</span>
                 <a id="next-page-link" th:href="@{/(page=${requests.getNumber() + 1})}" title="Seite vor: Taste D" th:if="${not requests.isLast()}">&rarr;</a><a th:if="${requests.isLast()}">&rarr;</a>
                 <a id="last-page-link" th:href="@{/(page=${requests.getTotalPages() - 1})}" title="Zum Ende: Taste S" th:if="${not requests.isLast()}">&rarrb;</a><a th:if="${requests.isLast()}">&rarrb;</a>
             </div>
-            <div th:if="${patientPseudonym != null}" class="page-control">
+            <div th:if="${patientId != null}" class="page-control">
-                <a id="first-page-link" th:href="@{/patient/{patientPseudonym}(patientPseudonym=${patientPseudonym},page=${0})}" title="Zum Anfang: Taste W" th:if="${not requests.isFirst()}">&larrb;</a><a th:if="${requests.isFirst()}">&larrb;</a>
+                <a id="first-page-link" th:href="@{/patient/{patientId}(patientId=${patientId},page=${0})}" title="Zum Anfang: Taste W" th:if="${not requests.isFirst()}">&larrb;</a><a th:if="${requests.isFirst()}">&larrb;</a>
-                <a id="prev-page-link" th:href="@{/patient/{patientPseudonym}(patientPseudonym=${patientPseudonym},page=${requests.getNumber() - 1})}" title="Seite zurück: Taste A" th:if="${not requests.isFirst()}">&larr;</a><a th:if="${requests.isFirst()}">&larr;</a>
+                <a id="prev-page-link" th:href="@{/patient/{patientId}(patientId=${patientId},page=${requests.getNumber() - 1})}" title="Seite zurück: Taste A" th:if="${not requests.isFirst()}">&larr;</a><a th:if="${requests.isFirst()}">&larr;</a>
                 <span>Seite [[ ${requests.getNumber() + 1} ]] von [[ ${requests.getTotalPages()} ]]</span>
-                <a id="next-page-link" th:href="@{/patient/{patientPseudonym}(patientPseudonym=${patientPseudonym},page=${requests.getNumber() + 1})}" title="Seite vor: Taste D" th:if="${not requests.isLast()}">&rarr;</a><a th:if="${requests.isLast()}">&rarr;</a>
+                <a id="next-page-link" th:href="@{/patient/{patientId}(patientId=${patientId},page=${requests.getNumber() + 1})}" title="Seite vor: Taste D" th:if="${not requests.isLast()}">&rarr;</a><a th:if="${requests.isLast()}">&rarr;</a>
-                <a id="last-page-link" th:href="@{/patient/{patientPseudonym}(patientPseudonym=${patientPseudonym},page=${requests.getTotalPages() - 1})}" title="Zum Ende: Taste S" th:if="${not requests.isLast()}">&rarrb;</a><a th:if="${requests.isLast()}">&rarrb;</a>
+                <a id="last-page-link" th:href="@{/patient/{patientId}(patientId=${patientId},page=${requests.getTotalPages() - 1})}" title="Zum Ende: Taste S" th:if="${not requests.isLast()}">&rarrb;</a><a th:if="${requests.isLast()}">&rarrb;</a>
             </div>
             <table class="paged">
                 <thead>
@@ -61,11 +57,11 @@
                             <th:block sec:authorize="not (hasRole('USER') or hasRole('ADMIN'))">[[ ${request.uuid} ]]</th:block>
                         </td>
                         <td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
-                        <td class="patient-id" th:if="${patientPseudonym != null}" sec:authorize="hasRole('USER') or hasRole('ADMIN')">
+                        <td class="patient-id" th:if="${patientId != null}" sec:authorize="hasRole('USER') or hasRole('ADMIN')">
-                            [[ ${request.patientPseudonym} ]]
+                            [[ ${request.patientId} ]]
                         </td>
-                        <td class="patient-id" th:if="${patientPseudonym == null}" sec:authorize="hasRole('USER') or hasRole('ADMIN')">
+                        <td class="patient-id" th:if="${patientId == null}" sec:authorize="hasRole('USER') or hasRole('ADMIN')">
-                            <a th:href="@{/patient/{pid}(pid=${request.patientPseudonym})}">[[ ${request.patientPseudonym} ]]</a>
+                            <a th:href="@{/patient/{pid}(pid=${request.patientId})}">[[ ${request.patientId} ]]</a>
                         </td>
                         <td class="patient-id" sec:authorize="not (hasRole('USER') or hasRole('ADMIN'))">***</td>
                     </tr>

src/main/resources/templates/report.html

@@ -31,7 +31,7 @@
                     <td th:style="${request.type.value == 'delete'} ? 'color: red;'"><small>[[ ${request.type} ]]</small></td>
                     <td>[[ ${request.uuid} ]]</td>
                     <td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
-                    <td class="patient-id" sec:authorize="authenticated">[[ ${request.patientPseudonym} ]]</td>
+                    <td class="patient-id" sec:authorize="authenticated">[[ ${request.patientId} ]]</td>
                     <td class="patient-id" sec:authorize="not authenticated">***</td>
                 </tr>
             </tbody>
@@ -47,7 +47,7 @@
             <thead>
                 <tr>
                     <th>Schweregrad</th>
-                    <th>Beschreibung und Pfad</th>
+                    <th>Beschreibung</th>
                 </tr>
             </thead>
             <tbody>
@@ -56,11 +56,7 @@
                 <td th:if="${issue.severity.value == 'warning'}" class="bg-yellow"><small>[[ ${issue.severity} ]]</small></td>
                 <td th:if="${issue.severity.value == 'error'}" class="bg-red"><small>[[ ${issue.severity} ]]</small></td>
                 <td th:if="${issue.severity.value == 'fatal'}" class="bg-red"><small>[[ ${issue.severity} ]]</small></td>
-                <td>
+                <td>[[ ${issue.message} ]]</td>
-                    <div class="issue-message">[[ ${issue.message} ]]</div>
-                    <div class="issue-path" th:if="${issue.path.isPresent()}">[[ ${issue.path.get()} ]]</div>
-                    <div class="issue-path" th:if="${issue.path.isEmpty()}"><i>Keine Angabe</i></div>
-                </td>
             </tr>
             </tbody>
         </table>

src/test/java/dev/dnpm/etl/processor/consent/GicsConsentServiceTest.java

@@ -1,181 +0,0 @@
-package dev.dnpm.etl.processor.consent;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import dev.dnpm.etl.processor.config.AppConfiguration;
-import dev.dnpm.etl.processor.config.AppFhirConfig;
-import dev.dnpm.etl.processor.config.GIcsConfigProperties;
-import org.hl7.fhir.r4.model.*;
-import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
-import org.hl7.fhir.r4.model.OperationOutcome.IssueType;
-import org.hl7.fhir.r4.model.OperationOutcome.OperationOutcomeIssueComponent;
-import org.hl7.fhir.r4.model.Parameters.ParametersParameterComponent;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
-import org.springframework.http.MediaType;
-import org.springframework.retry.support.RetryTemplate;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
-
-import java.time.Instant;
-import java.util.Date;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withServerError;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-
-@ContextConfiguration(classes = {AppConfiguration.class, ObjectMapper.class})
-@TestPropertySource(properties = {
-    "app.consent.service=gics",
-    "app.consent.gics.uri=http://localhost:8090/ttp-fhir/fhir/gics"
-})
-@RestClientTest
-class GicsConsentServiceTest {
-
-    static final String GICS_BASE_URI = "http://localhost:8090/ttp-fhir/fhir/gics";
-
-    MockRestServiceServer mockRestServiceServer;
-    AppFhirConfig appFhirConfig;
-    GIcsConfigProperties gIcsConfigProperties;
-
-    GicsConsentService gicsConsentService;
-
-    @BeforeEach
-    void setUp(
-        @Autowired AppFhirConfig appFhirConfig,
-        @Autowired GIcsConfigProperties gIcsConfigProperties
-    ) {
-        this.appFhirConfig = appFhirConfig;
-        this.gIcsConfigProperties = gIcsConfigProperties;
-
-        var restTemplate = new RestTemplate();
-
-        this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate);
-        this.gicsConsentService = new GicsConsentService(
-            this.gIcsConfigProperties,
-            RetryTemplate.builder().maxAttempts(1).build(),
-            restTemplate,
-            this.appFhirConfig
-        );
-    }
-
-    @Test
-    void shouldReturnTtpBroadConsentStatus() {
-        final Parameters consentedResponse = new Parameters()
-            .addParameter(
-                new ParametersParameterComponent()
-                    .setName("consented")
-                    .setValue(new BooleanType().setValue(true))
-            );
-
-        mockRestServiceServer
-            .expect(
-                requestTo(
-                    "http://localhost:8090/ttp-fhir/fhir/gics" + GicsConsentService.IS_CONSENTED_ENDPOINT)
-            )
-            .andRespond(
-                withSuccess(
-                    appFhirConfig.fhirContext().newJsonParser().encodeResourceToString(consentedResponse),
-                    MediaType.APPLICATION_JSON
-                )
-            );
-
-        var consentStatus = gicsConsentService.getTtpBroadConsentStatus("123456");
-        assertThat(consentStatus).isEqualTo(TtpConsentStatus.BROAD_CONSENT_GIVEN);
-    }
-
-    @Test
-    void shouldReturnRevokedConsent() {
-        final Parameters revokedResponse = new Parameters()
-            .addParameter(
-                new ParametersParameterComponent()
-                    .setName("consented")
-                    .setValue(new BooleanType().setValue(false))
-            );
-
-        mockRestServiceServer
-            .expect(
-                requestTo(
-                    "http://localhost:8090/ttp-fhir/fhir/gics" + GicsConsentService.IS_CONSENTED_ENDPOINT)
-            )
-            .andRespond(
-                withSuccess(
-                    appFhirConfig.fhirContext().newJsonParser().encodeResourceToString(revokedResponse),
-                    MediaType.APPLICATION_JSON)
-            );
-
-        var consentStatus = gicsConsentService.getTtpBroadConsentStatus("123456");
-        assertThat(consentStatus).isEqualTo(TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED);
-    }
-
-
-    @Test
-    void shouldReturnInvalidParameterResponse() {
-        final OperationOutcome responseWithErrorOutcome = new OperationOutcome()
-            .addIssue(
-                new OperationOutcomeIssueComponent()
-                    .setSeverity(IssueSeverity.ERROR)
-                    .setCode(IssueType.PROCESSING)
-                    .setDiagnostics("Invalid policy parameter...")
-            );
-
-        mockRestServiceServer
-            .expect(
-                requestTo(GICS_BASE_URI + GicsConsentService.IS_CONSENTED_ENDPOINT)
-            )
-            .andRespond(
-                withSuccess(
-                    appFhirConfig.fhirContext().newJsonParser().encodeResourceToString(responseWithErrorOutcome),
-                    MediaType.APPLICATION_JSON
-                )
-            );
-
-        var consentStatus = gicsConsentService.getTtpBroadConsentStatus("123456");
-        assertThat(consentStatus).isEqualTo(TtpConsentStatus.FAILED_TO_ASK);
-    }
-
-    @Test
-    void shouldReturnRequestError() {
-        mockRestServiceServer
-            .expect(
-                requestTo(GICS_BASE_URI + GicsConsentService.IS_CONSENTED_ENDPOINT)
-            )
-            .andRespond(
-                withServerError()
-            );
-
-        var consentStatus = gicsConsentService.getTtpBroadConsentStatus("123456");
-        assertThat(consentStatus).isEqualTo(TtpConsentStatus.FAILED_TO_ASK);
-    }
-
-    @Test
-    void buildRequestParameterCurrentPolicyStatesForPersonTest() {
-        String pid = "12345678";
-        var result = gicsConsentService
-            .buildRequestParameterCurrentPolicyStatesForPerson(
-                pid,
-                Date.from(Instant.now()),
-                ConsentDomain.MODELLVORHABEN_64E
-            );
-
-        assertThat(result.getParameter())
-            .as("should contain 3 parameter resources")
-            .hasSize(3);
-
-        assertThat(((StringType) result.getParameter("domain").getValue()).getValue())
-            .isEqualTo(
-                gIcsConfigProperties.getGenomDeConsentDomainName()
-            );
-
-        assertThat(((Identifier) result.getParameter("personIdentifier").getValue()).getValue())
-            .isEqualTo(
-                pid
-            );
-    }
-
-
-}

src/test/kotlin/dev/dnpm/etl/processor/consent/Dnpm21BasedConsentEvaluatorTest.kt

@@ -1,287 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.consent
-
-import dev.dnpm.etl.processor.ArgProvider
-import dev.pcvolkmer.mv64e.mtb.*
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.extension.ExtendWith
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.ArgumentsSource
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.Mock
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.whenever
-import java.time.Instant
-import java.util.*
-
-@ExtendWith(MockitoExtension::class)
-class Dnpm21BasedConsentEvaluatorTest {
-
-    @Nested
-    inner class WithGicsConsentEnabled {
-
-        lateinit var consentService: GicsConsentService
-        lateinit var consentEvaluator: ConsentEvaluator
-
-        @BeforeEach
-        fun setUp(
-            @Mock consentService: GicsConsentService
-        ) {
-            this.consentService = consentService
-            this.consentEvaluator = ConsentEvaluator(consentService)
-        }
-
-        @ParameterizedTest
-        @ArgumentsSource(WithGicsMtbFileProvider::class)
-        fun test(
-            mtbFile: Mtb,
-            ttpConsentStatus: TtpConsentStatus,
-            expectedConsentEvaluation: ConsentEvaluation
-        ) {
-            whenever(consentService.getTtpBroadConsentStatus(anyString())).thenReturn(
-                ttpConsentStatus
-            )
-            assertThat(consentEvaluator.check(mtbFile)).isEqualTo(expectedConsentEvaluation)
-        }
-    }
-
-    @Nested
-    inner class WithFileConsentOnly {
-
-        lateinit var consentService: MtbFileConsentService
-        lateinit var consentEvaluator: ConsentEvaluator
-
-        @BeforeEach
-        fun setUp() {
-            this.consentService = MtbFileConsentService()
-            this.consentEvaluator = ConsentEvaluator(consentService)
-        }
-
-        @ParameterizedTest
-        @ArgumentsSource(MtbFileProvider::class)
-        fun test(mtbFile: Mtb, expectedConsentEvaluation: ConsentEvaluation) {
-            assertThat(consentEvaluator.check(mtbFile)).isEqualTo(expectedConsentEvaluation)
-        }
-    }
-
-    // Util classes
-
-    class WithGicsMtbFileProvider : ArgProvider(
-        // Has file ModelProjectConsent and broad consent => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.BROAD_CONSENT_GIVEN,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_GIVEN, true)
-        ),
-        // Has file ModelProjectConsent and broad consent missing => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.BROAD_CONSENT_MISSING,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_MISSING, false)
-        ),
-        // Has file ModelProjectConsent and broad consent missing or rejected => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED, false)
-        ),
-        // Has file ModelProjectConsent and MV consent => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT, true)
-        ),
-        // Has file ModelProjectConsent and MV consent rejected => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.GENOM_DE_SEQUENCING_REJECTED,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_SEQUENCING_REJECTED, false)
-        ),
-        // Has file ModelProjectConsent and MV consent missing => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.GENOM_DE_CONSENT_MISSING,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_CONSENT_MISSING, false)
-        ),
-        // Has file ModelProjectConsent and no broad consent result => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.UNKNOWN_CHECK_FILE,
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, true)
-        ),
-        // Has file ModelProjectConsent and failed to ask => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            TtpConsentStatus.FAILED_TO_ASK,
-            ConsentEvaluation(TtpConsentStatus.FAILED_TO_ASK, false)
-        ),
-        // File ModelProjectConsent rejected and broad consent => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.BROAD_CONSENT_GIVEN,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_GIVEN, true)
-        ),
-        // File ModelProjectConsent rejected and broad consent missing => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.BROAD_CONSENT_MISSING,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_MISSING, false)
-        ),
-        // File ModelProjectConsent rejected and broad consent missing or rejected => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED,
-            ConsentEvaluation(TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED, false)
-        ),
-        // File ModelProjectConsent rejected and MV consent => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_CONSENT_SEQUENCING_PERMIT, true)
-        ),
-        // File ModelProjectConsent rejected and MV consent rejected => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.GENOM_DE_SEQUENCING_REJECTED,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_SEQUENCING_REJECTED, false)
-        ),
-        // File ModelProjectConsent rejected and MV consent missing => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.GENOM_DE_CONSENT_MISSING,
-            ConsentEvaluation(TtpConsentStatus.GENOM_DE_CONSENT_MISSING, false)
-        ),
-        // File ModelProjectConsent rejected and no broad consent result => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.UNKNOWN_CHECK_FILE,
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        ),
-        // File ModelProjectConsent rejected and failed to ask => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            TtpConsentStatus.FAILED_TO_ASK,
-            ConsentEvaluation(TtpConsentStatus.FAILED_TO_ASK, false)
-        )
-    ) {
-
-        companion object {
-            fun buildMtb(consentProvision: ConsentProvision): Mtb {
-                return Mtb.builder()
-                    .patient(
-                        Patient.builder().id("TEST_12345678")
-                            .birthDate(Date.from(Instant.parse("2000-08-08T12:34:56Z"))).gender(
-                                GenderCoding.builder().code(GenderCodingCode.MALE).build()
-                            ).build()
-                    )
-                    .metadata(
-                        MvhMetadata.builder().modelProjectConsent(
-                            ModelProjectConsent.builder().provisions(
-                                listOf(
-                                    Provision.builder().date(Date()).type(consentProvision)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                        ).build()
-                    )
-                    .episodesOfCare(
-                        listOf(
-                            MtbEpisodeOfCare.builder().id("1")
-                                .patient(Reference.builder().id("TEST_12345678").build())
-                                .build()
-                        )
-                    )
-                    .build()
-            }
-        }
-    }
-
-    class MtbFileProvider : ArgProvider(
-        // Has file consent => consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.PERMIT),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, true)
-        ),
-        // File consent rejected => no consent given
-        Arguments.of(
-            buildMtb(ConsentProvision.DENY),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        ),
-        // policy REIDENTIFICATION has no effect on ConsentEvaluation
-        Arguments.of(
-            buildMtb(ModelProjectConsentPurpose.REIDENTIFICATION, ConsentProvision.DENY),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        ), Arguments.of(
-            buildMtb(ModelProjectConsentPurpose.REIDENTIFICATION, ConsentProvision.PERMIT),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        ),
-        // policy CASE_IDENTIFICATION has no effect on ConsentEvaluation
-        Arguments.of(
-            buildMtb(ModelProjectConsentPurpose.CASE_IDENTIFICATION, ConsentProvision.DENY),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        ), Arguments.of(
-            buildMtb(ModelProjectConsentPurpose.CASE_IDENTIFICATION, ConsentProvision.PERMIT),
-            ConsentEvaluation(TtpConsentStatus.UNKNOWN_CHECK_FILE, false)
-        )
-    ) {
-
-        companion object {
-            fun buildMtb(consentProvision: ConsentProvision): Mtb {
-                return buildMtb(ModelProjectConsentPurpose.SEQUENCING, consentProvision)
-            }
-
-            fun buildMtb(
-                policy: ModelProjectConsentPurpose,
-                consentProvision: ConsentProvision
-            ): Mtb {
-                return Mtb.builder()
-                    .patient(
-                        Patient.builder().id("TEST_12345678")
-                            .birthDate(Date.from(Instant.parse("2000-08-08T12:34:56Z"))).gender(
-                                GenderCoding.builder().code(GenderCodingCode.MALE).build()
-                            ).build()
-                    )
-                    .metadata(
-                        MvhMetadata.builder().modelProjectConsent(
-                            ModelProjectConsent.builder().provisions(
-                                listOf(
-                                    Provision.builder().date(Date()).type(consentProvision)
-                                        .purpose(policy).build()
-                                )
-                            ).build()
-                        ).build()
-                    )
-                    .episodesOfCare(
-                        listOf(
-                            MtbEpisodeOfCare.builder().id("1")
-                                .patient(Reference.builder().id("TEST_12345678").build())
-                                .build()
-                        )
-                    )
-                    .build()
-            }
-        }
-    }
-
-}

src/test/kotlin/dev/dnpm/etl/processor/helpers.kt

@@ -1,31 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor
-
-import org.junit.jupiter.api.extension.ExtensionContext
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.ArgumentsProvider
-import java.util.stream.Stream
-
-open class ArgProvider(vararg val data: Arguments) : ArgumentsProvider {
-    override fun provideArguments(
-        context: ExtensionContext?
-    ): Stream<out Arguments> = Stream.of(*data)
-}

src/test/kotlin/dev/dnpm/etl/processor/input/KafkaInputListenerTest.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,12 +20,10 @@
 package dev.dnpm.etl.processor.input
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.CustomMediaType
+import de.ukw.ccc.bwhc.dto.Consent
-import dev.dnpm.etl.processor.consent.ConsentEvaluation
+import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
+import de.ukw.ccc.bwhc.dto.Patient
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.pcvolkmer.mv64e.mtb.*
 import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.apache.kafka.common.header.internals.RecordHeader
 import org.apache.kafka.common.header.internals.RecordHeaders
@@ -33,270 +31,82 @@ import org.apache.kafka.common.record.TimestampType
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.*
+import org.mockito.kotlin.any
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
 import java.util.*
 
 @ExtendWith(MockitoExtension::class)
 class KafkaInputListenerTest {
 
     private lateinit var requestProcessor: RequestProcessor
-    private lateinit var consentEvaluator: ConsentEvaluator
     private lateinit var objectMapper: ObjectMapper
-
     private lateinit var kafkaInputListener: KafkaInputListener
 
     @BeforeEach
     fun setup(
-        @Mock requestProcessor: RequestProcessor,
+        @Mock requestProcessor: RequestProcessor
-        @Mock consentEvaluator: ConsentEvaluator,
     ) {
         this.requestProcessor = requestProcessor
-        this.consentEvaluator = consentEvaluator
         this.objectMapper = ObjectMapper()
 
-        this.kafkaInputListener = KafkaInputListener(requestProcessor, consentEvaluator, objectMapper)
+        this.kafkaInputListener = KafkaInputListener(requestProcessor, objectMapper)
     }
 
     @Test
     fun shouldProcessMtbFileRequest() {
-        whenever(consentEvaluator.check(any())).thenReturn(
+        val mtbFile = MtbFile.builder()
-            ConsentEvaluation(
+            .withPatient(Patient.builder().withId("DUMMY_12345678").build())
-                TtpConsentStatus.BROAD_CONSENT_GIVEN,
+            .withConsent(Consent.builder().withStatus(Consent.Status.ACTIVE).build())
-                true
-            )
-        )
-
-        val mtbFile = Mtb.builder()
-            .patient(Patient.builder().id("DUMMY_12345678").build())
-            .metadata(
-                MvhMetadata
-                    .builder()
-                    .modelProjectConsent(
-                        ModelProjectConsent
-                            .builder()
-                            .provisions(
-                                listOf(
-                                    Provision.builder().type(ConsentProvision.PERMIT)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                    )
-                    .build()
-            )
             .build()
 
-        kafkaInputListener.onMessage(
+        kafkaInputListener.onMessage(ConsumerRecord("testtopic", 0, 0, "", this.objectMapper.writeValueAsString(mtbFile)))
-            ConsumerRecord(
-                "testtopic",
-                0,
-                0,
-                "",
-                this.objectMapper.writeValueAsString(mtbFile)
-            )
-        )
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
+        verify(requestProcessor, times(1)).processMtbFile(any())
     }
 
     @Test
     fun shouldProcessDeleteRequest() {
-        whenever(consentEvaluator.check(any())).thenReturn(
+        val mtbFile = MtbFile.builder()
-            ConsentEvaluation(
+            .withPatient(Patient.builder().withId("DUMMY_12345678").build())
-                TtpConsentStatus.BROAD_CONSENT_GIVEN,
+            .withConsent(Consent.builder().withStatus(Consent.Status.REJECTED).build())
-                false
-            )
-        )
-
-        val mtbFile = Mtb.builder()
-            .patient(Patient.builder().id("DUMMY_12345678").build())
-            .metadata(
-                MvhMetadata
-                    .builder()
-                    .modelProjectConsent(
-                        ModelProjectConsent
-                            .builder()
-                            .provisions(
-                                listOf(
-                                    Provision.builder().type(ConsentProvision.DENY)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                    )
-                    .build()
-            )
             .build()
 
-        kafkaInputListener.onMessage(
+        kafkaInputListener.onMessage(ConsumerRecord("testtopic", 0, 0, "", this.objectMapper.writeValueAsString(mtbFile)))
-            ConsumerRecord(
-                "testtopic",
-                0,
-                0,
-                "",
-                this.objectMapper.writeValueAsString(mtbFile)
-            )
-        )
 
-        verify(requestProcessor, times(1)).processDeletion(
+        verify(requestProcessor, times(1)).processDeletion(anyString())
-            anyValueClass(),
-            eq(TtpConsentStatus.UNKNOWN_CHECK_FILE)
-        )
     }
 
     @Test
     fun shouldProcessMtbFileRequestWithExistingRequestId() {
-        whenever(consentEvaluator.check(any())).thenReturn(
+        val mtbFile = MtbFile.builder()
-            ConsentEvaluation(
+            .withPatient(Patient.builder().withId("DUMMY_12345678").build())
-                TtpConsentStatus.BROAD_CONSENT_GIVEN,
+            .withConsent(Consent.builder().withStatus(Consent.Status.ACTIVE).build())
-                true
-            )
-        )
-
-        val mtbFile = Mtb.builder()
-            .patient(Patient.builder().id("DUMMY_12345678").build())
-            .metadata(
-                MvhMetadata
-                    .builder()
-                    .modelProjectConsent(
-                        ModelProjectConsent
-                            .builder()
-                            .provisions(
-                                listOf(
-                                    Provision.builder().type(ConsentProvision.PERMIT)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                    )
-                    .build()
-            )
             .build()
 
         val headers = RecordHeaders(listOf(RecordHeader("requestId", UUID.randomUUID().toString().toByteArray())))
         kafkaInputListener.onMessage(
-            ConsumerRecord(
+            ConsumerRecord("testtopic", 0, 0, -1L, TimestampType.NO_TIMESTAMP_TYPE, -1, -1, "", this.objectMapper.writeValueAsString(mtbFile), headers, Optional.empty())
-                "testtopic",
-                0,
-                0,
-                -1L,
-                TimestampType.NO_TIMESTAMP_TYPE,
-                -1,
-                -1,
-                "",
-                this.objectMapper.writeValueAsString(mtbFile),
-                headers,
-                Optional.empty()
-            )
         )
 
-        verify(requestProcessor, times(1)).processMtbFile(any<Mtb>(), anyValueClass())
+        verify(requestProcessor, times(1)).processMtbFile(any(), anyString())
     }
 
     @Test
     fun shouldProcessDeleteRequestWithExistingRequestId() {
-        whenever(consentEvaluator.check(any())).thenReturn(
+        val mtbFile = MtbFile.builder()
-            ConsentEvaluation(
+            .withPatient(Patient.builder().withId("DUMMY_12345678").build())
-                TtpConsentStatus.BROAD_CONSENT_GIVEN,
+            .withConsent(Consent.builder().withStatus(Consent.Status.REJECTED).build())
-                false
-            )
-        )
-
-        val mtbFile = Mtb.builder()
-            .patient(Patient.builder().id("DUMMY_12345678").build())
-            .metadata(
-                MvhMetadata
-                    .builder()
-                    .modelProjectConsent(
-                        ModelProjectConsent
-                            .builder()
-                            .provisions(
-                                listOf(
-                                    Provision.builder().type(ConsentProvision.DENY)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                    )
-                    .build()
-            )
             .build()
 
         val headers = RecordHeaders(listOf(RecordHeader("requestId", UUID.randomUUID().toString().toByteArray())))
         kafkaInputListener.onMessage(
-            ConsumerRecord(
+            ConsumerRecord("testtopic", 0, 0, -1L, TimestampType.NO_TIMESTAMP_TYPE, -1, -1, "", this.objectMapper.writeValueAsString(mtbFile), headers, Optional.empty())
-                "testtopic",
-                0,
-                0,
-                -1L,
-                TimestampType.NO_TIMESTAMP_TYPE,
-                -1,
-                -1,
-                "",
-                this.objectMapper.writeValueAsString(mtbFile),
-                headers,
-                Optional.empty()
-            )
-        )
-        verify(requestProcessor, times(1)).processDeletion(
-            anyValueClass(), anyValueClass(), eq(
-                TtpConsentStatus.UNKNOWN_CHECK_FILE
-            )
-        )
-    }
-
-    @Test
-    fun shouldProcessDnpmV2Request() {
-        whenever(consentEvaluator.check(any())).thenReturn(
-            ConsentEvaluation(
-                TtpConsentStatus.BROAD_CONSENT_GIVEN,
-                false
-            )
-        )
-
-        val mtbFile = Mtb.builder()
-            .patient(Patient.builder().id("DUMMY_12345678").build())
-            .metadata(
-                MvhMetadata
-                    .builder()
-                    .modelProjectConsent(
-                        ModelProjectConsent
-                            .builder()
-                            .provisions(
-                                listOf(
-                                    Provision.builder().type(ConsentProvision.DENY)
-                                        .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                                )
-                            ).build()
-                    )
-                    .build()
-            )
-            .build()
-
-        val headers = RecordHeaders(
-            listOf(
-                RecordHeader("requestId", UUID.randomUUID().toString().toByteArray()),
-                RecordHeader("contentType", CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE.toByteArray())
-            )
-        )
-        kafkaInputListener.onMessage(
-            ConsumerRecord(
-                "testtopic",
-                0,
-                0,
-                -1L,
-                TimestampType.NO_TIMESTAMP_TYPE,
-                -1,
-                -1,
-                "",
-                this.objectMapper.writeValueAsString(mtbFile),
-                headers,
-                Optional.empty()
-            )
-        )
-        verify(requestProcessor, times(1)).processDeletion(
-            anyValueClass(), anyValueClass(), eq(
-                TtpConsentStatus.UNKNOWN_CHECK_FILE
-            )
         )
+        verify(requestProcessor, times(1)).processDeletion(anyString(), anyString())
     }
 
 }

src/test/kotlin/dev/dnpm/etl/processor/input/MtbFileRestControllerTest.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,207 +20,131 @@
 package dev.dnpm.etl.processor.input
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.ArgProvider
+import de.ukw.ccc.bwhc.dto.*
-import dev.dnpm.etl.processor.CustomMediaType
-import dev.dnpm.etl.processor.consent.ConsentEvaluation
-import dev.dnpm.etl.processor.consent.ConsentEvaluator
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.services.RequestProcessor
-import dev.pcvolkmer.mv64e.mtb.*
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.ArgumentsSource
 import org.mockito.Mock
 import org.mockito.Mockito.times
 import org.mockito.Mockito.verify
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.any
-import org.mockito.kotlin.anyValueClass
+import org.mockito.kotlin.argumentCaptor
-import org.mockito.kotlin.whenever
+import org.springframework.http.MediaType
-import org.springframework.core.io.ClassPathResource
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.delete
 import org.springframework.test.web.servlet.post
 import org.springframework.test.web.servlet.setup.MockMvcBuilders
-import java.time.Instant
-import java.util.*
 
 @ExtendWith(MockitoExtension::class)
 class MtbFileRestControllerTest {
 
+    private lateinit var mockMvc: MockMvc
+
+    private lateinit var requestProcessor: RequestProcessor
+
     private val objectMapper = ObjectMapper()
 
-    @Nested
+    @BeforeEach
-    inner class RequestsForDnpmDataModel21 {
+    fun setup(
-
+        @Mock requestProcessor: RequestProcessor
-        private lateinit var mockMvc: MockMvc
+    ) {
-
+        this.requestProcessor = requestProcessor
-        private lateinit var requestProcessor: RequestProcessor
+        val controller = MtbFileRestController(requestProcessor)
-        private lateinit var consentEvaluator: ConsentEvaluator
+        this.mockMvc = MockMvcBuilders.standaloneSetup(controller).build()
-
-        @BeforeEach
-        fun setup(
-            @Mock requestProcessor: RequestProcessor,
-            @Mock consentEvaluator: ConsentEvaluator
-        ) {
-            this.requestProcessor = requestProcessor
-            this.consentEvaluator = consentEvaluator
-            val controller = MtbFileRestController(
-                requestProcessor,
-                consentEvaluator
-            )
-            this.mockMvc = MockMvcBuilders.standaloneSetup(controller).build()
-        }
-
-        @Test
-        fun shouldRespondPostRequest() {
-            whenever(consentEvaluator.check(any())).thenReturn(
-                ConsentEvaluation(
-                    TtpConsentStatus.BROAD_CONSENT_GIVEN,
-                    true
-                )
-            )
-
-            val mtbFileContent =
-                ClassPathResource("mv64e-mtb-fake-patient.json").inputStream.readAllBytes().toString(Charsets.UTF_8)
-
-            mockMvc.post("/mtb") {
-                content = mtbFileContent
-                contentType = CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON
-            }.andExpect {
-                status {
-                    isAccepted()
-                }
-            }
-
-            verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
-        }
-
-        @ParameterizedTest
-        @ArgumentsSource(Dnpm21MtbFile::class)
-        fun shouldProcessPostRequest(mtb: Mtb, broadConsent: TtpConsentStatus, shouldProcess: String) {
-            whenever(consentEvaluator.check(any<Mtb>())).thenReturn(
-                ConsentEvaluation(
-                    broadConsent,
-                    shouldProcess == "process"
-                )
-            )
-
-            mockMvc.post("/mtbfile") {
-                content = objectMapper.writeValueAsString(mtb)
-                contentType = CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON
-            }.andExpect {
-                status {
-                    isAccepted()
-                }
-            }
-
-            if (shouldProcess == "process") {
-                verify(requestProcessor, times(1)).processMtbFile(any<Mtb>())
-            } else {
-                verify(requestProcessor, times(1)).processDeletion(
-                    anyValueClass(),
-                    org.mockito.kotlin.eq(broadConsent)
-                )
-            }
-        }
-
-        @Test
-        fun shouldProcessDeleteRequest() {
-            mockMvc.delete("/mtbfile/TEST_12345678").andExpect {
-                status {
-                    isAccepted()
-                }
-            }
-
-            verify(requestProcessor, times(1)).processDeletion(
-                anyValueClass(),
-                org.mockito.kotlin.eq(TtpConsentStatus.UNKNOWN_CHECK_FILE)
-            )
-            verify(consentEvaluator, times(0)).check(any<Mtb>())
-        }
     }
-}
 
-class Dnpm21MtbFile : ArgProvider(
+    @Test
-    // No Metadata and no broad consent => delete
+    fun shouldProcessMtbFilePostRequest() {
-    Arguments.of(
+        val mtbFile = MtbFile.builder()
-        buildMtb(null),
+            .withPatient(
-        TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED,
+                Patient.builder()
-        "delete"
+                    .withId("TEST_12345678")
-    ),
+                    .withBirthDate("2000-08-08")
-    // No Metadata and broad consent given => process
+                    .withGender(Patient.Gender.MALE)
-    Arguments.of(
+                    .build()
-        buildMtb(null),
+            )
-        TtpConsentStatus.BROAD_CONSENT_GIVEN,
+            .withConsent(
-        "process"
+                Consent.builder()
-    ),
+                    .withId("1")
-    // No model project consent and no broad consent => delete
+                    .withStatus(Consent.Status.ACTIVE)
-    Arguments.of(
+                    .withPatient("TEST_12345678")
-        buildMtb(MvhMetadata.builder().modelProjectConsent(ModelProjectConsent.builder().build()).build()),
+                    .build()
-        TtpConsentStatus.BROAD_CONSENT_MISSING_OR_REJECTED,
+            )
-        "delete"
+            .withEpisode(
-    ),
+                Episode.builder()
-    // No model project consent and broad consent given => process
+                    .withId("1")
-    Arguments.of(
+                    .withPatient("TEST_12345678")
-        buildMtb(MvhMetadata.builder().modelProjectConsent(ModelProjectConsent.builder().build()).build()),
+                    .withPeriod(PeriodStart("2023-08-08"))
-        TtpConsentStatus.BROAD_CONSENT_GIVEN,
+                    .build()
-        "process"
+            )
-    ),
+            .build()
-    // Model project consent given and no broad consent => process
-    Arguments.of(
-        buildMtb(
-            MvhMetadata.builder().modelProjectConsent(
-                ModelProjectConsent.builder().provisions(
-                    listOf(
-                        Provision.builder().date(Date()).type(ConsentProvision.PERMIT)
-                            .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                    )
-                ).build()
-            ).build()
-        ),
-        TtpConsentStatus.UNKNOWN_CHECK_FILE,
-        "process"
-    ),
-    // Model project consent given and broad consent given => process
-    Arguments.of(
-        buildMtb(
-            MvhMetadata.builder().modelProjectConsent(
-                ModelProjectConsent.builder().provisions(
-                    listOf(
-                        Provision.builder().date(Date()).type(ConsentProvision.PERMIT)
-                            .purpose(ModelProjectConsentPurpose.SEQUENCING).build()
-                    )
-                ).build()
-            ).build()
-        ),
-        TtpConsentStatus.BROAD_CONSENT_GIVEN,
-        "process"
-    )
-) {
 
-    companion object {
+        mockMvc.post("/mtbfile") {
-        fun buildMtb(metadata: MvhMetadata?): Mtb {
+            content = objectMapper.writeValueAsString(mtbFile)
-            return Mtb.builder()
+            contentType = MediaType.APPLICATION_JSON
-                .patient(
+        }.andExpect {
-                    Patient.builder().id("TEST_12345678")
+            status {
-                        .birthDate(Date.from(Instant.parse("2000-08-08T12:34:56Z"))).gender(
+                isAccepted()
-                            GenderCoding.builder().code(GenderCodingCode.MALE).build()
+            }
-                        ).build()
-                )
-                .metadata(metadata)
-                .episodesOfCare(
-                    listOf(
-                        MtbEpisodeOfCare.builder().id("1")
-                            .patient(Reference.builder().id("TEST_12345678").build())
-                            .build()
-                    )
-                )
-                .build()
         }
+
+        verify(requestProcessor, times(1)).processMtbFile(any())
     }
+
+    @Test
+    fun shouldProcessMtbFilePostRequestWithRejectedConsent() {
+        val mtbFile = MtbFile.builder()
+            .withPatient(
+                Patient.builder()
+                    .withId("TEST_12345678")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
+                    .build()
+            )
+            .withConsent(
+                Consent.builder()
+                    .withId("1")
+                    .withStatus(Consent.Status.REJECTED)
+                    .withPatient("TEST_12345678")
+                    .build()
+            )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("TEST_12345678")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
+            )
+            .build()
+
+        mockMvc.post("/mtbfile") {
+            content = objectMapper.writeValueAsString(mtbFile)
+            contentType = MediaType.APPLICATION_JSON
+        }.andExpect {
+            status {
+                isAccepted()
+            }
+        }
+
+        val captor = argumentCaptor<String>()
+        verify(requestProcessor, times(1)).processDeletion(captor.capture())
+        assertThat(captor.firstValue).isEqualTo("TEST_12345678")
+    }
+
+    @Test
+    fun shouldProcessMtbFileDeleteRequest() {
+        mockMvc.delete("/mtbfile/TEST_12345678").andExpect {
+            status {
+                isAccepted()
+            }
+        }
+
+        val captor = argumentCaptor<String>()
+        verify(requestProcessor, times(1)).processDeletion(captor.capture())
+        assertThat(captor.firstValue).isEqualTo("TEST_12345678")
+    }
+
 }

src/test/kotlin/dev/dnpm/etl/processor/output/KafkaMtbFileSenderTest.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -20,20 +20,16 @@
 package dev.dnpm.etl.processor.output
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.CustomMediaType
+import de.ukw.ccc.bwhc.dto.*
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.RequestId
 import dev.dnpm.etl.processor.config.KafkaProperties
 import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.pcvolkmer.mv64e.mtb.*
-import org.apache.kafka.clients.producer.ProducerRecord
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.*
@@ -41,191 +37,181 @@ import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.kafka.support.SendResult
 import org.springframework.retry.policy.SimpleRetryPolicy
 import org.springframework.retry.support.RetryTemplateBuilder
-import java.time.Instant
-import java.util.*
 import java.util.concurrent.CompletableFuture.completedFuture
 import java.util.concurrent.ExecutionException
 
 @ExtendWith(MockitoExtension::class)
 class KafkaMtbFileSenderTest {
 
-    @Nested
+    private lateinit var kafkaTemplate: KafkaTemplate<String, String>
-    inner class BwhcV1Record {
 
-        private lateinit var kafkaTemplate: KafkaTemplate<String, String>
+    private lateinit var kafkaMtbFileSender: KafkaMtbFileSender
 
-        private lateinit var kafkaMtbFileSender: KafkaMtbFileSender
+    private lateinit var objectMapper: ObjectMapper
 
-        private lateinit var objectMapper: ObjectMapper
+    @BeforeEach
+    fun setup(
+        @Mock kafkaTemplate: KafkaTemplate<String, String>
+    ) {
+        val kafkaProperties = KafkaProperties("testtopic")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
 
-        @BeforeEach
+        this.objectMapper = ObjectMapper()
-        fun setup(
+        this.kafkaTemplate = kafkaTemplate
-            @Mock kafkaTemplate: KafkaTemplate<String, String>
-        ) {
-            val kafkaProperties = KafkaProperties("testtopic")
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
-
-            this.objectMapper = ObjectMapper()
-            this.kafkaTemplate = kafkaTemplate
-
-            this.kafkaMtbFileSender = KafkaMtbFileSender(kafkaTemplate, kafkaProperties, retryTemplate, objectMapper)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.KafkaMtbFileSenderTest#requestWithResponseSource")
-        fun shouldSendDeleteRequestAndReturnExpectedState(testData: TestData) {
-            doAnswer {
-                if (null != testData.exception) {
-                    throw testData.exception
-                }
-                completedFuture(SendResult<String, String>(null, null))
-            }.whenever(kafkaTemplate).send(any<ProducerRecord<String, String>>())
-
-            val response = kafkaMtbFileSender.send(DeleteRequest(TEST_REQUEST_ID, TEST_PATIENT_PSEUDONYM))
-            assertThat(response.status).isEqualTo(testData.requestStatus)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.KafkaMtbFileSenderTest#requestWithResponseSource")
-        fun shouldRetryOnDeleteKafkaSendError(testData: TestData) {
-            val kafkaProperties = KafkaProperties("testtopic")
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
-            this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaProperties, retryTemplate, this.objectMapper)
-
-            doAnswer {
-                if (null != testData.exception) {
-                    throw testData.exception
-                }
-                completedFuture(SendResult<String, String>(null, null))
-            }.whenever(kafkaTemplate).send(any<ProducerRecord<String, String>>())
-
-            kafkaMtbFileSender.send(DeleteRequest(TEST_REQUEST_ID, TEST_PATIENT_PSEUDONYM))
-
-            val expectedCount = when (testData.exception) {
-                // OK - No Retry
-                null -> times(1)
-                // Request failed - Retry max 3 times
-                else -> times(3)
-            }
-
-            verify(kafkaTemplate, expectedCount).send(any<ProducerRecord<String, String>>())
-        }
 
+        this.kafkaMtbFileSender = KafkaMtbFileSender(kafkaTemplate, kafkaProperties, retryTemplate, objectMapper)
     }
 
-    @Nested
+    @ParameterizedTest
-    inner class DnpmV2Record {
+    @MethodSource("requestWithResponseSource")
-
+    fun shouldSendMtbFileRequestAndReturnExpectedState(testData: TestData) {
-        private lateinit var kafkaTemplate: KafkaTemplate<String, String>
+        doAnswer {
-
+            if (null != testData.exception) {
-        private lateinit var kafkaMtbFileSender: KafkaMtbFileSender
+                throw testData.exception
-
-        private lateinit var objectMapper: ObjectMapper
-
-        @BeforeEach
-        fun setup(
-            @Mock kafkaTemplate: KafkaTemplate<String, String>
-        ) {
-            val kafkaProperties = KafkaProperties("testtopic")
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
-
-            this.objectMapper = ObjectMapper()
-            this.kafkaTemplate = kafkaTemplate
-
-            this.kafkaMtbFileSender = KafkaMtbFileSender(kafkaTemplate, kafkaProperties, retryTemplate, objectMapper)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.KafkaMtbFileSenderTest#requestWithResponseSource")
-        fun shouldSendMtbFileRequestAndReturnExpectedState(testData: TestData) {
-            doAnswer {
-                if (null != testData.exception) {
-                    throw testData.exception
-                }
-                completedFuture(SendResult<String, String>(null, null))
-            }.whenever(kafkaTemplate).send(any<ProducerRecord<String, String>>())
-
-            val response = kafkaMtbFileSender.send(DnpmV2MtbFileRequest(TEST_REQUEST_ID, dnpmV2MtbFile()))
-            assertThat(response.status).isEqualTo(testData.requestStatus)
-        }
-
-        @Test
-        fun shouldSendMtbFileRequestWithCorrectKeyAndHeaderAndBody() {
-            doAnswer {
-                completedFuture(SendResult<String, String>(null, null))
-            }.whenever(kafkaTemplate).send(any<ProducerRecord<String, String>>())
-
-            kafkaMtbFileSender.send(DnpmV2MtbFileRequest(TEST_REQUEST_ID, dnpmV2MtbFile()))
-
-            val captor = argumentCaptor<ProducerRecord<String, String>>()
-            verify(kafkaTemplate, times(1)).send(captor.capture())
-            assertThat(captor.firstValue.key()).isNotNull
-            assertThat(captor.firstValue.key()).isEqualTo("{\"pid\": \"PID\"}")
-            assertThat(captor.firstValue.headers().headers("contentType")).isNotNull
-            assertThat(captor.firstValue.headers().headers("contentType")?.firstOrNull()?.value()).isEqualTo(CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE.toByteArray())
-            assertThat(captor.firstValue.headers().headers("requestId")).isNotNull
-            assertThat(captor.firstValue.headers().headers("requestId")?.firstOrNull()?.value()).isEqualTo(TEST_REQUEST_ID.value.toByteArray())
-            assertThat(captor.firstValue.value()).isNotNull
-            assertThat(captor.firstValue.value()).isEqualTo(objectMapper.writeValueAsString(dnmpV2kafkaRecordData(TEST_REQUEST_ID)))
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.KafkaMtbFileSenderTest#requestWithResponseSource")
-        fun shouldRetryOnMtbFileKafkaSendError(testData: TestData) {
-            val kafkaProperties = KafkaProperties("testtopic")
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
-            this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaProperties, retryTemplate, this.objectMapper)
-
-            doAnswer {
-                if (null != testData.exception) {
-                    throw testData.exception
-                }
-                completedFuture(SendResult<String, String>(null, null))
-            }.whenever(kafkaTemplate).send(any<ProducerRecord<String, String>>())
-
-            kafkaMtbFileSender.send(DnpmV2MtbFileRequest(TEST_REQUEST_ID, dnpmV2MtbFile()))
-
-            val expectedCount = when (testData.exception) {
-                // OK - No Retry
-                null -> times(1)
-                // Request failed - Retry max 3 times
-                else -> times(3)
             }
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
 
-            verify(kafkaTemplate, expectedCount).send(any<ProducerRecord<String, String>>())
+        val response = kafkaMtbFileSender.send(MtbFileSender.MtbFileRequest("TestID", mtbFile(Consent.Status.ACTIVE)))
+        assertThat(response.status).isEqualTo(testData.requestStatus)
+    }
+
+    @ParameterizedTest
+    @MethodSource("requestWithResponseSource")
+    fun shouldSendDeleteRequestAndReturnExpectedState(testData: TestData) {
+        doAnswer {
+            if (null != testData.exception) {
+                throw testData.exception
+            }
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
+
+        val response = kafkaMtbFileSender.send(MtbFileSender.DeleteRequest("TestID", "PID"))
+        assertThat(response.status).isEqualTo(testData.requestStatus)
+    }
+
+    @Test
+    fun shouldSendMtbFileRequestWithCorrectKeyAndBody() {
+        doAnswer {
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
+
+        kafkaMtbFileSender.send(MtbFileSender.MtbFileRequest("TestID", mtbFile(Consent.Status.ACTIVE)))
+
+        val captor = argumentCaptor<String>()
+        verify(kafkaTemplate, times(1)).send(anyString(), captor.capture(), captor.capture())
+        assertThat(captor.firstValue).isNotNull
+        assertThat(captor.firstValue).isEqualTo("{\"pid\": \"PID\"}")
+        assertThat(captor.secondValue).isNotNull
+        assertThat(captor.secondValue).isEqualTo(objectMapper.writeValueAsString(kafkaRecordData("TestID", Consent.Status.ACTIVE)))
+    }
+
+    @Test
+    fun shouldSendDeleteRequestWithCorrectKeyAndBody() {
+        doAnswer {
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
+
+        kafkaMtbFileSender.send(MtbFileSender.DeleteRequest("TestID", "PID"))
+
+        val captor = argumentCaptor<String>()
+        verify(kafkaTemplate, times(1)).send(anyString(), captor.capture(), captor.capture())
+        assertThat(captor.firstValue).isNotNull
+        assertThat(captor.firstValue).isEqualTo("{\"pid\": \"PID\"}")
+        assertThat(captor.secondValue).isNotNull
+        assertThat(captor.secondValue).isEqualTo(objectMapper.writeValueAsString(kafkaRecordData("TestID", Consent.Status.REJECTED)))
+    }
+
+    @ParameterizedTest
+    @MethodSource("requestWithResponseSource")
+    fun shouldRetryOnMtbFileKafkaSendError(testData: TestData) {
+        val kafkaProperties = KafkaProperties("testtopic")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
+        this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaProperties, retryTemplate, this.objectMapper)
+
+        doAnswer {
+            if (null != testData.exception) {
+                throw testData.exception
+            }
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
+
+        kafkaMtbFileSender.send(MtbFileSender.MtbFileRequest("TestID", mtbFile(Consent.Status.ACTIVE)))
+
+        val expectedCount = when (testData.exception) {
+            // OK - No Retry
+            null -> times(1)
+            // Request failed - Retry max 3 times
+            else -> times(3)
         }
 
+        verify(kafkaTemplate, expectedCount).send(anyString(), anyString(), anyString())
+    }
+
+    @ParameterizedTest
+    @MethodSource("requestWithResponseSource")
+    fun shouldRetryOnDeleteKafkaSendError(testData: TestData) {
+        val kafkaProperties = KafkaProperties("testtopic")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
+        this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaProperties, retryTemplate, this.objectMapper)
+
+        doAnswer {
+            if (null != testData.exception) {
+                throw testData.exception
+            }
+            completedFuture(SendResult<String, String>(null, null))
+        }.whenever(kafkaTemplate).send(anyString(), anyString(), anyString())
+
+        kafkaMtbFileSender.send(MtbFileSender.DeleteRequest("TestID", "PID"))
+
+        val expectedCount = when (testData.exception) {
+            // OK - No Retry
+            null -> times(1)
+            // Request failed - Retry max 3 times
+            else -> times(3)
+        }
+
+        verify(kafkaTemplate, expectedCount).send(anyString(), anyString(), anyString())
     }
 
     companion object {
-        val TEST_REQUEST_ID = RequestId("TestId")
+        fun mtbFile(consentStatus: Consent.Status): MtbFile {
-        val TEST_PATIENT_PSEUDONYM = PatientPseudonym("PID")
+            return if (consentStatus == Consent.Status.ACTIVE) {
-
+                MtbFile.builder()
-        fun dnpmV2MtbFile(): Mtb {
+                    .withPatient(
-            return Mtb().apply {
+                        Patient.builder()
-                this.patient = dev.pcvolkmer.mv64e.mtb.Patient().apply {
+                            .withId("PID")
-                    this.id = "PID"
+                            .withBirthDate("2000-08-08")
-                    this.birthDate = Date.from(Instant.now())
+                            .withGender(Patient.Gender.MALE)
-                    this.gender = GenderCoding().apply {
+                            .build()
-                        this.code = GenderCodingCode.MALE
+                    )
-                    }
+                    .withConsent(
-                }
+                        Consent.builder()
-                this.episodesOfCare = listOf(
+                            .withId("1")
-                    MtbEpisodeOfCare().apply {
+                            .withStatus(consentStatus)
-                        this.id = "1"
+                            .withPatient("PID")
-                        this.patient = Reference().apply {
+                            .build()
-                            this.id = "PID"
+                    )
-                        }
+                    .withEpisode(
-                        this.period = PeriodDate().apply {
+                        Episode.builder()
-                            this.start = Date.from(Instant.now())
+                            .withId("1")
-                        }
+                            .withPatient("PID")
-                    }
+                            .withPeriod(PeriodStart("2023-08-08"))
-                )
+                            .build()
-            }
+                    )
+            } else {
+                MtbFile.builder()
+                    .withConsent(
+                        Consent.builder()
+                            .withStatus(consentStatus)
+                            .withPatient("PID")
+                            .build()
+                    )
+            }.build()
         }
 
-        fun dnmpV2kafkaRecordData(requestId: RequestId): MtbRequest {
+        fun kafkaRecordData(requestId: String, consentStatus: Consent.Status): KafkaMtbFileSender.Data {
-            return DnpmV2MtbFileRequest(requestId, dnpmV2MtbFile())
+            return KafkaMtbFileSender.Data(requestId, mtbFile(consentStatus))
         }
 
         data class TestData(val requestStatus: RequestStatus, val exception: Throwable? = null)

src/test/kotlin/dev/dnpm/etl/processor/output/RestDipMtbFileSenderTest.kt

@@ -1,313 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.output
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
-import dev.dnpm.etl.processor.CustomMediaType
-import dev.dnpm.etl.processor.PatientPseudonym
-import dev.dnpm.etl.processor.RequestId
-import dev.dnpm.etl.processor.config.AppConfigProperties
-import dev.dnpm.etl.processor.config.AppConfiguration
-import dev.dnpm.etl.processor.config.RestTargetProperties
-import dev.dnpm.etl.processor.monitoring.ReportService
-import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.pcvolkmer.mv64e.mtb.*
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
-import org.springframework.http.HttpHeaders
-import org.springframework.http.HttpMethod
-import org.springframework.http.HttpStatus
-import org.springframework.http.MediaType
-import org.springframework.retry.backoff.NoBackOffPolicy
-import org.springframework.retry.policy.SimpleRetryPolicy
-import org.springframework.retry.support.RetryTemplateBuilder
-import org.springframework.test.web.client.ExpectedCount
-import org.springframework.test.web.client.MockRestServiceServer
-import org.springframework.test.web.client.match.MockRestRequestMatchers.*
-import org.springframework.test.web.client.response.MockRestResponseCreators.withStatus
-import org.springframework.web.client.RestTemplate
-import java.time.Instant
-import java.util.*
-
-class RestDipMtbFileSenderTest {
-
-    @Nested
-    inner class DnpmV2ContentRequest {
-
-        private lateinit var mockRestServiceServer: MockRestServiceServer
-
-        private lateinit var restMtbFileSender: RestMtbFileSender
-
-        private var reportService = ReportService(ObjectMapper().registerModule(KotlinModule.Builder().build()))
-
-        @BeforeEach
-        fun setup() {
-            val restTemplate = RestTemplate()
-            val restTargetProperties = RestTargetProperties("http://localhost:9000/api", null, null)
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
-
-            this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
-
-            this.restMtbFileSender = RestDipMtbFileSender(restTemplate, restTargetProperties, retryTemplate, reportService)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.RestDipMtbFileSenderTest#mtbFileRequestWithResponseSource")
-        fun shouldReturnExpectedResponseForDnpmV2MtbFilePost(requestWithResponse: RequestWithResponse) {
-            this.mockRestServiceServer
-                .expect(method(HttpMethod.POST))
-                .andExpect(requestTo("http://localhost:9000/api/mtb/etl/patient-record"))
-                .andExpect(header(HttpHeaders.CONTENT_TYPE, CustomMediaType.APPLICATION_VND_DNPM_V2_MTB_JSON_VALUE))
-                .andRespond {
-                    withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
-                }
-
-            val response = restMtbFileSender.send(DnpmV2MtbFileRequest(TEST_REQUEST_ID, dnpmV2MtbFile()))
-            assertThat(response.status).isEqualTo(requestWithResponse.response.status)
-            assertThat(response.body).isEqualTo(requestWithResponse.response.body)
-        }
-
-    }
-
-    @Nested
-    inner class DeleteRequest {
-
-        private lateinit var mockRestServiceServer: MockRestServiceServer
-
-        private lateinit var restMtbFileSender: RestMtbFileSender
-
-        private var reportService = ReportService(ObjectMapper().registerModule(KotlinModule.Builder().build()))
-
-        @BeforeEach
-        fun setup() {
-            val restTemplate = RestTemplate()
-            val restTargetProperties = RestTargetProperties("http://localhost:9000/api", null, null)
-            val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
-
-            this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
-
-            this.restMtbFileSender =
-                RestDipMtbFileSender(restTemplate, restTargetProperties, retryTemplate, reportService)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.RestDipMtbFileSenderTest#deleteRequestWithResponseSource")
-        fun shouldReturnExpectedResponseForDelete(requestWithResponse: RequestWithResponse) {
-            this.mockRestServiceServer
-                .expect(method(HttpMethod.DELETE))
-                .andExpect(requestTo("http://localhost:9000/api/mtb/etl/patient/${TEST_PATIENT_PSEUDONYM.value}"))
-                .andRespond {
-                    withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
-                }
-
-            val response = restMtbFileSender.send(DeleteRequest(TEST_REQUEST_ID, TEST_PATIENT_PSEUDONYM))
-            assertThat(response.status).isEqualTo(requestWithResponse.response.status)
-            assertThat(response.body).isEqualTo(requestWithResponse.response.body)
-        }
-
-        @ParameterizedTest
-        @MethodSource("dev.dnpm.etl.processor.output.RestDipMtbFileSenderTest#deleteRequestWithResponseSource")
-        fun shouldRetryOnDeleteHttpRequestError(requestWithResponse: RequestWithResponse) {
-            val restTemplate = RestTemplate()
-            val restTargetProperties = RestTargetProperties("http://localhost:9000/api", null, null)
-            val retryTemplate = AppConfiguration().retryTemplate(AppConfigProperties())
-            retryTemplate.setBackOffPolicy(NoBackOffPolicy())
-
-            this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
-            this.restMtbFileSender =
-                RestDipMtbFileSender(restTemplate, restTargetProperties, retryTemplate, reportService)
-
-            val expectedCount = when (requestWithResponse.httpStatus) {
-                // OK - No Retry
-                HttpStatus.OK, HttpStatus.CREATED, HttpStatus.UNPROCESSABLE_ENTITY, HttpStatus.BAD_REQUEST -> ExpectedCount.max(
-                    1
-                )
-                // Request failed - Retry max 3 times
-                else -> ExpectedCount.max(3)
-            }
-
-            this.mockRestServiceServer
-                .expect(expectedCount, method(HttpMethod.DELETE))
-                .andExpect(requestTo("http://localhost:9000/api/mtb/etl/patient/${TEST_PATIENT_PSEUDONYM.value}"))
-                .andRespond {
-                    withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
-                }
-
-            val response = restMtbFileSender.send(DeleteRequest(TEST_REQUEST_ID, TEST_PATIENT_PSEUDONYM))
-            assertThat(response.status).isEqualTo(requestWithResponse.response.status)
-            assertThat(response.body).isEqualTo(requestWithResponse.response.body)
-        }
-
-    }
-
-    companion object {
-        data class RequestWithResponse(
-            val httpStatus: HttpStatus,
-            val body: String,
-            val response: MtbFileSender.Response
-        )
-
-        val TEST_REQUEST_ID = RequestId("TestId")
-        val TEST_PATIENT_PSEUDONYM = PatientPseudonym("PID")
-
-        fun dnpmV2MtbFile(): Mtb {
-            return Mtb().apply {
-                this.patient = dev.pcvolkmer.mv64e.mtb.Patient().apply {
-                    this.id = "PID"
-                    this.birthDate = Date.from(Instant.now())
-                    this.gender = GenderCoding().apply {
-                        this.code = GenderCodingCode.MALE
-                    }
-                }
-                this.episodesOfCare = listOf(
-                    MtbEpisodeOfCare().apply {
-                        this.id = "1"
-                        this.patient = Reference().apply {
-                            this.id = "PID"
-                        }
-                        this.period = PeriodDate().apply {
-                            this.start = Date.from(Instant.now())
-                        }
-                    }
-                )
-            }
-        }
-
-        private const val ERROR_RESPONSE_BODY = "Sonstiger Fehler bei der Übertragung"
-
-        /**
-         * Synthetic http responses with related request status
-         * Also see: https://ibmi-intra.cs.uni-tuebingen.de/display/ZPM/bwHC+REST+API
-         */
-        @JvmStatic
-        fun mtbFileRequestWithResponseSource(): Set<RequestWithResponse> {
-            return setOf(
-                RequestWithResponse(
-                    HttpStatus.OK,
-                    responseBodyWithMaxSeverity(ReportService.Severity.INFO),
-                    MtbFileSender.Response(
-                        RequestStatus.SUCCESS,
-                        responseBodyWithMaxSeverity(ReportService.Severity.INFO)
-                    )
-                ),
-                RequestWithResponse(
-                    HttpStatus.CREATED,
-                    responseBodyWithMaxSeverity(ReportService.Severity.WARNING),
-                    MtbFileSender.Response(RequestStatus.WARNING, responseBodyWithMaxSeverity(ReportService.Severity.WARNING))
-                ),
-                RequestWithResponse(
-                    HttpStatus.BAD_REQUEST,
-                    responseBodyWithMaxSeverity(ReportService.Severity.ERROR),
-                    MtbFileSender.Response(RequestStatus.ERROR, responseBodyWithMaxSeverity(ReportService.Severity.ERROR))
-                ),
-                RequestWithResponse(
-                    HttpStatus.UNPROCESSABLE_ENTITY,
-                    responseBodyWithMaxSeverity(ReportService.Severity.ERROR),
-                    MtbFileSender.Response(RequestStatus.ERROR, responseBodyWithMaxSeverity(ReportService.Severity.ERROR))
-                ),
-                // Some more errors not mentioned in documentation
-                RequestWithResponse(
-                    HttpStatus.NOT_FOUND,
-                    ERROR_RESPONSE_BODY,
-                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
-                ),
-                RequestWithResponse(
-                    HttpStatus.INTERNAL_SERVER_ERROR,
-                    ERROR_RESPONSE_BODY,
-                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
-                )
-            )
-        }
-
-        /**
-         * Synthetic http responses with related request status
-         * Also see: https://ibmi-intra.cs.uni-tuebingen.de/display/ZPM/bwHC+REST+API
-         */
-        @JvmStatic
-        fun deleteRequestWithResponseSource(): Set<RequestWithResponse> {
-            return setOf(
-                RequestWithResponse(HttpStatus.OK, "", MtbFileSender.Response(RequestStatus.SUCCESS)),
-                // Some more errors not mentioned in documentation
-                RequestWithResponse(
-                    HttpStatus.NOT_FOUND,
-                    "what????",
-                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
-                ),
-                RequestWithResponse(
-                    HttpStatus.INTERNAL_SERVER_ERROR,
-                    "what????",
-                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
-                )
-            )
-        }
-
-        fun responseBodyWithMaxSeverity(severity: ReportService.Severity): String {
-            return when (severity) {
-                ReportService.Severity.INFO -> """
-                        {
-                            "patient": "PID",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" }
-                            ]
-                        }
-                    """
-
-                ReportService.Severity.WARNING -> """
-                        {
-                            "patient": "PID",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" }
-                            ]
-                        }
-                    """
-
-                ReportService.Severity.ERROR -> """
-                        {
-                            "patient": "PID",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" },
-                                { "severity": "error", "message": "Error Message" }
-                            ]
-                        }
-                    """
-
-                ReportService.Severity.FATAL -> """
-                        {
-                            "patient": "PID",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" },
-                                { "severity": "error", "message": "Error Message" },
-                                { "severity": "fatal", "message": "Fatal Message" }
-                            ]
-                        }
-                    """
-            }
-        }
-    }
-
-
-}

src/test/kotlin/dev/dnpm/etl/processor/output/RestMtbFileSenderTest.kt

@@ -0,0 +1,257 @@
+/*
+ * This file is part of ETL-Processor
+ *
+ * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.dnpm.etl.processor.output
+
+import de.ukw.ccc.bwhc.dto.*
+import dev.dnpm.etl.processor.config.RestTargetProperties
+import dev.dnpm.etl.processor.monitoring.RequestStatus
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.MethodSource
+import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import org.springframework.retry.policy.SimpleRetryPolicy
+import org.springframework.retry.support.RetryTemplateBuilder
+import org.springframework.test.web.client.ExpectedCount
+import org.springframework.test.web.client.MockRestServiceServer
+import org.springframework.test.web.client.match.MockRestRequestMatchers.method
+import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
+import org.springframework.test.web.client.response.MockRestResponseCreators.withStatus
+import org.springframework.web.client.RestTemplate
+
+class RestMtbFileSenderTest {
+
+    private lateinit var mockRestServiceServer: MockRestServiceServer
+
+    private lateinit var restMtbFileSender: RestMtbFileSender
+
+    @BeforeEach
+    fun setup() {
+        val restTemplate = RestTemplate()
+        val restTargetProperties = RestTargetProperties("http://localhost:9000/mtbfile")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
+
+        this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
+
+        this.restMtbFileSender = RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
+    }
+
+    @ParameterizedTest
+    @MethodSource("deleteRequestWithResponseSource")
+    fun shouldReturnExpectedResponseForDelete(requestWithResponse: RequestWithResponse) {
+        this.mockRestServiceServer.expect {
+            method(HttpMethod.DELETE)
+            requestTo("/mtbfile")
+        }.andRespond {
+            withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
+        }
+
+        val response = restMtbFileSender.send(MtbFileSender.DeleteRequest("TestID", "PID"))
+        assertThat(response.status).isEqualTo(requestWithResponse.response.status)
+        assertThat(response.body).isEqualTo(requestWithResponse.response.body)
+    }
+
+    @ParameterizedTest
+    @MethodSource("mtbFileRequestWithResponseSource")
+    fun shouldReturnExpectedResponseForMtbFilePost(requestWithResponse: RequestWithResponse) {
+        this.mockRestServiceServer.expect {
+            method(HttpMethod.POST)
+            requestTo("/mtbfile")
+        }.andRespond {
+            withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
+        }
+
+        val response = restMtbFileSender.send(MtbFileSender.MtbFileRequest("TestID", mtbFile))
+        assertThat(response.status).isEqualTo(requestWithResponse.response.status)
+        assertThat(response.body).isEqualTo(requestWithResponse.response.body)
+    }
+
+    @ParameterizedTest
+    @MethodSource("mtbFileRequestWithResponseSource")
+    fun shouldRetryOnMtbFileHttpRequestError(requestWithResponse: RequestWithResponse) {
+        val restTemplate = RestTemplate()
+        val restTargetProperties = RestTargetProperties("http://localhost:9000/mtbfile")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
+
+        this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
+        this.restMtbFileSender = RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
+
+        val expectedCount = when (requestWithResponse.httpStatus) {
+            // OK - No Retry
+            HttpStatus.OK, HttpStatus.CREATED -> ExpectedCount.max(1)
+            // Request failed - Retry max 3 times
+            else -> ExpectedCount.max(3)
+        }
+
+        this.mockRestServiceServer.expect(expectedCount) {
+            method(HttpMethod.POST)
+            requestTo("/mtbfile")
+        }.andRespond {
+            withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
+        }
+
+        val response = restMtbFileSender.send(MtbFileSender.MtbFileRequest("TestID", mtbFile))
+        assertThat(response.status).isEqualTo(requestWithResponse.response.status)
+        assertThat(response.body).isEqualTo(requestWithResponse.response.body)
+    }
+
+    @ParameterizedTest
+    @MethodSource("deleteRequestWithResponseSource")
+    fun shouldRetryOnDeleteHttpRequestError(requestWithResponse: RequestWithResponse) {
+        val restTemplate = RestTemplate()
+        val restTargetProperties = RestTargetProperties("http://localhost:9000/mtbfile")
+        val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
+
+        this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
+        this.restMtbFileSender = RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
+
+        val expectedCount = when (requestWithResponse.httpStatus) {
+            // OK - No Retry
+            HttpStatus.OK, HttpStatus.CREATED -> ExpectedCount.max(1)
+            // Request failed - Retry max 3 times
+            else -> ExpectedCount.max(3)
+        }
+
+        this.mockRestServiceServer.expect(expectedCount) {
+            method(HttpMethod.DELETE)
+            requestTo("/mtbfile")
+        }.andRespond {
+            withStatus(requestWithResponse.httpStatus).body(requestWithResponse.body).createResponse(it)
+        }
+
+        val response = restMtbFileSender.send(MtbFileSender.DeleteRequest("TestID", "PID"))
+        assertThat(response.status).isEqualTo(requestWithResponse.response.status)
+        assertThat(response.body).isEqualTo(requestWithResponse.response.body)
+    }
+
+    companion object {
+        data class RequestWithResponse(
+            val httpStatus: HttpStatus,
+            val body: String,
+            val response: MtbFileSender.Response
+        )
+
+        private val warningBody = """
+                {
+                    "patient_id": "PID",
+                    "issues": [
+                        { "severity": "warning", "message": "Something is not right" }
+                    ]
+                }
+            """.trimIndent()
+
+        private val errorBody = """
+                {
+                    "patient_id": "PID",
+                    "issues": [
+                        { "severity": "error", "message": "Something is very bad" }
+                    ]
+                }
+            """.trimIndent()
+
+        val mtbFile: MtbFile = MtbFile.builder()
+            .withPatient(
+                Patient.builder()
+                    .withId("PID")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
+                    .build()
+            )
+            .withConsent(
+                Consent.builder()
+                    .withId("1")
+                    .withStatus(Consent.Status.ACTIVE)
+                    .withPatient("PID")
+                    .build()
+            )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("PID")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
+            )
+            .build()
+
+        private const val ERROR_RESPONSE_BODY = "Sonstiger Fehler bei der Übertragung"
+
+        /**
+         * Synthetic http responses with related request status
+         * Also see: https://ibmi-intra.cs.uni-tuebingen.de/display/ZPM/bwHC+REST+API
+         */
+        @JvmStatic
+        fun mtbFileRequestWithResponseSource(): Set<RequestWithResponse> {
+            return setOf(
+                RequestWithResponse(HttpStatus.OK, "{}", MtbFileSender.Response(RequestStatus.SUCCESS, "{}")),
+                RequestWithResponse(
+                    HttpStatus.CREATED,
+                    warningBody,
+                    MtbFileSender.Response(RequestStatus.WARNING, warningBody)
+                ),
+                RequestWithResponse(
+                    HttpStatus.BAD_REQUEST,
+                    "??",
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                ),
+                RequestWithResponse(
+                    HttpStatus.UNPROCESSABLE_ENTITY,
+                    errorBody,
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                ),
+                // Some more errors not mentioned in documentation
+                RequestWithResponse(
+                    HttpStatus.NOT_FOUND,
+                    "what????",
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                ),
+                RequestWithResponse(
+                    HttpStatus.INTERNAL_SERVER_ERROR,
+                    "what????",
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                )
+            )
+        }
+
+        /**
+         * Synthetic http responses with related request status
+         * Also see: https://ibmi-intra.cs.uni-tuebingen.de/display/ZPM/bwHC+REST+API
+         */
+        @JvmStatic
+        fun deleteRequestWithResponseSource(): Set<RequestWithResponse> {
+            return setOf(
+                RequestWithResponse(HttpStatus.OK, "", MtbFileSender.Response(RequestStatus.SUCCESS)),
+                // Some more errors not mentioned in documentation
+                RequestWithResponse(
+                    HttpStatus.NOT_FOUND,
+                    "what????",
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                ),
+                RequestWithResponse(
+                    HttpStatus.INTERNAL_SERVER_ERROR,
+                    "what????",
+                    MtbFileSender.Response(RequestStatus.ERROR, ERROR_RESPONSE_BODY)
+                )
+            )
+        }
+    }
+
+
+}

src/test/kotlin/dev/dnpm/etl/processor/pseudonym/ExtensionsTest.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2023  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -19,182 +19,180 @@
 
 package dev.dnpm.etl.processor.pseudonym
 
-import ca.uhn.fhir.context.FhirContext
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.config.AppConfigProperties
+import de.ukw.ccc.bwhc.dto.*
-import dev.dnpm.etl.processor.config.GIcsConfigProperties
-import dev.dnpm.etl.processor.config.JacksonConfig
-import dev.dnpm.etl.processor.consent.MtbFileConsentService
-import dev.dnpm.etl.processor.services.ConsentProcessor
-import dev.dnpm.etl.processor.services.ConsentProcessorTest
-import dev.pcvolkmer.mv64e.mtb.*
 import org.assertj.core.api.Assertions.assertThat
-import org.hl7.fhir.r4.model.Bundle
-import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.anyValueClass
 import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.whenever
 import org.springframework.core.io.ClassPathResource
-import java.time.Instant
+
-import java.util.*
+const val FAKE_MTB_FILE_PATH = "fake_MTBFile.json"
+const val CLEAN_PATIENT_ID = "5dad2f0b-49c6-47d8-a952-7b9e9e0f7549"
 
 @ExtendWith(MockitoExtension::class)
 class ExtensionsTest {
-    fun getObjectMapper(): ObjectMapper {
+
-        return JacksonConfig().objectMapper()
+    private fun fakeMtbFile(): MtbFile {
+        val mtbFile = ClassPathResource(FAKE_MTB_FILE_PATH).inputStream
+        return ObjectMapper().readValue(mtbFile, MtbFile::class.java)
     }
 
-    @Nested
+    private fun MtbFile.serialized(): String {
-    inner class UsingDnpmV2Datamodel {
+        return ObjectMapper().writeValueAsString(this)
-
-        val FAKE_MTB_FILE_PATH = "mv64e-mtb-fake-patient.json"
-        val CLEAN_PATIENT_ID = "644bae7a-56f6-4ee8-b02f-c532e65af5b1"
-
-        private fun fakeMtbFile(): Mtb {
-            val mtbFile = ClassPathResource(FAKE_MTB_FILE_PATH).inputStream
-            return getObjectMapper().readValue(mtbFile, Mtb::class.java)
-        }
-
-        private fun Mtb.serialized(): String {
-            return getObjectMapper().writeValueAsString(this)
-        }
-
-        @Test
-        fun shouldNotContainCleanPatientId(@Mock pseudonymizeService: PseudonymizeService) {
-            doAnswer {
-                it.arguments[0]
-                "PSEUDO-ID"
-            }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
-
-            val mtbFile = fakeMtbFile()
-            mtbFile.ensureMetaDataIsInitialized()
-            addConsentData(mtbFile)
-
-            mtbFile.pseudonymizeWith(pseudonymizeService)
-
-            assertThat(mtbFile.patient.id).isEqualTo("PSEUDO-ID")
-            assertThat(mtbFile.serialized()).doesNotContain(CLEAN_PATIENT_ID)
-        }
-
-        private fun addConsentData(mtbFile: Mtb) {
-            val gIcsConfigProperties = GIcsConfigProperties("", "", "")
-            val appConfigProperties = AppConfigProperties(emptyList())
-
-            val bundle = Bundle()
-            val dummyConsent = ConsentProcessorTest.getDummyGenomDeConsent()
-            dummyConsent.patient.reference = "Patient/$CLEAN_PATIENT_ID"
-            bundle.addEntry().resource = dummyConsent
-
-            ConsentProcessor(
-                appConfigProperties,
-                gIcsConfigProperties,
-                JacksonConfig().objectMapper(),
-                FhirContext.forR4(),
-                MtbFileConsentService()
-            ).embedBroadConsentResources(mtbFile, bundle)
-
-        }
-
-        @Test
-        fun shouldNotThrowExceptionOnNullValues(@Mock pseudonymizeService: PseudonymizeService) {
-            doAnswer {
-                it.arguments[0]
-                "PSEUDO-ID"
-            }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
-
-            doAnswer {
-                "TESTDOMAIN"
-            }.whenever(pseudonymizeService).prefix()
-
-            val mtbFile = Mtb().apply {
-                this.patient = dev.pcvolkmer.mv64e.mtb.Patient().apply {
-                    this.id = "PID"
-                    this.birthDate = Date.from(Instant.now())
-                    this.gender = GenderCoding().apply {
-                        this.code = GenderCodingCode.MALE
-                    }
-                }
-                this.episodesOfCare = listOf(
-                    MtbEpisodeOfCare().apply {
-                        this.id = "1"
-                        this.patient = Reference().apply {
-                            this.id = "PID"
-                        }
-                        this.period = PeriodDate().apply {
-                            this.start = Date.from(Instant.now())
-                        }
-                    }
-                )
-            }
-
-            mtbFile.pseudonymizeWith(pseudonymizeService)
-            mtbFile.anonymizeContentWith(pseudonymizeService)
-
-            assertThat(mtbFile.episodesOfCare).hasSize(1)
-            assertThat(mtbFile.episodesOfCare.map { it.id }).isNotNull
-        }
-
-        @Test
-        fun shouldNotContainAnyUuidAfterRehashingOfIds(@Mock pseudonymizeService: PseudonymizeService) {
-            doAnswer {
-                it.arguments[0]
-                "PSEUDO-ID"
-            }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
-
-            doAnswer {
-                "TESTDOMAIN"
-            }.whenever(pseudonymizeService).prefix()
-
-            val mtbFile = fakeMtbFile()
-
-            /**
-             * replace hex values with random long, so our test does not match false positives
-             */
-            mtbFile.ngsReports.forEach { report ->
-                report.results.simpleVariants.forEach { simpleVariant ->
-                    simpleVariant.externalIds.forEach { extIdValue ->
-                        extIdValue.value =
-                            Math.random().toLong().toString()
-                    }
-                }
-            }
-            mtbFile.ngsReports.forEach { report ->
-                report.results.rnaFusions.forEach { simpleVariant ->
-                    simpleVariant.externalIds.forEach { extIdValue ->
-                        extIdValue.value =
-                            Math.random().toLong().toString()
-                    }
-                    simpleVariant.fusionPartner3Prime?.transcriptId?.value =
-                        Math.random().toLong().toString()
-                    simpleVariant.fusionPartner5Prime?.transcriptId?.value =
-                        Math.random().toLong().toString()
-                    simpleVariant.externalIds?.forEach { it ->
-                        it?.value = Math.random().toLong().toString()
-                    }
-                }
-            }
-
-            mtbFile.pseudonymizeWith(pseudonymizeService)
-            mtbFile.anonymizeContentWith(pseudonymizeService)
-
-            val pattern =
-                "\"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\"".toRegex()
-                    .toPattern()
-            val input = mtbFile.serialized()
-            val matcher = pattern.matcher(input)
-
-            assertThrows<IllegalStateException> {
-                matcher.find()
-                val posSt = "check at pos: " + matcher.start().toString() + ", " + matcher.end()
-                println(posSt + " with " + matcher.group())
-            }.also {
-                assertThat(it.message).isEqualTo("No match found")
-            }
-        }
     }
+
+    @Test
+    fun shouldNotContainCleanPatientId(@Mock pseudonymizeService: PseudonymizeService) {
+        doAnswer {
+            it.arguments[0]
+            "PSEUDO-ID"
+        }.whenever(pseudonymizeService).patientPseudonym(ArgumentMatchers.anyString())
+
+        val mtbFile = fakeMtbFile()
+
+        mtbFile.pseudonymizeWith(pseudonymizeService)
+
+        assertThat(mtbFile.patient.id).isEqualTo("PSEUDO-ID")
+        assertThat(mtbFile.serialized()).doesNotContain(CLEAN_PATIENT_ID)
+    }
+
+    @Test
+    fun shouldNotContainAnyUuidAfterRehashingOfIds(@Mock pseudonymizeService: PseudonymizeService) {
+        doAnswer {
+            it.arguments[0]
+            "PSEUDO-ID"
+        }.whenever(pseudonymizeService).patientPseudonym(ArgumentMatchers.anyString())
+
+        doAnswer {
+            "TESTDOMAIN"
+        }.whenever(pseudonymizeService).prefix()
+
+        val mtbFile = fakeMtbFile()
+
+        mtbFile.pseudonymizeWith(pseudonymizeService)
+        mtbFile.anonymizeContentWith(pseudonymizeService)
+
+        val pattern = "\"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\"".toRegex().toPattern()
+        val matcher = pattern.matcher(mtbFile.serialized())
+
+        assertThrows<IllegalStateException> {
+            matcher.find()
+            matcher.group()
+        }.also {
+            assertThat(it.message).isEqualTo("No match found")
+        }
+
+    }
+
+    @Test
+    fun shouldRehashIdsWithPrefix(@Mock pseudonymizeService: PseudonymizeService) {
+        doAnswer {
+            it.arguments[0]
+            "PSEUDO-ID"
+        }.whenever(pseudonymizeService).patientPseudonym(ArgumentMatchers.anyString())
+
+        doAnswer {
+            "TESTDOMAIN"
+        }.whenever(pseudonymizeService).prefix()
+
+        val mtbFile = MtbFile.builder()
+            .withPatient(
+                Patient.builder()
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
+                    .build()
+            )
+            .withConsent(
+                Consent.builder()
+                    .withId("1")
+                    .withStatus(Consent.Status.ACTIVE)
+                    .withPatient("123")
+                    .build()
+            )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
+            )
+            .build()
+
+        mtbFile.pseudonymizeWith(pseudonymizeService)
+        mtbFile.anonymizeContentWith(pseudonymizeService)
+
+
+       assertThat(mtbFile.episode.id)
+           // TESTDOMAIN<sha256(TESTDOMAIN-1)[0-41]>
+           .isEqualTo("TESTDOMAIN44e20a53bbbf9f3ae39626d05df7014dcd77d6098")
+    }
+
+    @Test
+    fun shouldNotThrowExceptionOnNullValues(@Mock pseudonymizeService: PseudonymizeService) {
+        doAnswer {
+            it.arguments[0]
+            "PSEUDO-ID"
+        }.whenever(pseudonymizeService).patientPseudonym(ArgumentMatchers.anyString())
+
+        doAnswer {
+            "TESTDOMAIN"
+        }.whenever(pseudonymizeService).prefix()
+
+        val mtbFile = MtbFile.builder()
+            .withPatient(
+                Patient.builder()
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
+                    .build()
+            )
+            .withConsent(
+                Consent.builder()
+                    .withId("1")
+                    .withStatus(Consent.Status.ACTIVE)
+                    .withPatient("123")
+                    .build()
+            )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
+            )
+            .withClaims(null)
+            .withDiagnoses(null)
+            .withCarePlans(null)
+            .withClaimResponses(null)
+            .withEcogStatus(null)
+            .withFamilyMemberDiagnoses(null)
+            .withGeneticCounsellingRequests(null)
+            .withHistologyReevaluationRequests(null)
+            .withHistologyReports(null)
+            .withLastGuidelineTherapies(null)
+            .withMolecularPathologyFindings(null)
+            .withMolecularTherapies(null)
+            .withNgsReports(null)
+            .withPreviousGuidelineTherapies(null)
+            .withRebiopsyRequests(null)
+            .withRecommendations(null)
+            .withResponses(null)
+            .withStudyInclusionRequests(null)
+            .withSpecimens(null)
+            .build()
+
+        mtbFile.pseudonymizeWith(pseudonymizeService)
+        mtbFile.anonymizeContentWith(pseudonymizeService)
+
+
+        assertThat(mtbFile.episode.id).isNotNull()
+    }
+
 }

src/test/kotlin/dev/dnpm/etl/processor/pseudonym/PseudonymizeServiceTest.kt

@@ -19,8 +19,8 @@
 
 package dev.dnpm.etl.processor.pseudonym
 
+import de.ukw.ccc.bwhc.dto.*
 import dev.dnpm.etl.processor.config.PseudonymizeConfigProperties
-import dev.pcvolkmer.mv64e.mtb.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -29,26 +29,31 @@ import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.whenever
-import java.time.Instant
-import java.util.*
 
 @ExtendWith(MockitoExtension::class)
 class PseudonymizeServiceTest {
 
-    private val mtbFile = Mtb.builder()
+    private val mtbFile = MtbFile.builder()
-        .patient(
+        .withPatient(
             Patient.builder()
-                .id("123")
+                .withId("123")
+                .withBirthDate("2000-08-08")
+                .withGender(Patient.Gender.MALE)
                 .build()
         )
-        .episodesOfCare(
+        .withConsent(
-            listOf(
+            Consent.builder()
-                MtbEpisodeOfCare.builder()
+                .withId("1")
-                    .id("1")
+                .withStatus(Consent.Status.ACTIVE)
-                    .patient(Reference.builder().id("123").build())
+                .withPatient("123")
-                    .period(PeriodDate.builder().start(Date.from(Instant.parse("2021-01-01T00:00:00.00Z"))).build())
+                .build()
-                    .build()
+        )
-            )
+        .withEpisode(
+            Episode.builder()
+                .withId("1")
+                .withPatient("123")
+                .withPeriod(PeriodStart("2023-08-08"))
+                .build()
         )
         .build()
 
@@ -66,8 +71,8 @@ class PseudonymizeServiceTest {
     }
 
     @Test
-    fun sanitizeFileName() {
+    fun sanitizeFileName(@Mock generator: GpasPseudonymGenerator) {
-        val result = GpasPseudonymGenerator.sanitizeValue("l://a\\bs;1*2?3>")
+        val result= GpasPseudonymGenerator.sanitizeValue("l://a\\bs;1*2?3>")
 
         assertThat(result).isEqualTo("l___a_bs_1_2_3_")
     }
@@ -85,16 +90,4 @@ class PseudonymizeServiceTest {
         assertThat(mtbFile.patient.id).isEqualTo("UNKNOWN_123")
     }
 
-    @Test
-    fun shouldReturnDifferentValues() {
-        val ag = AnonymizingGenerator()
-
-        val tans = HashSet<String>()
-
-        (1..1000).forEach { i ->
-            val tan = ag.generateGenomDeTan("12345")
-            assertThat(tan).hasSize(64)
-            assertThat(tans.add(tan)).`as`("never the same result!").isTrue
-        }
-    }
 }

src/test/kotlin/dev/dnpm/etl/processor/security/UserRoleServiceTest.kt

@@ -1,202 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2024  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package dev.dnpm.etl.processor.security
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.Mock
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.*
-import org.springframework.security.core.session.SessionInformation
-import org.springframework.security.core.session.SessionRegistry
-import org.springframework.security.oauth2.core.oidc.OidcIdToken
-import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser
-import org.springframework.security.oauth2.core.oidc.user.OidcUser
-import java.time.Instant
-import java.util.*
-
-@ExtendWith(MockitoExtension::class)
-class UserRoleServiceTest {
-
-    private lateinit var userRoleRepository: UserRoleRepository
-    private lateinit var sessionRegistry: SessionRegistry
-
-    private lateinit var userRoleService: UserRoleService
-
-    @BeforeEach
-    fun setup(
-        @Mock userRoleRepository: UserRoleRepository,
-        @Mock sessionRegistry: SessionRegistry
-    ) {
-        this.userRoleRepository = userRoleRepository
-        this.sessionRegistry = sessionRegistry
-
-        this.userRoleService = UserRoleService(userRoleRepository, sessionRegistry)
-    }
-
-    @Test
-    fun shouldDelegateFindAllToRepository() {
-        userRoleService.findAll()
-
-        verify(userRoleRepository, times(1)).findAll()
-    }
-
-    @Nested
-    inner class WithExistingUserRole {
-
-        @BeforeEach
-        fun setup() {
-            doAnswer { invocation ->
-                Optional.of(
-                    UserRole(invocation.getArgument(0), "patrick.tester", Role.USER)
-                )
-            }.whenever(userRoleRepository).findById(any<Long>())
-
-            doAnswer { _ ->
-                listOf(
-                    dummyPrincipal()
-                )
-            }.whenever(sessionRegistry).allPrincipals
-        }
-
-        @Test
-        fun shouldUpdateUserRole() {
-            userRoleService.updateUserRole(1, Role.ADMIN)
-
-            val userRoleCaptor = argumentCaptor<UserRole>()
-            verify(userRoleRepository, times(1)).save(userRoleCaptor.capture())
-
-            assertThat(userRoleCaptor.firstValue.id).isEqualTo(1L)
-            assertThat(userRoleCaptor.firstValue.role).isEqualTo(Role.ADMIN)
-        }
-
-        @Test
-        fun shouldExpireSessionOnUpdate() {
-            val dummySessions = dummySessions()
-            whenever(sessionRegistry.getAllSessions(any(), any<Boolean>())).thenReturn(
-                dummySessions
-            )
-
-            assertThat(dummySessions.filter { it.isExpired }).hasSize(0)
-
-            userRoleService.updateUserRole(1, Role.ADMIN)
-
-            verify(sessionRegistry, times(1)).getAllSessions(any<OidcUser>(), any<Boolean>())
-
-            assertThat(dummySessions.filter { it.isExpired }).hasSize(2)
-        }
-
-        @Test
-        fun shouldDeleteUserRole() {
-            userRoleService.deleteUserRole(1)
-
-            val userRoleCaptor = argumentCaptor<UserRole>()
-            verify(userRoleRepository, times(1)).delete(userRoleCaptor.capture())
-
-            assertThat(userRoleCaptor.firstValue.id).isEqualTo(1L)
-            assertThat(userRoleCaptor.firstValue.role).isEqualTo(Role.USER)
-        }
-
-        @Test
-        fun shouldExpireSessionOnDelete() {
-            val dummySessions = dummySessions()
-            whenever(sessionRegistry.getAllSessions(any(), any<Boolean>())).thenReturn(
-                dummySessions
-            )
-
-            assertThat(dummySessions.filter { it.isExpired }).hasSize(0)
-
-            userRoleService.deleteUserRole(1)
-
-            verify(sessionRegistry, times(1)).getAllSessions(any<OidcUser>(), any<Boolean>())
-
-            assertThat(dummySessions.filter { it.isExpired }).hasSize(2)
-        }
-    }
-
-    @Nested
-    inner class WithoutExistingUserRole {
-
-        @BeforeEach
-        fun setup() {
-            doAnswer { _ ->
-                Optional.empty<UserRole>()
-            }.whenever(userRoleRepository).findById(any<Long>())
-        }
-
-        @Test
-        fun shouldNotUpdateUserRole() {
-            userRoleService.updateUserRole(1, Role.ADMIN)
-
-            verify(userRoleRepository, never()).save(any<UserRole>())
-        }
-
-        @Test
-        fun shouldNotExpireSessionOnUpdate() {
-            userRoleService.updateUserRole(1, Role.ADMIN)
-
-            verify(sessionRegistry, never()).getAllSessions(any<OidcUser>(), any<Boolean>())
-        }
-
-        @Test
-        fun shouldNotDeleteUserRole() {
-            userRoleService.deleteUserRole(1)
-
-            verify(userRoleRepository, never()).delete(any<UserRole>())
-        }
-
-        @Test
-        fun shouldNotExpireSessionOnDelete() {
-            userRoleService.deleteUserRole(1)
-
-            verify(sessionRegistry, never()).getAllSessions(any<OidcUser>(), any<Boolean>())
-        }
-
-    }
-
-
-    companion object {
-        private fun dummyPrincipal() = DefaultOidcUser(
-            listOf(),
-            OidcIdToken(
-                "anytokenvalue",
-                Instant.now(),
-                Instant.now().plusSeconds(10),
-                mapOf("sub" to "testsub", "preferred_username" to "patrick.tester")
-            )
-        )
-
-        private fun dummySessions() = listOf(
-            SessionInformation(
-                dummyPrincipal(),
-                "SESSIONID1",
-                Date.from(Instant.now()),
-            ),
-            SessionInformation(
-                dummyPrincipal(),
-                "SESSIONID2",
-                Date.from(Instant.now()),
-            )
-        )
-    }
-}

src/test/kotlin/dev/dnpm/etl/processor/services/ConsentProcessorTest.kt

@@ -1,232 +0,0 @@
-package dev.dnpm.etl.processor.services
-
-import ca.uhn.fhir.context.FhirContext
-import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.config.AppConfigProperties
-import dev.dnpm.etl.processor.config.GIcsConfigProperties
-import dev.dnpm.etl.processor.config.JacksonConfig
-import dev.dnpm.etl.processor.consent.ConsentDomain
-import dev.dnpm.etl.processor.consent.GicsConsentService
-import dev.pcvolkmer.mv64e.mtb.Mtb
-import dev.pcvolkmer.mv64e.mtb.MvhSubmissionType
-import dev.pcvolkmer.mv64e.mtb.Patient
-import org.assertj.core.api.Assertions.assertThat
-import org.hl7.fhir.r4.model.Bundle
-import org.hl7.fhir.r4.model.CodeableConcept
-import org.hl7.fhir.r4.model.Coding
-import org.hl7.fhir.r4.model.Consent
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.CsvSource
-import org.junit.jupiter.params.provider.ValueSource
-import org.mockito.Mock
-import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doAnswer
-import org.mockito.kotlin.eq
-import org.mockito.kotlin.whenever
-import org.springframework.core.io.ClassPathResource
-import java.io.IOException
-import java.io.InputStream
-import java.time.Instant
-import java.time.OffsetDateTime
-import java.util.*
-
-@ExtendWith(MockitoExtension::class)
-class ConsentProcessorTest {
-
-    private lateinit var appConfigProperties: AppConfigProperties
-    private lateinit var gicsConsentService: GicsConsentService
-    private lateinit var objectMapper: ObjectMapper
-    private lateinit var gIcsConfigProperties: GIcsConfigProperties
-    private lateinit var fhirContext: FhirContext
-    private lateinit var consentProcessor: ConsentProcessor
-
-    @BeforeEach
-    fun setups(
-        @Mock gicsConsentService: GicsConsentService,
-    ) {
-
-        this.gIcsConfigProperties = GIcsConfigProperties("https://gics.example.com")
-        val jacksonConfig = JacksonConfig()
-        this.objectMapper = jacksonConfig.objectMapper()
-        this.fhirContext = JacksonConfig.fhirContext()
-        this.gicsConsentService = gicsConsentService
-        this.appConfigProperties = AppConfigProperties(emptyList())
-        this.consentProcessor =
-            ConsentProcessor(
-                appConfigProperties,
-                gIcsConfigProperties,
-                objectMapper,
-                fhirContext,
-                gicsConsentService
-            )
-    }
-
-    @Test
-    fun consentOk() {
-        assertThat(consentProcessor.toString()).isNotNull
-        // prep gICS response
-        doAnswer { getDummyBroadConsentBundle() }.whenever(gicsConsentService)
-            .getConsent(any(), any(), eq(ConsentDomain.BROAD_CONSENT))
-
-        doAnswer { Bundle() }.whenever(gicsConsentService)
-            .getConsent(any(), any(), eq(ConsentDomain.MODELLVORHABEN_64E))
-
-        val inputMtb = Mtb.builder()
-            .patient(Patient.builder().id("d611d429-5003-11f0-a144-661e92ac9503").build()).build()
-        val checkResult = consentProcessor.consentGatedCheckAndTryEmbedding(inputMtb)
-
-        assertThat(checkResult).isTrue
-        assertThat(inputMtb.metadata.researchConsents).hasSize(26)
-    }
-
-    companion object {
-        fun getDummyGenomDeConsent(): Consent {
-            val consent = Consent()
-            consent.id = "consent 1 id"
-            consent.patient.reference = "Patient/1234-pat1"
-
-            consent.provision.setType(
-                Consent.ConsentProvisionType.fromCode(
-                    "deny"
-                )
-            )
-            consent.provision.period.start =
-                Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))
-            consent.provision.period.end =
-                Date.from(Instant.parse("3000-01-01T00:00:00.00Z"))
-
-            val addProvision1 = consent.provision.addProvision()
-            addProvision1.setType(Consent.ConsentProvisionType.fromCode("permit"))
-            addProvision1.period.start = Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))
-            addProvision1.period.end = Date.from(Instant.parse("3000-01-01T00:00:00.00Z"))
-            addProvision1.code.addLast(
-                CodeableConcept(
-                    Coding(
-                        "https://ths-greifswald.de/fhir/CodeSystem/gics/Policy/GenomDE_MV",
-                        "Teilnahme",
-                        "Teilnahme am Modellvorhaben und Einwilligung zur Genomsequenzierung"
-                    )
-                )
-            )
-
-            val addProvision2 = consent.provision.addProvision()
-            addProvision2.setType(Consent.ConsentProvisionType.fromCode("deny"))
-            addProvision2.period.start = Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))
-            addProvision2.period.end = Date.from(Instant.parse("3000-01-01T00:00:00.00Z"))
-            addProvision2.code.addLast(
-                CodeableConcept(
-                    Coding(
-                        "https://ths-greifswald.de/fhir/CodeSystem/gics/Policy/GenomDE_MV",
-                        "Rekontaktierung",
-                        "Re-Identifizierung meiner Daten über die Vertrauensstelle beim Robert Koch-Institut und in die erneute Kontaktaufnahme durch meine behandelnde Ärztin oder meinen behandelnden Arzt"
-                    )
-                )
-            )
-            return consent
-        }
-    }
-
-    @ParameterizedTest
-    @CsvSource(
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2025-08-15T00:00:00+02:00,PERMIT,expect permit",
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2025-08-15T00:00:00+02:00,PERMIT,expect permit date is exactly on start",
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2055-08-15T00:00:00+02:00,PERMIT,expect permit date is exactly on end",
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2021-08-15T00:00:00+02:00,NULL,date is before start",
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2060-08-15T00:00:00+02:00,NULL,date is after end",
-        "2.16.840.1.113883.3.1937.777.24.5.3.27,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2025-08-15T00:00:00+02:00,DENY,provision is denied",
-        "unknownCode,urn:oid:2.16.840.1.113883.3.1937.777.24.5.3,2025-08-15T00:00:00+02:00,NULL,code does not exist - therefore expect NULL",
-        "2.16.840.1.113883.3.1937.777.24.5.3.8,XXXX,2025-08-15T00:00:00+02:00,NULL,system not found - therefore expect NULL",
-    )
-    fun getProvisionTypeByPolicyCode(
-        code: String?, system: String?, timeStamp: String, expected: String?,
-        desc: String?
-    ) {
-        val testData = getDummyBroadConsentBundle()
-
-        val requestDate = Date.from(OffsetDateTime.parse(timeStamp).toInstant())
-
-        val result: Consent.ConsentProvisionType =
-            consentProcessor.getProvisionTypeByPolicyCode(testData, code, system, requestDate)
-        assertThat(result).isNotNull()
-
-
-        assertThat(result).`as`(desc)
-            .isEqualTo(Consent.ConsentProvisionType.valueOf(expected!!))
-    }
-
-    @Test
-    fun getProvisionTypeOnEmptyConsent(
-    ) {
-        val emptyResources = Bundle().addEntry(Bundle.BundleEntryComponent().setResource(Consent()))
-
-        val requestDate = Date.from(OffsetDateTime.parse("2025-08-15T00:00:00+02:00").toInstant())
-
-        val result: Consent.ConsentProvisionType =
-            consentProcessor.getProvisionTypeByPolicyCode(
-                emptyResources,
-                "anyCode",
-                "anySystem",
-                requestDate
-            )
-        assertThat(result).isNotNull()
-
-
-        assertThat(result).`as`("empty consent resource - expect NULL")
-            .isEqualTo(Consent.ConsentProvisionType.NULL)
-    }
-
-    fun getDummyBroadConsentBundle(): Bundle {
-        val bundle: InputStream?
-        try {
-            bundle = ClassPathResource(
-                "fake_broadConsent_gics_response_permit.json"
-            ).getInputStream()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-
-        return FhirContext.forR4().newJsonParser()
-            .parseResource<Bundle>(Bundle::class.java, bundle)
-    }
-
-    @ParameterizedTest
-    @ValueSource(booleans = [true, false])
-    fun mvSubmissionTypeIsSet(isTestSubmission: Boolean) {
-        appConfigProperties.genomDeTestSubmission = isTestSubmission
-        val fixture =
-            ConsentProcessor(
-                appConfigProperties,
-                gIcsConfigProperties,
-                objectMapper,
-                fhirContext,
-                gicsConsentService
-            )
-
-        doAnswer { getDummyBroadConsentBundle() }.whenever(gicsConsentService)
-            .getConsent(any(), any(), eq(ConsentDomain.BROAD_CONSENT))
-
-        doAnswer {
-            Bundle().addEntry(
-                Bundle.BundleEntryComponent().setResource(getDummyGenomDeConsent())
-            )
-        }.whenever(gicsConsentService)
-            .getConsent(any(), any(), eq(ConsentDomain.MODELLVORHABEN_64E))
-
-        val inputMtb = Mtb.builder()
-            .patient(Patient.builder().id("d611d429-5003-11f0-a144-661e92ac9503").build()).build()
-        val checkResult = fixture.consentGatedCheckAndTryEmbedding(inputMtb)
-        assertThat(checkResult).isNotNull
-
-        if (isTestSubmission)
-            assertThat(inputMtb.metadata.type).isEqualTo(MvhSubmissionType.TEST)
-        else {
-            assertThat(inputMtb.metadata.type).isEqualTo(MvhSubmissionType.INITIAL)
-        }
-
-    }
-
-}

src/test/kotlin/dev/dnpm/etl/processor/services/ReportServiceTest.kt

@@ -1,7 +1,7 @@
 /*
  * This file is part of ETL-Processor
  *
- * Copyright (c) 2025  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
+ * Copyright (c) 2023  Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -22,14 +22,9 @@ package dev.dnpm.etl.processor.services
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import dev.dnpm.etl.processor.monitoring.ReportService
-import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.monitoring.asRequestStatus
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.Arguments
-import org.junit.jupiter.params.provider.MethodSource
 
 class ReportServiceTest {
 
@@ -65,15 +60,6 @@ class ReportServiceTest {
         assertThat(actual[2].message).isEqualTo("Warning Message")
         assertThat(actual[3].severity).isEqualTo(ReportService.Severity.INFO)
         assertThat(actual[3].message).isEqualTo("Info Message")
-
-        assertThat(actual.asRequestStatus()).isEqualTo(RequestStatus.ERROR)
-    }
-
-    @ParameterizedTest
-    @MethodSource("testData")
-    fun shouldParseDataQualityReport(json: String, requestStatus: RequestStatus) {
-        val actual = this.reportService.deserialize(json)
-        assertThat(actual.asRequestStatus()).isEqualTo(requestStatus)
     }
 
     @Test
@@ -87,75 +73,4 @@ class ReportServiceTest {
         assertThat(actual[0].message).isEqualTo("Not parsable data quality report '$invalidResponse'")
     }
 
-    companion object {
-
-        @JvmStatic
-        fun testData(): Set<Arguments> {
-            return setOf(
-                Arguments.of(
-                    """
-                        {
-                            "patient": "4711",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" },
-                                { "severity": "error", "message": "Error Message" },
-                                { "severity": "fatal", "message": "Fatal Message" }
-                            ]
-                        }
-                    """.trimIndent(),
-                    RequestStatus.ERROR
-                ),
-                Arguments.of(
-                    """
-                        {
-                            "patient": "4711",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" },
-                                { "severity": "error", "message": "Error Message" }
-                            ]
-                        }
-                    """.trimIndent(),
-                    RequestStatus.ERROR
-                ),
-                Arguments.of(
-                    """
-                        {
-                            "patient": "4711",
-                            "issues": [
-                                { "severity": "error", "message": "Error Message" }
-                                { "severity": "info", "message": "Info Message" }
-                            ]
-                        }
-                    """.trimIndent(),
-                    RequestStatus.ERROR
-                ),
-                Arguments.of(
-                    """
-                        {
-                            "patient": "4711",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" },
-                                { "severity": "warning", "message": "Warning Message" }
-                            ]
-                        }
-                    """.trimIndent(),
-                    RequestStatus.WARNING
-                ),
-                Arguments.of(
-                    """
-                        {
-                            "patient": "4711",
-                            "issues": [
-                                { "severity": "info", "message": "Info Message" }
-                            ]
-                        }
-                    """.trimIndent(),
-                    RequestStatus.SUCCESS
-                )
-            )
-        }
-    }
-
 }

src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt

@@ -20,30 +20,23 @@
 package dev.dnpm.etl.processor.services
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.dnpm.etl.processor.Fingerprint
+import de.ukw.ccc.bwhc.dto.*
-import dev.dnpm.etl.processor.PatientId
-import dev.dnpm.etl.processor.PatientPseudonym
 import dev.dnpm.etl.processor.config.AppConfigProperties
-import dev.dnpm.etl.processor.consent.TtpConsentStatus
 import dev.dnpm.etl.processor.monitoring.Request
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.monitoring.RequestType
-import dev.dnpm.etl.processor.output.DeleteRequest
-import dev.dnpm.etl.processor.output.DnpmV2MtbFileRequest
 import dev.dnpm.etl.processor.output.MtbFileSender
 import dev.dnpm.etl.processor.output.RestMtbFileSender
 import dev.dnpm.etl.processor.pseudonym.PseudonymizeService
-import dev.dnpm.etl.processor.randomRequestId
-import dev.pcvolkmer.mv64e.mtb.*
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.Mockito.*
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.any
-import org.mockito.kotlin.anyValueClass
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.whenever
 import org.springframework.context.ApplicationEventPublisher
@@ -60,7 +53,7 @@ class RequestProcessorTest {
     private lateinit var requestService: RequestService
     private lateinit var applicationEventPublisher: ApplicationEventPublisher
     private lateinit var appConfigProperties: AppConfigProperties
-    private lateinit var consentProcessor: ConsentProcessor
+
     private lateinit var requestProcessor: RequestProcessor
 
     @BeforeEach
@@ -69,16 +62,14 @@ class RequestProcessorTest {
         @Mock transformationService: TransformationService,
         @Mock sender: RestMtbFileSender,
         @Mock requestService: RequestService,
-        @Mock applicationEventPublisher: ApplicationEventPublisher,
+        @Mock applicationEventPublisher: ApplicationEventPublisher
-        @Mock consentProcessor: ConsentProcessor
     ) {
         this.pseudonymizeService = pseudonymizeService
         this.transformationService = transformationService
         this.sender = sender
         this.requestService = requestService
         this.applicationEventPublisher = applicationEventPublisher
-        this.appConfigProperties = AppConfigProperties()
+        this.appConfigProperties = AppConfigProperties(null)
-        this.consentProcessor = consentProcessor
 
         val objectMapper = ObjectMapper()
 
@@ -89,8 +80,7 @@ class RequestProcessorTest {
             requestService,
             objectMapper,
             applicationEventPublisher,
-            appConfigProperties,
+            appConfigProperties
-            consentProcessor
         )
     }
 
@@ -98,45 +88,50 @@ class RequestProcessorTest {
     fun testShouldSendMtbFileDuplicationAndSaveUnknownRequestStatusAtFirst() {
         doAnswer {
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("6vkiti5bk6ikwifpajpt7cygmd3dvw54d6lwfhzlynb3pqtzferq"),
+                fingerprint = "zdlzv5s5ydmd4ktw2v5piohegc4jcyrm6j66bq6tv2uxuerndmga",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.SUCCESS,
+                status = RequestStatus.SUCCESS,
-                Instant.parse("2023-08-08T02:00:00Z")
+                processedAt = Instant.parse("2023-08-08T02:00:00Z")
             )
-        }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyValueClass())
+        }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString())
 
         doAnswer {
             false
-        }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyValueClass())
+        }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString())
 
         doAnswer {
             it.arguments[0] as String
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(any())
 
         doAnswer {
             it.arguments[0]
-        }.whenever(transformationService).transform(any<Mtb>())
+        }.whenever(transformationService).transform(any())
 
-        whenever(consentProcessor.consentGatedCheckAndTryEmbedding(any())).thenReturn(true)
+        val mtbFile = MtbFile.builder()
-
+            .withPatient(
-        val mtbFile = Mtb.builder()
-            .patient(
                 Patient.builder()
-                    .id("123")
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .episodesOfCare(
+            .withConsent(
-                listOf(
+                Consent.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withStatus(Consent.Status.ACTIVE)
-                        .patient(Reference.builder().id("123").build())
+                    .withPatient("123")
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2023-08-08T02:00:00.00Z"))).build())
+                    .build()
-                        .build()
+            )
-                )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
             )
             .build()
 
@@ -152,45 +147,50 @@ class RequestProcessorTest {
     fun testShouldDetectMtbFileDuplicationAndSendDuplicationEvent() {
         doAnswer {
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("4gcjwtjjtcczybsljxepdfpkaeusvd7g3vogfqpmphyffyzfx7dq"),
+                fingerprint = "zdlzv5s5ydmd4ktw2v5piohegc4jcyrm6j66bq6tv2uxuerndmga",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.SUCCESS,
+                status = RequestStatus.SUCCESS,
-                Instant.parse("2023-08-08T02:00:00Z")
+                processedAt = Instant.parse("2023-08-08T02:00:00Z")
             )
-        }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyValueClass())
+        }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString())
 
         doAnswer {
             false
-        }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyValueClass())
+        }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString())
 
         doAnswer {
             it.arguments[0] as String
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(any())
 
         doAnswer {
             it.arguments[0]
-        }.whenever(transformationService).transform(any<Mtb>())
+        }.whenever(transformationService).transform(any())
 
-        whenever(consentProcessor.consentGatedCheckAndTryEmbedding(any())).thenReturn(true)
+        val mtbFile = MtbFile.builder()
-
+            .withPatient(
-        val mtbFile = Mtb.builder()
-            .patient(
                 Patient.builder()
-                    .id("123")
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .episodesOfCare(
+            .withConsent(
-                listOf(
+                Consent.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withStatus(Consent.Status.ACTIVE)
-                        .patient(Reference.builder().id("123").build())
+                    .withPatient("123")
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2021-01-01T00:00:00.00Z"))).build())
+                    .build()
-                        .build()
+            )
-                )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
             )
             .build()
 
@@ -206,49 +206,54 @@ class RequestProcessorTest {
     fun testShouldSendMtbFileAndSendSuccessEvent() {
         doAnswer {
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("different"),
+                fingerprint = "different",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.SUCCESS,
+                status = RequestStatus.SUCCESS,
-                Instant.parse("2023-08-08T02:00:00Z")
+                processedAt = Instant.parse("2023-08-08T02:00:00Z")
             )
-        }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyValueClass())
+        }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString())
 
         doAnswer {
             false
-        }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyValueClass())
+        }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.SUCCESS)
-        }.whenever(sender).send(any<DnpmV2MtbFileRequest>())
+        }.`when`(sender).send(any<MtbFileSender.MtbFileRequest>())
 
         doAnswer {
             it.arguments[0] as String
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(any())
 
         doAnswer {
             it.arguments[0]
-        }.whenever(transformationService).transform(any<Mtb>())
+        }.whenever(transformationService).transform(any())
 
-        whenever(consentProcessor.consentGatedCheckAndTryEmbedding(any())).thenReturn(true)
+        val mtbFile = MtbFile.builder()
-
+            .withPatient(
-        val mtbFile = Mtb.builder()
-            .patient(
                 Patient.builder()
-                    .id("123")
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .episodesOfCare(
+            .withConsent(
-                listOf(
+                Consent.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withStatus(Consent.Status.ACTIVE)
-                        .patient(Reference.builder().id("123").build())
+                    .withPatient("123")
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2021-01-01T00:00:00.00Z"))).build())
+                    .build()
-                        .build()
+            )
-                )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
             )
             .build()
 
@@ -264,61 +269,54 @@ class RequestProcessorTest {
     fun testShouldSendMtbFileAndSendErrorEvent() {
         doAnswer {
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("different"),
+                fingerprint = "different",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.SUCCESS,
+                status = RequestStatus.SUCCESS,
-                Instant.parse("2023-08-08T02:00:00Z")
+                processedAt = Instant.parse("2023-08-08T02:00:00Z")
             )
-        }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyValueClass())
+        }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString())
 
         doAnswer {
             false
-        }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyValueClass())
+        }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.ERROR)
-        }.whenever(sender).send(any<DnpmV2MtbFileRequest>())
+        }.`when`(sender).send(any<MtbFileSender.MtbFileRequest>())
 
         doAnswer {
             it.arguments[0] as String
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(any())
 
         doAnswer {
             it.arguments[0]
-        }.whenever(transformationService).transform(any<Mtb>())
+        }.whenever(transformationService).transform(any())
 
-        whenever(consentProcessor.consentGatedCheckAndTryEmbedding(any())).thenReturn(true)
+        val mtbFile = MtbFile.builder()
-
+            .withPatient(
-        val mtbFile = Mtb.builder()
-            .patient(
                 Patient.builder()
-                    .id("123")
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .metadata(
+            .withConsent(
-                MvhMetadata
+                Consent.builder()
-                    .builder()
+                    .withId("1")
-                    .modelProjectConsent(
+                    .withStatus(Consent.Status.ACTIVE)
-                        ModelProjectConsent
+                    .withPatient("123")
-                            .builder()
-                            .provisions(
-                                listOf(Provision.builder().type(ConsentProvision.PERMIT).purpose(ModelProjectConsentPurpose.SEQUENCING).build())
-                            ).build()
-                    )
                     .build()
             )
-            .episodesOfCare(
+            .withEpisode(
-                listOf(
+                Episode.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withPatient("1")
-                        .patient(Reference.builder().id("123").build())
+                    .withPeriod(PeriodStart("2023-08-08"))
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2021-01-01T00:00:00.00Z"))).build())
+                    .build()
-                        .build()
-                )
             )
             .build()
 
@@ -334,16 +332,13 @@ class RequestProcessorTest {
     fun testShouldSendDeleteRequestAndSaveUnknownRequestStatusAtFirst() {
         doAnswer {
             "PSEUDONYM"
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(anyString())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.UNKNOWN)
-        }.whenever(sender).send(any<DeleteRequest>())
+        }.`when`(sender).send(any<MtbFileSender.DeleteRequest>())
 
-        this.requestProcessor.processDeletion(
+        this.requestProcessor.processDeletion("TEST_12345678901")
-            TEST_PATIENT_ID,
-            isConsented = TtpConsentStatus.UNKNOWN_CHECK_FILE
-        )
 
         val requestCaptor = argumentCaptor<Request>()
         verify(requestService, times(1)).save(requestCaptor.capture())
@@ -355,16 +350,13 @@ class RequestProcessorTest {
     fun testShouldSendDeleteRequestAndSendSuccessEvent() {
         doAnswer {
             "PSEUDONYM"
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(anyString())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.SUCCESS)
-        }.whenever(sender).send(any<DeleteRequest>())
+        }.`when`(sender).send(any<MtbFileSender.DeleteRequest>())
 
-        this.requestProcessor.processDeletion(
+        this.requestProcessor.processDeletion("TEST_12345678901")
-            TEST_PATIENT_ID,
-            isConsented = TtpConsentStatus.UNKNOWN_CHECK_FILE
-        )
 
         val eventCaptor = argumentCaptor<ResponseEvent>()
         verify(applicationEventPublisher, times(1)).publishEvent(eventCaptor.capture())
@@ -376,16 +368,13 @@ class RequestProcessorTest {
     fun testShouldSendDeleteRequestAndSendErrorEvent() {
         doAnswer {
             "PSEUDONYM"
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(anyString())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.ERROR)
-        }.whenever(sender).send(any<DeleteRequest>())
+        }.`when`(sender).send(any<MtbFileSender.DeleteRequest>())
 
-        this.requestProcessor.processDeletion(
+        this.requestProcessor.processDeletion("TEST_12345678901")
-            TEST_PATIENT_ID,
-            isConsented = TtpConsentStatus.UNKNOWN_CHECK_FILE
-        )
 
         val eventCaptor = argumentCaptor<ResponseEvent>()
         verify(applicationEventPublisher, times(1)).publishEvent(eventCaptor.capture())
@@ -395,12 +384,9 @@ class RequestProcessorTest {
 
     @Test
     fun testShouldSendDeleteRequestWithPseudonymErrorAndSaveErrorRequestStatus() {
-        doThrow(RuntimeException()).whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        doThrow(RuntimeException()).`when`(pseudonymizeService).patientPseudonym(anyString())
 
-        this.requestProcessor.processDeletion(
+        this.requestProcessor.processDeletion("TEST_12345678901")
-            TEST_PATIENT_ID,
-            isConsented = TtpConsentStatus.UNKNOWN_CHECK_FILE
-        )
 
         val requestCaptor = argumentCaptor<Request>()
         verify(requestService, times(1)).save(requestCaptor.capture())
@@ -414,32 +400,37 @@ class RequestProcessorTest {
 
         doAnswer {
             it.arguments[0] as String
-        }.whenever(pseudonymizeService).patientPseudonym(anyValueClass())
+        }.`when`(pseudonymizeService).patientPseudonym(any())
 
         doAnswer {
             it.arguments[0]
-        }.whenever(transformationService).transform(any<Mtb>())
+        }.whenever(transformationService).transform(any())
 
         doAnswer {
             MtbFileSender.Response(status = RequestStatus.SUCCESS)
-        }.whenever(sender).send(any<DnpmV2MtbFileRequest>())
+        }.`when`(sender).send(any<MtbFileSender.MtbFileRequest>())
 
-        whenever(consentProcessor.consentGatedCheckAndTryEmbedding(any())).thenReturn(true)
+        val mtbFile = MtbFile.builder()
-
+            .withPatient(
-        val mtbFile = Mtb.builder()
-            .patient(
                 Patient.builder()
-                    .id("123")
+                    .withId("1")
+                    .withBirthDate("2000-08-08")
+                    .withGender(Patient.Gender.MALE)
                     .build()
             )
-            .episodesOfCare(
+            .withConsent(
-                listOf(
+                Consent.builder()
-                    MtbEpisodeOfCare.builder()
+                    .withId("1")
-                        .id("1")
+                    .withStatus(Consent.Status.ACTIVE)
-                        .patient(Reference.builder().id("123").build())
+                    .withPatient("123")
-                        .period(PeriodDate.builder().start(Date.from(Instant.parse("2021-01-01T00:00:00.00Z"))).build())
+                    .build()
-                        .build()
+            )
-                )
+            .withEpisode(
+                Episode.builder()
+                    .withId("1")
+                    .withPatient("1")
+                    .withPeriod(PeriodStart("2023-08-08"))
+                    .build()
             )
             .build()
 
@@ -451,8 +442,4 @@ class RequestProcessorTest {
         assertThat(eventCaptor.firstValue.status).isEqualTo(RequestStatus.SUCCESS)
     }
 
-    companion object {
-        val TEST_PATIENT_ID = PatientId("TEST_12345678901")
-    }
-
 }

src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt

@@ -19,7 +19,6 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.*
 import dev.dnpm.etl.processor.monitoring.Request
 import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
@@ -31,9 +30,8 @@ import org.junit.jupiter.api.extension.ExtendWith
 import org.mockito.Mock
 import org.mockito.Mockito.*
 import org.mockito.junit.jupiter.MockitoExtension
-import org.mockito.kotlin.anyValueClass
-import org.mockito.kotlin.whenever
 import java.time.Instant
+import java.util.*
 
 @ExtendWith(MockitoExtension::class)
 class RequestServiceTest {
@@ -43,14 +41,14 @@ class RequestServiceTest {
     private lateinit var requestService: RequestService
 
     private fun anyRequest() = any(Request::class.java) ?: Request(
-        0L,
+        id = 0L,
-        randomRequestId(),
+        uuid = UUID.randomUUID().toString(),
-        PatientPseudonym("TEST_dummy"),
+        patientId = "TEST_dummy",
-        PatientId("PX"),
+        pid = "PX",
-        Fingerprint("dummy"),
+        fingerprint = "dummy",
-        RequestType.MTB_FILE,
+        type = RequestType.MTB_FILE,
-        RequestStatus.SUCCESS,
+        status = RequestStatus.SUCCESS,
-        Instant.parse("2023-08-08T02:00:00Z")
+        processedAt = Instant.parse("2023-08-08T02:00:00Z")
     )
 
     @BeforeEach
@@ -65,34 +63,34 @@ class RequestServiceTest {
     fun shouldIndicateLastRequestIsDeleteRequest() {
         val requests = listOf(
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.WARNING,
+                status = RequestStatus.WARNING,
-                Instant.parse("2023-07-07T00:00:00Z")
+                processedAt = Instant.parse("2023-07-07T00:00:00Z")
             ),
             Request(
-                2L,
+                id = 2L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdefd"),
+                fingerprint = "0123456789abcdefd",
-                RequestType.DELETE,
+                type = RequestType.DELETE,
-                RequestStatus.WARNING,
+                status = RequestStatus.WARNING,
-                Instant.parse("2023-07-07T02:00:00Z")
+                processedAt = Instant.parse("2023-07-07T02:00:00Z")
             ),
             Request(
-                3L,
+                id = 3L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.UNKNOWN,
+                status = RequestStatus.UNKNOWN,
-                Instant.parse("2023-08-11T00:00:00Z")
+                processedAt = Instant.parse("2023-08-11T00:00:00Z")
             )
         )
 
@@ -105,34 +103,34 @@ class RequestServiceTest {
     fun shouldIndicateLastRequestIsNotDeleteRequest() {
         val requests = listOf(
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.WARNING,
+                status = RequestStatus.WARNING,
-                Instant.parse("2023-07-07T00:00:00Z")
+                processedAt = Instant.parse("2023-07-07T00:00:00Z")
             ),
             Request(
-                2L,
+                id = 2L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.WARNING,
+                status = RequestStatus.WARNING,
-                Instant.parse("2023-07-07T02:00:00Z")
+                processedAt = Instant.parse("2023-07-07T02:00:00Z")
             ),
             Request(
-                3L,
+                id = 3L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.UNKNOWN,
+                status = RequestStatus.UNKNOWN,
-                Instant.parse("2023-08-11T00:00:00Z")
+                processedAt = Instant.parse("2023-08-11T00:00:00Z")
             )
         )
 
@@ -145,31 +143,31 @@ class RequestServiceTest {
     fun shouldReturnPatientsLastRequest() {
         val requests = listOf(
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678901"),
+                patientId = "TEST_12345678901",
-                PatientId("P1"),
+                pid = "P1",
-                Fingerprint("0123456789abcdef1"),
+                fingerprint = "0123456789abcdef1",
-                RequestType.DELETE,
+                type = RequestType.DELETE,
-                RequestStatus.SUCCESS,
+                status = RequestStatus.SUCCESS,
-                Instant.parse("2023-07-07T02:00:00Z")
+                processedAt = Instant.parse("2023-07-07T02:00:00Z")
             ),
             Request(
-                1L,
+                id = 1L,
-                randomRequestId(),
+                uuid = UUID.randomUUID().toString(),
-                PatientPseudonym("TEST_12345678902"),
+                patientId = "TEST_12345678902",
-                PatientId("P2"),
+                pid = "P2",
-                Fingerprint("0123456789abcdef2"),
+                fingerprint = "0123456789abcdef2",
-                RequestType.MTB_FILE,
+                type = RequestType.MTB_FILE,
-                RequestStatus.WARNING,
+                status = RequestStatus.WARNING,
-                Instant.parse("2023-08-08T00:00:00Z")
+                processedAt = Instant.parse("2023-08-08T00:00:00Z")
             )
         )
 
         val actual = RequestService.lastMtbFileRequestForPatientPseudonym(requests)
 
         assertThat(actual).isInstanceOf(Request::class.java)
-        assertThat(actual?.fingerprint).isEqualTo(Fingerprint("0123456789abcdef2"))
+        assertThat(actual?.fingerprint).isEqualTo("0123456789abcdef2")
     }
 
     @Test
@@ -186,16 +184,16 @@ class RequestServiceTest {
         doAnswer {
             val obj = it.arguments[0] as Request
             obj.copy(id = 1L)
-        }.whenever(requestRepository).save(anyRequest())
+        }.`when`(requestRepository).save(anyRequest())
 
         val request = Request(
-            randomRequestId(),
+            uuid = UUID.randomUUID().toString(),
-            PatientPseudonym("TEST_12345678901"),
+            patientId = "TEST_12345678901",
-            PatientId("P1"),
+            pid = "P1",
-            Fingerprint("0123456789abcdef1"),
+            fingerprint = "0123456789abcdef1",
-            RequestType.DELETE,
+            type = RequestType.DELETE,
-            RequestStatus.SUCCESS,
+            status = RequestStatus.SUCCESS,
-            Instant.parse("2023-07-07T02:00:00Z")
+            processedAt = Instant.parse("2023-07-07T02:00:00Z")
         )
 
         requestService.save(request)
@@ -205,23 +203,23 @@ class RequestServiceTest {
 
     @Test
     fun allRequestsByPatientPseudonymShouldRequestAllRequestsForPatientPseudonym() {
-        requestService.allRequestsByPatientPseudonym(PatientPseudonym("TEST_12345678901"))
+        requestService.allRequestsByPatientPseudonym("TEST_12345678901")
 
-        verify(requestRepository, times(1)).findAllByPatientPseudonymOrderByProcessedAtDesc(anyValueClass())
+        verify(requestRepository, times(1)).findAllByPatientIdOrderByProcessedAtDesc(anyString())
     }
 
     @Test
     fun lastMtbFileRequestForPatientPseudonymShouldRequestAllRequestsForPatientPseudonym() {
-        requestService.lastMtbFileRequestForPatientPseudonym(PatientPseudonym("TEST_12345678901"))
+        requestService.lastMtbFileRequestForPatientPseudonym("TEST_12345678901")
 
-        verify(requestRepository, times(1)).findAllByPatientPseudonymOrderByProcessedAtDesc(anyValueClass())
+        verify(requestRepository, times(1)).findAllByPatientIdOrderByProcessedAtDesc(anyString())
     }
 
     @Test
     fun isLastRequestDeletionShouldRequestAllRequestsForPatientPseudonym() {
-        requestService.isLastRequestWithKnownStatusDeletion(PatientPseudonym("TEST_12345678901"))
+        requestService.isLastRequestWithKnownStatusDeletion("TEST_12345678901")
 
-        verify(requestRepository, times(1)).findAllByPatientPseudonymOrderByProcessedAtDesc(anyValueClass())
+        verify(requestRepository, times(1)).findAllByPatientIdOrderByProcessedAtDesc(anyString())
     }
 
 }

src/test/kotlin/dev/dnpm/etl/processor/services/ResponseProcessorTest.kt

@@ -19,8 +19,8 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.*
 import dev.dnpm.etl.processor.monitoring.Request
+import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.monitoring.RequestType
 import org.assertj.core.api.Assertions.assertThat
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.*
@@ -39,64 +40,64 @@ import java.util.*
 @ExtendWith(MockitoExtension::class)
 class ResponseProcessorTest {
 
-    private lateinit var requestService: RequestService
+    private lateinit var requestRepository: RequestRepository
     private lateinit var statisticsUpdateProducer: Sinks.Many<Any>
 
     private lateinit var responseProcessor: ResponseProcessor
 
     private val testRequest = Request(
         1L,
-        RequestId("TestID1234"),
+        "TestID1234",
-        PatientPseudonym("PSEUDONYM-A"),
+        "PSEUDONYM-A",
-        PatientId("1"),
+        "1",
-        Fingerprint("dummyfingerprint"),
+        "dummyfingerprint",
         RequestType.MTB_FILE,
         RequestStatus.UNKNOWN
     )
 
     @BeforeEach
     fun setup(
-        @Mock requestService: RequestService,
+        @Mock requestRepository: RequestRepository,
         @Mock statisticsUpdateProducer: Sinks.Many<Any>
     ) {
-        this.requestService = requestService
+        this.requestRepository = requestRepository
         this.statisticsUpdateProducer = statisticsUpdateProducer
 
-        this.responseProcessor = ResponseProcessor(requestService, statisticsUpdateProducer)
+        this.responseProcessor = ResponseProcessor(requestRepository, statisticsUpdateProducer)
     }
 
     @Test
     fun shouldNotSaveStatusForUnknownRequest() {
         doAnswer {
             Optional.empty<Request>()
-        }.whenever(requestService).findByUuid(anyValueClass())
+        }.whenever(requestRepository).findByUuidEquals(anyString())
 
         val event = ResponseEvent(
-            RequestId("TestID1234"),
+            "TestID1234",
             Instant.parse("2023-09-09T00:00:00Z"),
             RequestStatus.SUCCESS
         )
 
         this.responseProcessor.handleResponseEvent(event)
 
-        verify(requestService, never()).save(any())
+        verify(requestRepository, never()).save(any())
     }
 
     @Test
     fun shouldNotSaveStatusWithUnknownState() {
         doAnswer {
             Optional.of(testRequest)
-        }.whenever(requestService).findByUuid(anyValueClass())
+        }.whenever(requestRepository).findByUuidEquals(anyString())
 
         val event = ResponseEvent(
-            RequestId("TestID1234"),
+            "TestID1234",
             Instant.parse("2023-09-09T00:00:00Z"),
             RequestStatus.UNKNOWN
         )
 
         this.responseProcessor.handleResponseEvent(event)
 
-        verify(requestService, never()).save(any<Request>())
+        verify(requestRepository, never()).save(any())
     }
 
     @ParameterizedTest
@@ -104,10 +105,10 @@ class ResponseProcessorTest {
     fun shouldSaveStatusForKnownRequest(requestStatus: RequestStatus) {
         doAnswer {
             Optional.of(testRequest)
-        }.whenever(requestService).findByUuid(anyValueClass())
+        }.whenever(requestRepository).findByUuidEquals(anyString())
 
         val event = ResponseEvent(
-            RequestId("TestID1234"),
+            "TestID1234",
             Instant.parse("2023-09-09T00:00:00Z"),
             requestStatus
         )
@@ -115,7 +116,7 @@ class ResponseProcessorTest {
         this.responseProcessor.handleResponseEvent(event)
 
         val captor = argumentCaptor<Request>()
-        verify(requestService, times(1)).save(captor.capture())
+        verify(requestRepository, times(1)).save(captor.capture())
         assertThat(captor.firstValue).isNotNull
         assertThat(captor.firstValue.status).isEqualTo(requestStatus)
     }

src/test/kotlin/dev/dnpm/etl/processor/services/TokenServiceTest.kt

@@ -17,12 +17,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package dev.dnpm.etl.processor.security
+package dev.dnpm.etl.processor.services
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.ArgumentCaptor
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
@@ -95,11 +96,11 @@ class TokenServiceTest {
 
         val actual = this.tokenService.addToken("Test Token")
 
-        val captor = argumentCaptor<Token>()
+        val captor = ArgumentCaptor.forClass(Token::class.java)
         verify(tokenRepository, times(1)).save(captor.capture())
 
         assertThat(actual).satisfies(Consumer { assertThat(it.isSuccess).isTrue() })
-        assertThat(captor.firstValue).satisfies(
+        assertThat(captor.value).satisfies(
             Consumer { assertThat(it.name).isEqualTo("Test Token") },
             Consumer { assertThat(it.username).isEqualTo("testtoken") },
             Consumer { assertThat(it.password).isEqualTo("{test}verysecret") }
@@ -115,13 +116,13 @@ class TokenServiceTest {
 
         this.tokenService.deleteToken(42)
 
-        val stringCaptor = argumentCaptor<String>()
+        val stringCaptor = ArgumentCaptor.forClass(String::class.java)
         verify(userDetailsManager, times(1)).deleteUser(stringCaptor.capture())
-        assertThat(stringCaptor.firstValue).isEqualTo("testtoken")
+        assertThat(stringCaptor.value).isEqualTo("testtoken")
 
-        val tokenCaptor = argumentCaptor<Token>()
+        val tokenCaptor = ArgumentCaptor.forClass(Token::class.java)
         verify(tokenRepository, times(1)).delete(tokenCaptor.capture())
-        assertThat(tokenCaptor.firstValue.id).isEqualTo(42)
+        assertThat(tokenCaptor.value.id).isEqualTo(42)
     }
 
     @Test

src/test/kotlin/dev/dnpm/etl/processor/services/TransformationServiceTest.kt

@@ -19,14 +19,14 @@
 
 package dev.dnpm.etl.processor.services
 
-import dev.dnpm.etl.processor.config.JacksonConfig
+import com.fasterxml.jackson.databind.ObjectMapper
-import dev.pcvolkmer.mv64e.mtb.*
+import de.ukw.ccc.bwhc.dto.Consent
+import de.ukw.ccc.bwhc.dto.Diagnosis
+import de.ukw.ccc.bwhc.dto.Icd10
+import de.ukw.ccc.bwhc.dto.MtbFile
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.hl7.fhir.instance.model.api.IBaseResource
-import java.time.Instant
-import java.util.Date
 
 class TransformationServiceTest {
 
@@ -35,92 +35,61 @@ class TransformationServiceTest {
     @BeforeEach
     fun setup() {
         this.service = TransformationService(
-            JacksonConfig().objectMapper(), listOf(
+            ObjectMapper(), listOf(
-                Transformation.of("diagnoses[*].code.version") from "2013" to "2014",
+                Transformation.of("consent.status") from Consent.Status.ACTIVE to Consent.Status.REJECTED,
+                Transformation.of("diagnoses[*].icd10.version") from "2013" to "2014",
             )
         )
     }
 
     @Test
     fun shouldTransformMtbFile() {
-        val mtbFile = Mtb.builder().diagnoses(
+        val mtbFile = MtbFile.builder().withDiagnoses(
             listOf(
-                MtbDiagnosis.builder().id("1234").code(Coding.builder().code("F79.9").version("2013").build()).build()
+                Diagnosis.builder().withId("1234").withIcd10(Icd10("F79.9").also {
+                    it.version = "2013"
+                }).build()
             )
         ).build()
 
         val actual = this.service.transform(mtbFile)
 
         assertThat(actual).isNotNull
-        assertThat(actual.diagnoses[0].code.version).isEqualTo("2014")
+        assertThat(actual.diagnoses[0].icd10.version).isEqualTo("2014")
     }
 
     @Test
     fun shouldOnlyTransformGivenValues() {
-        val mtbFile = Mtb.builder().diagnoses(
+        val mtbFile = MtbFile.builder().withDiagnoses(
             listOf(
-                MtbDiagnosis.builder().id("1234").code(Coding.builder().code("F79.9").version("2013").build()).build(),
+                Diagnosis.builder().withId("1234").withIcd10(Icd10("F79.9").also {
-                MtbDiagnosis.builder().id("1234").code(Coding.builder().code("F79.8").version("2019").build()).build()
+                    it.version = "2013"
+                }).build(),
+                Diagnosis.builder().withId("5678").withIcd10(Icd10("F79.8").also {
+                    it.version = "2019"
+                }).build()
             )
         ).build()
 
         val actual = this.service.transform(mtbFile)
 
         assertThat(actual).isNotNull
-        assertThat(actual.diagnoses[0].code.code).isEqualTo("F79.9")
+        assertThat(actual.diagnoses[0].icd10.code).isEqualTo("F79.9")
-        assertThat(actual.diagnoses[0].code.version).isEqualTo("2014")
+        assertThat(actual.diagnoses[0].icd10.version).isEqualTo("2014")
-        assertThat(actual.diagnoses[1].code.code).isEqualTo("F79.8")
+        assertThat(actual.diagnoses[1].icd10.code).isEqualTo("F79.8")
-        assertThat(actual.diagnoses[1].code.version).isEqualTo("2019")
+        assertThat(actual.diagnoses[1].icd10.version).isEqualTo("2019")
     }
 
     @Test
-    fun shouldTransformConsentValues() {
+    fun shouldTransformMtbFileWithConsentEnum() {
-        val mtbFile = Mtb.builder().diagnoses(
+        val mtbFile = MtbFile.builder().withConsent(
-            listOf(
+            Consent("123", "456", Consent.Status.ACTIVE)
-                MtbDiagnosis.builder().id("1234").code(Coding.builder().code("F79.9").version("2013").build()).build(),
-                MtbDiagnosis.builder().id("1234").code(Coding.builder().code("F79.8").version("2019").build()).build()
-            )
         ).build()
 
         val actual = this.service.transform(mtbFile)
 
-        assertThat(actual).isNotNull
+        assertThat(actual.consent).isNotNull
-        assertThat(actual.diagnoses[0].code.code).isEqualTo("F79.9")
+        assertThat(actual.consent.status).isEqualTo(Consent.Status.REJECTED)
-        assertThat(actual.diagnoses[0].code.version).isEqualTo("2014")
-        assertThat(actual.diagnoses[1].code.code).isEqualTo("F79.8")
-        assertThat(actual.diagnoses[1].code.version).isEqualTo("2019")
-    }
-
-    @Test
-    fun shouldTransformConsent() {
-        val mvhMetadata = MvhMetadata.builder().transferTan("transfertan12345").build()
-
-        assertThat(mvhMetadata).isNotNull
-        mvhMetadata.modelProjectConsent =
-            ModelProjectConsent.builder().date(Date.from(Instant.parse("2025-08-15T00:00:00.00Z")))
-                .version("1").provisions(
-                    listOf(
-                        Provision.builder().type(ConsentProvision.PERMIT)
-                            .purpose(ModelProjectConsentPurpose.SEQUENCING)
-                            .date(Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))).build(),
-                        Provision.builder().type(ConsentProvision.PERMIT)
-                            .purpose(ModelProjectConsentPurpose.REIDENTIFICATION)
-                            .date(Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))).build(),
-                        Provision.builder().type(ConsentProvision.DENY)
-                            .purpose(ModelProjectConsentPurpose.CASE_IDENTIFICATION)
-                            .date(Date.from(Instant.parse("2025-08-15T00:00:00.00Z"))).build()
-                    )
-                ).build()
-        val consent = ConsentProcessorTest.getDummyGenomDeConsent()
-
-        mvhMetadata.researchConsents = mutableListOf()
-        mvhMetadata.researchConsents.add(mapOf(consent.id to consent as IBaseResource))
-
-        val mtbFile = Mtb.builder().metadata(mvhMetadata).build()
-
-        val transformed = service.transform(mtbFile)
-        assertThat(transformed.metadata.modelProjectConsent.date).isNotNull
-
     }
 
 }