mirror of
https://github.com/pcvolkmer/etl-processor.git
synced 2025-07-01 22:22:53 +00:00
Compare commits
57 Commits
Author | SHA1 | Date | |
---|---|---|---|
441bff3783 | |||
21959c1698 | |||
8a11e6e85b | |||
5579ad1453 | |||
c2026bdd07 | |||
de6faecb02 | |||
3be8bc53ff | |||
fad2f33fd6 | |||
d88e2973da | |||
af767e4ea6 | |||
f98c970348 | |||
75872a149f | |||
e24ba430a5 | |||
08914a6f86 | |||
104f50afcb | |||
0083e75940 | |||
c892ff2461 | |||
4a9cffbaa5 | |||
8a6f9a6e02 | |||
91f17f6af5 | |||
8d4497bf2c | |||
4ab20a5f16 | |||
167587a473 | |||
e5d80f89b0 | |||
5d0e815037 | |||
a5a19e0cea | |||
1493a63e02 | |||
fe927e65aa | |||
add09c3f9c | |||
5eb969c36a | |||
3cc4f8c1a4 | |||
707bc55ab6 | |||
d7949a7dce | |||
f5999ff325 | |||
a62da60809 | |||
ced6609d9a | |||
8dee349c37 | |||
3e45de56cf | |||
7f54efe034 | |||
effcdd811f | |||
acf49a892e | |||
284806d130 | |||
cf2d338e13 | |||
d5552b3ca4 | |||
892c0dea8f | |||
0305e69e9e | |||
1a913b2644 | |||
0eee1908df | |||
ffea9343c8 | |||
eb24995ed9 | |||
4196664060 | |||
2824951e5e | |||
1e1db1c4d9 | |||
7440fe1e23 | |||
3f5c5e28fa | |||
6397b2a019 | |||
bf8f87b261 |
117
README.md
117
README.md
@ -2,29 +2,33 @@
|
|||||||
|
|
||||||
Diese Anwendung versendet ein bwHC-MTB-File an das bwHC-Backend und pseudonymisiert die Patienten-ID.
|
Diese Anwendung versendet ein bwHC-MTB-File an das bwHC-Backend und pseudonymisiert die Patienten-ID.
|
||||||
|
|
||||||
### Einordnung innerhalb einer DNPM-ETL-Strecke
|
## Einordnung innerhalb einer DNPM-ETL-Strecke
|
||||||
|
|
||||||
Diese Anwendung erlaubt das Entgegennehmen HTTP/REST-Anfragen aus dem Onkostar-Plugin **[onkostar-plugin-dnpmexport](https://github.com/CCC-MF/onkostar-plugin-dnpmexport)**.
|
Diese Anwendung erlaubt das Entgegennehmen von HTTP/REST-Anfragen aus dem Onkostar-Plugin **[onkostar-plugin-dnpmexport](https://github.com/CCC-MF/onkostar-plugin-dnpmexport)**.
|
||||||
|
|
||||||
Der Inhalt einer Anfrage, wenn ein bwHC-MTBFile, 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.
|
Duplikate werden verworfen, Änderungen werden weitergeleitet.
|
||||||
|
|
||||||
Löschanfragen werden immer als Löschanfrage an das bwHC-backend 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.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
#### HTTP/REST-Konfiguration
|
### Datenübermittlung über HTTP/REST
|
||||||
|
|
||||||
Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung direkt an das bwHC-Backend gesendet.
|
Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung direkt an das bwHC-Backend gesendet.
|
||||||
|
|
||||||
#### Konfiguration für Apache Kafka
|
### Datenübermittlung mit Apache Kafka
|
||||||
|
|
||||||
Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung an Apache Kafka übergeben.
|
Anfragen werden, wenn nicht als Duplikat behandelt, nach der Pseudonymisierung an Apache Kafka ü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
|
Siehe hierzu auch: https://github.com/CCC-MF/kafka-to-bwhc
|
||||||
|
|
||||||
## Pseudonymisierung der Patienten-ID
|
## Konfiguration
|
||||||
|
|
||||||
|
### Pseudonymisierung der Patienten-ID
|
||||||
|
|
||||||
Wenn eine URI zu einer gPAS-Instanz (Version >= 2023.1.0) angegeben ist, wird diese verwendet.
|
Wenn eine URI zu einer gPAS-Instanz (Version >= 2023.1.0) angegeben ist, wird diese verwendet.
|
||||||
Ist diese nicht gesetzt. wird intern eine Anonymisierung der Patienten-ID vorgenommen.
|
Ist diese nicht gesetzt. wird intern eine Anonymisierung der Patienten-ID vorgenommen.
|
||||||
@ -32,37 +36,76 @@ Ist diese nicht gesetzt. wird intern eine Anonymisierung der Patienten-ID vorgen
|
|||||||
* `APP_PSEUDONYMIZE_PREFIX`: Standortbezogenes Prefix - `UNKNOWN`, wenn nicht gesetzt
|
* `APP_PSEUDONYMIZE_PREFIX`: Standortbezogenes Prefix - `UNKNOWN`, wenn nicht gesetzt
|
||||||
* `APP_PSEUDONYMIZE_GENERATOR`: `BUILDIN` oder `GPAS` - `BUILDIN`, wenn nicht gesetzt
|
* `APP_PSEUDONYMIZE_GENERATOR`: `BUILDIN` oder `GPAS` - `BUILDIN`, wenn nicht gesetzt
|
||||||
|
|
||||||
### Eingebaute Pseudonymisierung
|
#### Eingebaute Anonymisierung
|
||||||
|
|
||||||
Wurde keine oder die Verwendung der eingebauten Pseudonymisierung konfiguriert, so wird für die Patienten-ID der
|
Wurde keine oder die Verwendung der eingebauten Anonymisierung konfiguriert, so wird für die Patienten-ID der
|
||||||
entsprechende SHA-256-Hash gebildet und Base64-codiert - hier ohne endende "=" - zuzüglich des konfigurierten Prefixes
|
entsprechende SHA-256-Hash gebildet und Base64-codiert - hier ohne endende "=" - zuzüglich des konfigurierten Prefixes
|
||||||
als Patienten-Pseudonym verwendet.
|
als Patienten-Pseudonym verwendet.
|
||||||
|
|
||||||
### Pseudonymisierung mit gPAS
|
#### Pseudonymisierung mit gPAS
|
||||||
|
|
||||||
Wurde die Verwendung von gPAS konfiguriert, so sind weitere Angaben zu konfigurieren.
|
Wurde die Verwendung von gPAS konfiguriert, so sind weitere Angaben zu konfigurieren.
|
||||||
|
|
||||||
* `APP_PSEUDONYMIZE_GPAS_URI`: URI der gPAS-Instanz inklusive Endpoint (
|
* `APP_PSEUDONYMIZE_GPAS_URI`: URI der gPAS-Instanz inklusive Endpoint (z.B. `http://localhost:8080/ttp-fhir/fhir/gpas/$$pseudonymizeAllowCreate`)
|
||||||
z.B. `http://localhost:8080/ttp-fhir/fhir/gpas/$$pseudonymizeAllowCreate`)
|
|
||||||
* `APP_PSEUDONYMIZE_GPAS_TARGET`: gPas Domänenname
|
* `APP_PSEUDONYMIZE_GPAS_TARGET`: gPas Domänenname
|
||||||
* `APP_PSEUDONYMIZE_GPAS_USERNAME`: gPas Basic-Auth Benutzername
|
* `APP_PSEUDONYMIZE_GPAS_USERNAME`: gPas Basic-Auth Benutzername
|
||||||
* `APP_PSEUDONYMIZE_GPAS_PASSWORD`: gPas Basic-Auth Passwort
|
* `APP_PSEUDONYMIZE_GPAS_PASSWORD`: gPas Basic-Auth Passwort
|
||||||
* `APP_PSEUDONYMIZE_GPAS_SSLCALOCATION`: Root Zertifikat für gPas, falls es dediziert hinzugefügt werden muss.
|
* `APP_PSEUDONYMIZE_GPAS_SSLCALOCATION`: Root Zertifikat für gPas, falls es dediziert hinzugefügt werden muss.
|
||||||
|
|
||||||
## Mögliche Endpunkte
|
### Anmeldung mit einem Passwort
|
||||||
|
|
||||||
|
Ein initialer Administrator-Account kann optional konfiguriert werden und sorgt dafür, dass bestimmte Bereiche nur nach
|
||||||
|
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).
|
||||||
|
|
||||||
|
Ein Administrator-Passwort muss inklusive des Encoding-Prefixes vorliegen.
|
||||||
|
|
||||||
|
Hier Beispiele für das Beispielpasswort `very-secret`:
|
||||||
|
|
||||||
|
* `{noop}very-secret` (Das Passwort liegt im Klartext vor - nicht empfohlen!)
|
||||||
|
* `{bcrypt}$2y$05$CCkfsMr/wbTleMyjVIK8g.Aa3RCvrvoLXVAsL.f6KeouS88vXD9b6`
|
||||||
|
* `{sha256}9a34717f0646b5e9cfcba70055de62edb026ff4f68671ba3db96aa29297d2df5f1a037d58c745657`
|
||||||
|
|
||||||
|
Wird kein Administrator-Passwort angegeben, wird ein zufälliger Wert generiert und beim Start der Anwendung in den Logs
|
||||||
|
angezeigt.
|
||||||
|
|
||||||
|
#### Auswirkungen auf den dargestellten Inhalt
|
||||||
|
|
||||||
|
Nur Administratoren haben Zugriff auf den Konfigurationsbereich, nur angemeldete Benutzer können die anonymisierte oder
|
||||||
|
pseudonymisierte Patienten-ID einsehen.
|
||||||
|
|
||||||
|
Wurde kein Administrator-Account konfiguriert, sind diese Inhalte generell nicht verfügbar.
|
||||||
|
|
||||||
|
### Transformation von Werten
|
||||||
|
|
||||||
|
In Onkostar kann es vorkommen, dass ein Wert eines Merkmalskatalogs an einem Standort angepasst wurde und dadurch nicht dem Wert entspricht,
|
||||||
|
der vom bwHC-Backend akzeptiert wird.
|
||||||
|
|
||||||
|
Diese Anwendung bietet daher die Möglichkeit, eine Transformation vorzunehmen. Hierzu muss der "Pfad" innerhalb des JSON-MTB-Files angegeben werden und
|
||||||
|
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: `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_TO`: Angabe des neuen Werts.
|
||||||
|
|
||||||
|
### Mögliche Endpunkte zur Datenübermittlung
|
||||||
|
|
||||||
Für REST-Requests als auch zur Nutzung von Kafka-Topics können Endpunkte konfiguriert werden.
|
Für REST-Requests als auch zur Nutzung von Kafka-Topics können Endpunkte konfiguriert werden.
|
||||||
|
|
||||||
Es ist dabei nur die Konfiguration eines Endpunkts zulässig.
|
Es ist dabei nur die Konfiguration eines Endpunkts zulässig.
|
||||||
Werden sowohl REST als auch Kafka-Endpunkt konfiguriert, wird nur der REST-Endpunkt verwendet.
|
Werden sowohl REST als auch Kafka-Endpunkt konfiguriert, wird nur der REST-Endpunkt verwendet.
|
||||||
|
|
||||||
### REST
|
#### REST
|
||||||
|
|
||||||
Folgende Umgebungsvariablen müssen gesetzt sein, damit ein bwHC-MTB-File an das bwHC-Backend 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 bwHC-Backend-Instanz. z.B.: `http://localhost:9000/bwhc/etl/api`
|
* `APP_REST_URI`: URI der zu benutzenden API der bwHC-Backend-Instanz. z.B.: `http://localhost:9000/bwhc/etl/api`
|
||||||
|
|
||||||
### Kafka-Topics
|
#### Kafka-Topics
|
||||||
|
|
||||||
Folgende Umgebungsvariablen müssen gesetzt sein, damit ein bwHC-MTB-File an ein Kafka-Topic übermittelt wird:
|
Folgende Umgebungsvariablen müssen gesetzt sein, damit ein bwHC-MTB-File an ein Kafka-Topic übermittelt wird:
|
||||||
|
|
||||||
@ -78,7 +121,7 @@ Weitere Einstellungen können über die Parameter von Spring Kafka konfiguriert
|
|||||||
Lässt sich keine Verbindung zu dem bwHC-Backend aufbauen, wird eine Rückantwort mit Status-Code `900` erwartet, welchen es
|
Lässt sich keine Verbindung zu dem bwHC-Backend aufbauen, wird eine Rückantwort mit Status-Code `900` erwartet, welchen es
|
||||||
für HTTP nicht gibt.
|
für HTTP nicht gibt.
|
||||||
|
|
||||||
#### Retention Time
|
##### Retention Time
|
||||||
|
|
||||||
Generell werden in Apache Kafka alle Records entsprechend der Konfiguration vorgehalten.
|
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.
|
So wird ohne spezielle Konfiguration ein Record für 7 Tage in Apache Kafka gespeichert.
|
||||||
@ -91,7 +134,7 @@ Beispiel - auszuführen innerhalb des Kafka-Containers: Löschen alter Records n
|
|||||||
kafka-configs.sh --bootstrap-server localhost:9092 --alter --topic test --add-config retention.ms=86400000
|
kafka-configs.sh --bootstrap-server localhost:9092 --alter --topic test --add-config retention.ms=86400000
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Key based Retention
|
##### Key based Retention
|
||||||
|
|
||||||
Möchten Sie hingegen immer nur die letzte Meldung für einen Patienten und eine Erkrankung in Apache Kafka vorhalten,
|
Möchten Sie hingegen immer nur die letzte Meldung für einen Patienten und eine Erkrankung in Apache Kafka vorhalten,
|
||||||
so ist die nachfolgend genannte Konfiguration der Kafka-Topics hilfreich.
|
so ist die nachfolgend genannte Konfiguration der Kafka-Topics hilfreich.
|
||||||
@ -140,6 +183,50 @@ Wenn gewünscht, Änderungen in der `.env` vornehmen.
|
|||||||
docker compose up -d
|
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 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 betrieben werden.
|
||||||
|
|
||||||
|
Dabei werden, je nachdem welche Header durch den Reverse-Proxy gesendet werden auch Protokoll, Host oder auch Path-Prefix
|
||||||
|
automatisch erkannt und verwendet werden. Dadurch ist z.B. eine abweichende Angabe des Pfads problemlos möglich.
|
||||||
|
|
||||||
|
#### Beispiel *Traefik* (mit Docker-Labels):
|
||||||
|
|
||||||
|
Das folgende Beispiel zeigt die Konfiguration in einer Docker-Compose-Datei mit Service-Labels.
|
||||||
|
|
||||||
|
```
|
||||||
|
...
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- "traefik.http.routers.etl.rule=PathPrefix(`/etl-processor`)"
|
||||||
|
- "traefik.http.routers.etl.middlewares=etl-path-strip"
|
||||||
|
- "traefik.http.middlewares.etl-path-strip.stripprefix.prefixes=/etl-processor"
|
||||||
|
...
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Beispiel *nginx*
|
||||||
|
|
||||||
|
Das folgende Beispiel zeigt die Konfiguration einer _location_ in einer nginx-Konfigurationsdatei.
|
||||||
|
|
||||||
|
```
|
||||||
|
...
|
||||||
|
location /etl-processor {
|
||||||
|
set $upstream http://<beispiel:8080>/;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Forwarded-Scheme $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
}
|
||||||
|
...
|
||||||
|
```
|
||||||
|
|
||||||
## Entwicklungssetup
|
## Entwicklungssetup
|
||||||
|
|
||||||
Zum Starten einer lokalen Entwicklungs- und Testumgebung kann die beiliegende Datei `dev-compose.yml` verwendet werden.
|
Zum Starten einer lokalen Entwicklungs- und Testumgebung kann die beiliegende Datei `dev-compose.yml` verwendet werden.
|
||||||
|
@ -4,26 +4,22 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
war
|
war
|
||||||
id("org.springframework.boot") version "3.1.3"
|
id("org.springframework.boot") version "3.2.1"
|
||||||
id("io.spring.dependency-management") version "1.1.3"
|
id("io.spring.dependency-management") version "1.1.4"
|
||||||
kotlin("jvm") version "1.9.10"
|
kotlin("jvm") version "1.9.22"
|
||||||
kotlin("plugin.spring") version "1.9.10"
|
kotlin("plugin.spring") version "1.9.22"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "de.ukw.ccc"
|
group = "de.ukw.ccc"
|
||||||
version = "0.1.2"
|
version = "0.4.0"
|
||||||
|
|
||||||
var versions = mapOf(
|
var versions = mapOf(
|
||||||
"bwhc-dto-java" to "0.2.0",
|
"bwhc-dto-java" to "0.2.0",
|
||||||
"hapi-fhir" to "6.6.2",
|
"hapi-fhir" to "6.10.2",
|
||||||
"httpclient5" to "5.2.1",
|
"httpclient5" to "5.2.1",
|
||||||
"mockito-kotlin" to "5.1.0"
|
"mockito-kotlin" to "5.2.1"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Override Apache Kafka to be used
|
|
||||||
// Fixes: CVE-2023-34455, CVE-2023-34454, CVE-2023-34453
|
|
||||||
extra["kafka.version"] = "3.5.1"
|
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
@ -58,10 +54,10 @@ dependencies {
|
|||||||
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
|
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
|
||||||
implementation("org.springframework.boot:spring-boot-starter-web")
|
implementation("org.springframework.boot:spring-boot-starter-web")
|
||||||
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
|
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
|
||||||
|
implementation("org.springframework.boot:spring-boot-starter-security")
|
||||||
|
implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
|
||||||
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
|
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
|
||||||
implementation("org.springframework.kafka:spring-kafka")
|
implementation("org.springframework.kafka:spring-kafka")
|
||||||
// fix CVE-2022-1471
|
|
||||||
implementation("org.yaml:snakeyaml:2.1")
|
|
||||||
implementation("org.flywaydb:flyway-mysql")
|
implementation("org.flywaydb:flyway-mysql")
|
||||||
implementation("commons-codec:commons-codec")
|
implementation("commons-codec:commons-codec")
|
||||||
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
|
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
|
||||||
@ -69,6 +65,7 @@ dependencies {
|
|||||||
implementation("ca.uhn.hapi.fhir:hapi-fhir-base:${versions["hapi-fhir"]}")
|
implementation("ca.uhn.hapi.fhir:hapi-fhir-base:${versions["hapi-fhir"]}")
|
||||||
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${versions["hapi-fhir"]}")
|
implementation("ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${versions["hapi-fhir"]}")
|
||||||
implementation("org.apache.httpcomponents.client5:httpclient5:${versions["httpclient5"]}")
|
implementation("org.apache.httpcomponents.client5:httpclient5:${versions["httpclient5"]}")
|
||||||
|
implementation("com.jayway.jsonpath:json-path")
|
||||||
runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
|
runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
|
||||||
runtimeOnly("org.postgresql:postgresql")
|
runtimeOnly("org.postgresql:postgresql")
|
||||||
developmentOnly("org.springframework.boot:spring-boot-devtools")
|
developmentOnly("org.springframework.boot:spring-boot-devtools")
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
services:
|
services:
|
||||||
# Note: Make sure, hostname "kafka" points to 127.0.0.1
|
|
||||||
# otherwise connection will not be available
|
|
||||||
kafka:
|
kafka:
|
||||||
image: bitnami/kafka
|
image: bitnami/kafka
|
||||||
hostname: kafka
|
hostname: kafka
|
||||||
|
26
docs/docker-compose.yml
Normal file
26
docs/docker-compose.yml
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
### Example for docker-compose
|
||||||
|
version: '3.7'
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
data:
|
||||||
|
|
||||||
|
services:
|
||||||
|
|
||||||
|
### ETL-Processor
|
||||||
|
etl-processor:
|
||||||
|
image: ghcr.io/ccc-mf/etl-processor:latest
|
||||||
|
environment:
|
||||||
|
APP_REST_URI: http://bwhc-backend/bwhc/etl/api
|
||||||
|
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres/etl
|
||||||
|
SPRING_DATASOURCE_USERNAME: etl
|
||||||
|
SPRING_DATASOURCE_PASSWORD: etl-password
|
||||||
|
|
||||||
|
### Database
|
||||||
|
postgres:
|
||||||
|
image: postgres:alpine
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: etl
|
||||||
|
POSTGRES_USER: etl
|
||||||
|
POSTGRES_PASSWORD: etl-password
|
||||||
|
volumes:
|
||||||
|
- data:/var/lib/postgresql/data
|
@ -19,21 +19,38 @@
|
|||||||
|
|
||||||
package dev.dnpm.etl.processor
|
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.MtbFileSender
|
import dev.dnpm.etl.processor.output.MtbFileSender
|
||||||
import org.assertj.core.api.Assertions.assertThat
|
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.Test
|
||||||
import org.junit.jupiter.api.extension.ExtendWith
|
import org.junit.jupiter.api.extension.ExtendWith
|
||||||
|
import org.mockito.kotlin.*
|
||||||
import org.springframework.beans.factory.annotation.Autowired
|
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.context.SpringBootTest
|
||||||
import org.springframework.boot.test.mock.mockito.MockBean
|
import org.springframework.boot.test.mock.mockito.MockBean
|
||||||
import org.springframework.context.ApplicationContext
|
import org.springframework.context.ApplicationContext
|
||||||
|
import org.springframework.http.MediaType
|
||||||
|
import org.springframework.test.context.TestPropertySource
|
||||||
import org.springframework.test.context.junit.jupiter.SpringExtension
|
import org.springframework.test.context.junit.jupiter.SpringExtension
|
||||||
|
import org.springframework.test.web.servlet.MockMvc
|
||||||
|
import org.springframework.test.web.servlet.post
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers
|
import org.testcontainers.junit.jupiter.Testcontainers
|
||||||
|
|
||||||
@Testcontainers
|
@Testcontainers
|
||||||
@ExtendWith(SpringExtension::class)
|
@ExtendWith(SpringExtension::class)
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@MockBean(MtbFileSender::class)
|
@MockBean(MtbFileSender::class)
|
||||||
|
@TestPropertySource(
|
||||||
|
properties = [
|
||||||
|
"app.rest.uri=http://example.com"
|
||||||
|
]
|
||||||
|
)
|
||||||
class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
|
class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -42,4 +59,85 @@ class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
|
|||||||
assertThat(context).isNotNull
|
assertThat(context).isNotNull
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
|
||||||
|
@AutoConfigureMockMvc
|
||||||
|
@TestPropertySource(
|
||||||
|
properties = [
|
||||||
|
"app.transformations[0].path=diagnoses[*].icd10.version",
|
||||||
|
"app.transformations[0].from=2013",
|
||||||
|
"app.transformations[0].to=2014",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
inner class TransformationTest {
|
||||||
|
|
||||||
|
@MockBean
|
||||||
|
private lateinit var mtbFileSender: MtbFileSender
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private lateinit var mockMvc: MockMvc
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private lateinit var objectMapper: ObjectMapper
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
fun setup(@Autowired requestRepository: RequestRepository) {
|
||||||
|
requestRepository.deleteAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun mtbFileIsTransformed() {
|
||||||
|
doAnswer {
|
||||||
|
MtbFileSender.Response(RequestStatus.SUCCESS)
|
||||||
|
}.whenever(mtbFileSender).send(any<MtbFileSender.MtbFileRequest>())
|
||||||
|
|
||||||
|
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.ACTIVE)
|
||||||
|
.withPatient("TEST_12345678")
|
||||||
|
.build()
|
||||||
|
)
|
||||||
|
.withEpisode(
|
||||||
|
Episode.builder()
|
||||||
|
.withId("1")
|
||||||
|
.withPatient("TEST_12345678")
|
||||||
|
.withPeriod(PeriodStart("2023-08-08"))
|
||||||
|
.build()
|
||||||
|
)
|
||||||
|
.withDiagnoses(
|
||||||
|
listOf(
|
||||||
|
Diagnosis.builder()
|
||||||
|
.withId("1234")
|
||||||
|
.withIcd10(Icd10.builder().withCode("F79.9").withVersion("2013").build())
|
||||||
|
.build()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
mockMvc.post("/mtbfile") {
|
||||||
|
content = objectMapper.writeValueAsString(mtbFile)
|
||||||
|
contentType = MediaType.APPLICATION_JSON
|
||||||
|
}.andExpect {
|
||||||
|
status {
|
||||||
|
isAccepted()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val captor = argumentCaptor<MtbFileSender.MtbFileRequest>()
|
||||||
|
verify(mtbFileSender).send(captor.capture())
|
||||||
|
assertThat(captor.firstValue.mtbFile.diagnoses).hasSize(1).allMatch { diagnosis ->
|
||||||
|
diagnosis.icd10.version == "2014"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -31,13 +31,13 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException
|
|||||||
import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
|
import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
|
||||||
import org.springframework.boot.test.context.SpringBootTest
|
import org.springframework.boot.test.context.SpringBootTest
|
||||||
import org.springframework.boot.test.mock.mockito.MockBean
|
import org.springframework.boot.test.mock.mockito.MockBean
|
||||||
import org.springframework.boot.test.mock.mockito.MockBeans
|
|
||||||
import org.springframework.context.ApplicationContext
|
import org.springframework.context.ApplicationContext
|
||||||
import org.springframework.test.context.ContextConfiguration
|
import org.springframework.test.context.ContextConfiguration
|
||||||
import org.springframework.test.context.TestPropertySource
|
import org.springframework.test.context.TestPropertySource
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@ContextConfiguration(classes = [KafkaAutoConfiguration::class, AppKafkaConfiguration::class, AppRestConfiguration::class])
|
@ContextConfiguration(classes = [AppConfiguration::class, KafkaAutoConfiguration::class, AppKafkaConfiguration::class, AppRestConfiguration::class])
|
||||||
|
@MockBean(ObjectMapper::class)
|
||||||
class AppConfigurationTest {
|
class AppConfigurationTest {
|
||||||
|
|
||||||
@Nested
|
@Nested
|
||||||
@ -65,10 +65,7 @@ class AppConfigurationTest {
|
|||||||
"app.kafka.group-id=test"
|
"app.kafka.group-id=test"
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@MockBeans(value = [
|
@MockBean(RequestRepository::class)
|
||||||
MockBean(ObjectMapper::class),
|
|
||||||
MockBean(RequestRepository::class)
|
|
||||||
])
|
|
||||||
inner class AppConfigurationKafkaTest(private val context: ApplicationContext) {
|
inner class AppConfigurationKafkaTest(private val context: ApplicationContext) {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -99,4 +96,24 @@ class AppConfigurationTest {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
@TestPropertySource(
|
||||||
|
properties = [
|
||||||
|
"app.transformations[0].path=consent.status",
|
||||||
|
"app.transformations[0].from=rejected",
|
||||||
|
"app.transformations[0].to=accept",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
inner class AppConfigurationTransformationTest(private val context: ApplicationContext) {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun shouldRecognizeTransformations() {
|
||||||
|
val appConfigProperties = context.getBean(AppConfigProperties::class.java)
|
||||||
|
|
||||||
|
assertThat(appConfigProperties).isNotNull
|
||||||
|
assertThat(appConfigProperties.transformations).hasSize(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -32,6 +32,7 @@ import org.junit.jupiter.api.extension.ExtendWith
|
|||||||
import org.springframework.beans.factory.annotation.Autowired
|
import org.springframework.beans.factory.annotation.Autowired
|
||||||
import org.springframework.boot.test.context.SpringBootTest
|
import org.springframework.boot.test.context.SpringBootTest
|
||||||
import org.springframework.boot.test.mock.mockito.MockBean
|
import org.springframework.boot.test.mock.mockito.MockBean
|
||||||
|
import org.springframework.test.context.TestPropertySource
|
||||||
import org.springframework.test.context.junit.jupiter.SpringExtension
|
import org.springframework.test.context.junit.jupiter.SpringExtension
|
||||||
import org.springframework.transaction.annotation.Transactional
|
import org.springframework.transaction.annotation.Transactional
|
||||||
import org.testcontainers.junit.jupiter.Testcontainers
|
import org.testcontainers.junit.jupiter.Testcontainers
|
||||||
@ -43,6 +44,11 @@ import java.util.*
|
|||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
@Transactional
|
@Transactional
|
||||||
@MockBean(MtbFileSender::class)
|
@MockBean(MtbFileSender::class)
|
||||||
|
@TestPropertySource(
|
||||||
|
properties = [
|
||||||
|
"app.rest.uri=http://example.com"
|
||||||
|
]
|
||||||
|
)
|
||||||
class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
|
class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
|
||||||
|
|
||||||
private lateinit var requestRepository: RequestRepository
|
private lateinit var requestRepository: RequestRepository
|
||||||
|
@ -127,7 +127,21 @@ public class GpasPseudonymGenerator implements Generator {
|
|||||||
.orElseGet(ParametersParameterComponent::new).getValue();
|
.orElseGet(ParametersParameterComponent::new).getValue();
|
||||||
|
|
||||||
// pseudonym
|
// pseudonym
|
||||||
return identifier.getSystem() + "|" + identifier.getValue();
|
return sanitizeValue(identifier.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Allow only filename friendly values
|
||||||
|
*
|
||||||
|
* @param psnValue GAPS pseudonym value
|
||||||
|
* @return cleaned up value
|
||||||
|
*/
|
||||||
|
public static String sanitizeValue(String psnValue) {
|
||||||
|
// pattern to match forbidden characters
|
||||||
|
String forbiddenCharsRegex = "[\\\\/:*?\"<>|;]";
|
||||||
|
|
||||||
|
// Replace all forbidden characters with underscores
|
||||||
|
return psnValue.replaceAll(forbiddenCharsRegex, "_");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -20,9 +20,10 @@
|
|||||||
package dev.dnpm.etl.processor
|
package dev.dnpm.etl.processor
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication
|
import org.springframework.boot.autoconfigure.SpringBootApplication
|
||||||
|
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
|
||||||
import org.springframework.boot.runApplication
|
import org.springframework.boot.runApplication
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication(exclude = [SecurityAutoConfiguration::class])
|
||||||
class EtlProcessorApplication
|
class EtlProcessorApplication
|
||||||
|
|
||||||
fun main(args: Array<String>) {
|
fun main(args: Array<String>) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -24,7 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties
|
|||||||
@ConfigurationProperties(AppConfigProperties.NAME)
|
@ConfigurationProperties(AppConfigProperties.NAME)
|
||||||
data class AppConfigProperties(
|
data class AppConfigProperties(
|
||||||
var bwhcUri: String?,
|
var bwhcUri: String?,
|
||||||
var generator: PseudonymGenerator = PseudonymGenerator.BUILDIN
|
var generator: PseudonymGenerator = PseudonymGenerator.BUILDIN,
|
||||||
|
var transformations: List<TransformationProperties> = listOf()
|
||||||
) {
|
) {
|
||||||
companion object {
|
companion object {
|
||||||
const val NAME = "app"
|
const val NAME = "app"
|
||||||
@ -75,7 +76,23 @@ data class KafkaTargetProperties(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ConfigurationProperties(SecurityConfigProperties.NAME)
|
||||||
|
data class SecurityConfigProperties(
|
||||||
|
val adminUser: String?,
|
||||||
|
val adminPassword: String?,
|
||||||
|
) {
|
||||||
|
companion object {
|
||||||
|
const val NAME = "app.security"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
enum class PseudonymGenerator {
|
enum class PseudonymGenerator {
|
||||||
BUILDIN,
|
BUILDIN,
|
||||||
GPAS
|
GPAS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data class TransformationProperties(
|
||||||
|
val path: String,
|
||||||
|
val from: String,
|
||||||
|
val to: String
|
||||||
|
)
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -25,11 +25,21 @@ import dev.dnpm.etl.processor.pseudonym.AnonymizingGenerator
|
|||||||
import dev.dnpm.etl.processor.pseudonym.Generator
|
import dev.dnpm.etl.processor.pseudonym.Generator
|
||||||
import dev.dnpm.etl.processor.pseudonym.GpasPseudonymGenerator
|
import dev.dnpm.etl.processor.pseudonym.GpasPseudonymGenerator
|
||||||
import dev.dnpm.etl.processor.pseudonym.PseudonymizeService
|
import dev.dnpm.etl.processor.pseudonym.PseudonymizeService
|
||||||
|
import dev.dnpm.etl.processor.services.Transformation
|
||||||
|
import dev.dnpm.etl.processor.services.TransformationService
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
|
||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties
|
import org.springframework.boot.context.properties.EnableConfigurationProperties
|
||||||
import org.springframework.context.annotation.Bean
|
import org.springframework.context.annotation.Bean
|
||||||
import org.springframework.context.annotation.Configuration
|
import org.springframework.context.annotation.Configuration
|
||||||
|
import org.springframework.retry.policy.SimpleRetryPolicy
|
||||||
|
import org.springframework.retry.support.RetryTemplate
|
||||||
|
import org.springframework.retry.support.RetryTemplateBuilder
|
||||||
|
import org.springframework.scheduling.annotation.EnableScheduling
|
||||||
import reactor.core.publisher.Sinks
|
import reactor.core.publisher.Sinks
|
||||||
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
import kotlin.time.toJavaDuration
|
||||||
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableConfigurationProperties(
|
@EnableConfigurationProperties(
|
||||||
@ -39,8 +49,11 @@ import reactor.core.publisher.Sinks
|
|||||||
GPasConfigProperties::class
|
GPasConfigProperties::class
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
@EnableScheduling
|
||||||
class AppConfiguration {
|
class AppConfiguration {
|
||||||
|
|
||||||
|
private val logger = LoggerFactory.getLogger(AppConfiguration::class.java)
|
||||||
|
|
||||||
@ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
|
@ConditionalOnProperty(value = ["app.pseudonymizer"], havingValue = "GPAS")
|
||||||
@Bean
|
@Bean
|
||||||
fun gpasPseudonymGenerator(configProperties: GPasConfigProperties): Generator {
|
fun gpasPseudonymGenerator(configProperties: GPasConfigProperties): Generator {
|
||||||
@ -71,5 +84,25 @@ class AppConfiguration {
|
|||||||
return Sinks.many().multicast().directBestEffort()
|
return Sinks.many().multicast().directBestEffort()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun transformationService(
|
||||||
|
objectMapper: ObjectMapper,
|
||||||
|
configProperties: AppConfigProperties
|
||||||
|
): TransformationService {
|
||||||
|
logger.info("Apply ${configProperties.transformations.size} transformation rules")
|
||||||
|
return TransformationService(objectMapper, configProperties.transformations.map {
|
||||||
|
Transformation.of(it.path) from it.from to it.to
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun retryTemplate(): RetryTemplate {
|
||||||
|
return RetryTemplateBuilder()
|
||||||
|
.notRetryOn(IllegalArgumentException::class.java)
|
||||||
|
.fixedBackoff(5.seconds.toJavaDuration())
|
||||||
|
.customPolicy(SimpleRetryPolicy(3))
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -20,6 +20,8 @@
|
|||||||
package dev.dnpm.etl.processor.config
|
package dev.dnpm.etl.processor.config
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
|
||||||
|
import dev.dnpm.etl.processor.monitoring.KafkaConnectionCheckService
|
||||||
import dev.dnpm.etl.processor.output.KafkaMtbFileSender
|
import dev.dnpm.etl.processor.output.KafkaMtbFileSender
|
||||||
import dev.dnpm.etl.processor.output.MtbFileSender
|
import dev.dnpm.etl.processor.output.MtbFileSender
|
||||||
import dev.dnpm.etl.processor.services.kafka.KafkaResponseProcessor
|
import dev.dnpm.etl.processor.services.kafka.KafkaResponseProcessor
|
||||||
@ -35,6 +37,7 @@ import org.springframework.kafka.core.ConsumerFactory
|
|||||||
import org.springframework.kafka.core.KafkaTemplate
|
import org.springframework.kafka.core.KafkaTemplate
|
||||||
import org.springframework.kafka.listener.ContainerProperties
|
import org.springframework.kafka.listener.ContainerProperties
|
||||||
import org.springframework.kafka.listener.KafkaMessageListenerContainer
|
import org.springframework.kafka.listener.KafkaMessageListenerContainer
|
||||||
|
import org.springframework.retry.support.RetryTemplate
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableConfigurationProperties(
|
@EnableConfigurationProperties(
|
||||||
@ -51,10 +54,11 @@ class AppKafkaConfiguration {
|
|||||||
fun kafkaMtbFileSender(
|
fun kafkaMtbFileSender(
|
||||||
kafkaTemplate: KafkaTemplate<String, String>,
|
kafkaTemplate: KafkaTemplate<String, String>,
|
||||||
kafkaTargetProperties: KafkaTargetProperties,
|
kafkaTargetProperties: KafkaTargetProperties,
|
||||||
|
retryTemplate: RetryTemplate,
|
||||||
objectMapper: ObjectMapper
|
objectMapper: ObjectMapper
|
||||||
): MtbFileSender {
|
): MtbFileSender {
|
||||||
logger.info("Selected 'KafkaMtbFileSender'")
|
logger.info("Selected 'KafkaMtbFileSender'")
|
||||||
return KafkaMtbFileSender(kafkaTemplate, kafkaTargetProperties, objectMapper)
|
return KafkaMtbFileSender(kafkaTemplate, kafkaTargetProperties, retryTemplate, objectMapper)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ -76,4 +80,9 @@ class AppKafkaConfiguration {
|
|||||||
return KafkaResponseProcessor(applicationEventPublisher, objectMapper)
|
return KafkaResponseProcessor(applicationEventPublisher, objectMapper)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun connectionCheckService(consumerFactory: ConsumerFactory<String, String>): ConnectionCheckService {
|
||||||
|
return KafkaConnectionCheckService(consumerFactory.createConsumer())
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -19,6 +19,8 @@
|
|||||||
|
|
||||||
package dev.dnpm.etl.processor.config
|
package dev.dnpm.etl.processor.config
|
||||||
|
|
||||||
|
import dev.dnpm.etl.processor.monitoring.ConnectionCheckService
|
||||||
|
import dev.dnpm.etl.processor.monitoring.RestConnectionCheckService
|
||||||
import dev.dnpm.etl.processor.output.MtbFileSender
|
import dev.dnpm.etl.processor.output.MtbFileSender
|
||||||
import dev.dnpm.etl.processor.output.RestMtbFileSender
|
import dev.dnpm.etl.processor.output.RestMtbFileSender
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
@ -28,6 +30,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
|
|||||||
import org.springframework.context.annotation.Bean
|
import org.springframework.context.annotation.Bean
|
||||||
import org.springframework.context.annotation.Configuration
|
import org.springframework.context.annotation.Configuration
|
||||||
import org.springframework.core.annotation.Order
|
import org.springframework.core.annotation.Order
|
||||||
|
import org.springframework.retry.support.RetryTemplate
|
||||||
import org.springframework.web.client.RestTemplate
|
import org.springframework.web.client.RestTemplate
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ -49,9 +52,21 @@ class AppRestConfiguration {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
fun restMtbFileSender(restTemplate: RestTemplate, restTargetProperties: RestTargetProperties): MtbFileSender {
|
fun restMtbFileSender(
|
||||||
|
restTemplate: RestTemplate,
|
||||||
|
restTargetProperties: RestTargetProperties,
|
||||||
|
retryTemplate: RetryTemplate
|
||||||
|
): MtbFileSender {
|
||||||
logger.info("Selected 'RestMtbFileSender'")
|
logger.info("Selected 'RestMtbFileSender'")
|
||||||
return RestMtbFileSender(restTemplate, restTargetProperties)
|
return RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun connectionCheckService(
|
||||||
|
restTemplate: RestTemplate,
|
||||||
|
restTargetProperties: RestTargetProperties
|
||||||
|
): ConnectionCheckService {
|
||||||
|
return RestConnectionCheckService(restTemplate, restTargetProperties)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ETL-Processor
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* 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.config
|
||||||
|
|
||||||
|
import org.slf4j.LoggerFactory
|
||||||
|
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.Configuration
|
||||||
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity
|
||||||
|
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
|
||||||
|
import org.springframework.security.config.annotation.web.invoke
|
||||||
|
import org.springframework.security.core.userdetails.User
|
||||||
|
import org.springframework.security.core.userdetails.UserDetails
|
||||||
|
import org.springframework.security.crypto.factory.PasswordEncoderFactories
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder
|
||||||
|
import org.springframework.security.provisioning.InMemoryUserDetailsManager
|
||||||
|
import org.springframework.security.web.SecurityFilterChain
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableConfigurationProperties(
|
||||||
|
value = [
|
||||||
|
SecurityConfigProperties::class
|
||||||
|
]
|
||||||
|
)
|
||||||
|
@ConditionalOnProperty(value = ["app.security.admin-user"])
|
||||||
|
@EnableWebSecurity
|
||||||
|
class AppSecurityConfiguration(
|
||||||
|
private val securityConfigProperties: SecurityConfigProperties
|
||||||
|
) {
|
||||||
|
|
||||||
|
private val logger = LoggerFactory.getLogger(AppSecurityConfiguration::class.java)
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun userDetailsService(passwordEncoder: PasswordEncoder): InMemoryUserDetailsManager {
|
||||||
|
val adminUser = if (securityConfigProperties.adminUser.isNullOrBlank()) {
|
||||||
|
logger.warn("Using random Admin User: admin")
|
||||||
|
"admin"
|
||||||
|
} else {
|
||||||
|
securityConfigProperties.adminUser
|
||||||
|
}
|
||||||
|
|
||||||
|
val adminPassword = if (securityConfigProperties.adminPassword.isNullOrBlank()) {
|
||||||
|
val random = UUID.randomUUID().toString()
|
||||||
|
logger.warn("Using random Admin Passwort: {}", random)
|
||||||
|
passwordEncoder.encode(random)
|
||||||
|
} else {
|
||||||
|
securityConfigProperties.adminPassword
|
||||||
|
}
|
||||||
|
|
||||||
|
val user: UserDetails = User.withUsername(adminUser)
|
||||||
|
.password(adminPassword)
|
||||||
|
.roles("ADMIN")
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return InMemoryUserDetailsManager(user)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun filterChain(http: HttpSecurity): SecurityFilterChain {
|
||||||
|
http {
|
||||||
|
authorizeRequests {
|
||||||
|
authorize("/configs/**", hasRole("ADMIN"))
|
||||||
|
authorize(anyRequest, permitAll)
|
||||||
|
}
|
||||||
|
formLogin {
|
||||||
|
loginPage = "/login"
|
||||||
|
}
|
||||||
|
csrf { disable() }
|
||||||
|
}
|
||||||
|
return http.build()
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
fun passwordEncoder(): PasswordEncoder {
|
||||||
|
return PasswordEncoderFactories.createDelegatingPasswordEncoder()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
* 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.config.RestTargetProperties
|
||||||
|
import jakarta.annotation.PostConstruct
|
||||||
|
import org.apache.kafka.clients.consumer.Consumer
|
||||||
|
import org.apache.kafka.common.errors.TimeoutException
|
||||||
|
import org.springframework.http.HttpStatus
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled
|
||||||
|
import org.springframework.web.client.RestTemplate
|
||||||
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
import kotlin.time.toJavaDuration
|
||||||
|
|
||||||
|
interface ConnectionCheckService {
|
||||||
|
|
||||||
|
fun connectionAvailable(): Boolean
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class KafkaConnectionCheckService(
|
||||||
|
private val consumer: Consumer<String, String>
|
||||||
|
) : ConnectionCheckService {
|
||||||
|
|
||||||
|
private var connectionAvailable: Boolean = false
|
||||||
|
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
@Scheduled(cron = "0 * * * * *")
|
||||||
|
fun check() {
|
||||||
|
connectionAvailable = try {
|
||||||
|
null != consumer.listTopics(5.seconds.toJavaDuration())
|
||||||
|
} catch (e: TimeoutException) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun connectionAvailable(): Boolean {
|
||||||
|
return this.connectionAvailable
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class RestConnectionCheckService(
|
||||||
|
private val restTemplate: RestTemplate,
|
||||||
|
private val restTargetProperties: RestTargetProperties
|
||||||
|
) : ConnectionCheckService {
|
||||||
|
|
||||||
|
private var connectionAvailable: Boolean = false
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
@Scheduled(cron = "0 * * * * *")
|
||||||
|
fun check() {
|
||||||
|
connectionAvailable = try {
|
||||||
|
restTemplate.getForEntity(
|
||||||
|
restTargetProperties.uri?.replace("/etl/api", "").toString(),
|
||||||
|
String::class.java
|
||||||
|
).statusCode == HttpStatus.OK
|
||||||
|
} catch (e: Exception) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun connectionAvailable(): Boolean {
|
||||||
|
return this.connectionAvailable
|
||||||
|
}
|
||||||
|
}
|
@ -34,7 +34,10 @@ class ReportService(
|
|||||||
return listOf()
|
return listOf()
|
||||||
}
|
}
|
||||||
return try {
|
return try {
|
||||||
objectMapper.readValue(dataQualityReport, DataQualityReport::class.java).issues
|
objectMapper
|
||||||
|
.readValue(dataQualityReport, DataQualityReport::class.java)
|
||||||
|
.issues
|
||||||
|
.sortedBy { it.severity }
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
val otherIssue =
|
val otherIssue =
|
||||||
Issue(Severity.ERROR, "Not parsable data quality report '$dataQualityReport'")
|
Issue(Severity.ERROR, "Not parsable data quality report '$dataQualityReport'")
|
||||||
@ -56,5 +59,6 @@ class ReportService(
|
|||||||
enum class Severity(@JsonValue val value: String) {
|
enum class Severity(@JsonValue val value: String) {
|
||||||
ERROR("error"),
|
ERROR("error"),
|
||||||
WARNING("warning"),
|
WARNING("warning"),
|
||||||
|
INFO("info")
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -24,6 +24,7 @@ import org.springframework.data.jdbc.repository.query.Query
|
|||||||
import org.springframework.data.relational.core.mapping.Embedded
|
import org.springframework.data.relational.core.mapping.Embedded
|
||||||
import org.springframework.data.relational.core.mapping.Table
|
import org.springframework.data.relational.core.mapping.Table
|
||||||
import org.springframework.data.repository.CrudRepository
|
import org.springframework.data.repository.CrudRepository
|
||||||
|
import org.springframework.data.repository.PagingAndSortingRepository
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
@ -52,7 +53,7 @@ data class CountedState(
|
|||||||
val status: RequestStatus,
|
val status: RequestStatus,
|
||||||
)
|
)
|
||||||
|
|
||||||
interface RequestRepository : CrudRepository<Request, Long> {
|
interface RequestRepository : CrudRepository<Request, Long>, PagingAndSortingRepository<Request, Long> {
|
||||||
|
|
||||||
fun findAllByPatientIdOrderByProcessedAtDesc(patientId: String): List<Request>
|
fun findAllByPatientIdOrderByProcessedAtDesc(patientId: String): List<Request>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -26,10 +26,12 @@ import dev.dnpm.etl.processor.config.KafkaTargetProperties
|
|||||||
import dev.dnpm.etl.processor.monitoring.RequestStatus
|
import dev.dnpm.etl.processor.monitoring.RequestStatus
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
import org.springframework.kafka.core.KafkaTemplate
|
import org.springframework.kafka.core.KafkaTemplate
|
||||||
|
import org.springframework.retry.support.RetryTemplate
|
||||||
|
|
||||||
class KafkaMtbFileSender(
|
class KafkaMtbFileSender(
|
||||||
private val kafkaTemplate: KafkaTemplate<String, String>,
|
private val kafkaTemplate: KafkaTemplate<String, String>,
|
||||||
private val kafkaTargetProperties: KafkaTargetProperties,
|
private val kafkaTargetProperties: KafkaTargetProperties,
|
||||||
|
private val retryTemplate: RetryTemplate,
|
||||||
private val objectMapper: ObjectMapper
|
private val objectMapper: ObjectMapper
|
||||||
) : MtbFileSender {
|
) : MtbFileSender {
|
||||||
|
|
||||||
@ -37,16 +39,18 @@ class KafkaMtbFileSender(
|
|||||||
|
|
||||||
override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
|
override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
|
||||||
return try {
|
return try {
|
||||||
val result = kafkaTemplate.send(
|
return retryTemplate.execute<MtbFileSender.Response, Exception> {
|
||||||
kafkaTargetProperties.topic,
|
val result = kafkaTemplate.send(
|
||||||
key(request),
|
kafkaTargetProperties.topic,
|
||||||
objectMapper.writeValueAsString(Data(request.requestId, request.mtbFile))
|
key(request),
|
||||||
)
|
objectMapper.writeValueAsString(Data(request.requestId, request.mtbFile))
|
||||||
if (result.get() != null) {
|
)
|
||||||
logger.debug("Sent file via KafkaMtbFileSender")
|
if (result.get() != null) {
|
||||||
MtbFileSender.Response(RequestStatus.UNKNOWN)
|
logger.debug("Sent file via KafkaMtbFileSender")
|
||||||
} else {
|
MtbFileSender.Response(RequestStatus.UNKNOWN)
|
||||||
MtbFileSender.Response(RequestStatus.ERROR)
|
} else {
|
||||||
|
MtbFileSender.Response(RequestStatus.ERROR)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
logger.error("An error occurred sending to kafka", e)
|
logger.error("An error occurred sending to kafka", e)
|
||||||
@ -65,17 +69,19 @@ class KafkaMtbFileSender(
|
|||||||
.build()
|
.build()
|
||||||
|
|
||||||
return try {
|
return try {
|
||||||
val result = kafkaTemplate.send(
|
return retryTemplate.execute<MtbFileSender.Response, Exception> {
|
||||||
kafkaTargetProperties.topic,
|
val result = kafkaTemplate.send(
|
||||||
key(request),
|
kafkaTargetProperties.topic,
|
||||||
objectMapper.writeValueAsString(Data(request.requestId, dummyMtbFile))
|
key(request),
|
||||||
)
|
objectMapper.writeValueAsString(Data(request.requestId, dummyMtbFile))
|
||||||
|
)
|
||||||
|
|
||||||
if (result.get() != null) {
|
if (result.get() != null) {
|
||||||
logger.debug("Sent deletion request via KafkaMtbFileSender")
|
logger.debug("Sent deletion request via KafkaMtbFileSender")
|
||||||
MtbFileSender.Response(RequestStatus.UNKNOWN)
|
MtbFileSender.Response(RequestStatus.UNKNOWN)
|
||||||
} else {
|
} else {
|
||||||
MtbFileSender.Response(RequestStatus.ERROR)
|
MtbFileSender.Response(RequestStatus.ERROR)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
logger.error("An error occurred sending to kafka", e)
|
logger.error("An error occurred sending to kafka", e)
|
||||||
@ -83,6 +89,10 @@ class KafkaMtbFileSender(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun endpoint(): String {
|
||||||
|
return "${this.kafkaTargetProperties.servers} (${this.kafkaTargetProperties.topic}/${this.kafkaTargetProperties.responseTopic})"
|
||||||
|
}
|
||||||
|
|
||||||
private fun key(request: MtbFileSender.MtbFileRequest): String {
|
private fun key(request: MtbFileSender.MtbFileRequest): String {
|
||||||
return "{\"pid\": \"${request.mtbFile.patient.id}\", " +
|
return "{\"pid\": \"${request.mtbFile.patient.id}\", " +
|
||||||
"\"eid\": \"${request.mtbFile.episode.id}\"}"
|
"\"eid\": \"${request.mtbFile.episode.id}\"}"
|
||||||
|
@ -28,6 +28,8 @@ interface MtbFileSender {
|
|||||||
|
|
||||||
fun send(request: DeleteRequest): Response
|
fun send(request: DeleteRequest): Response
|
||||||
|
|
||||||
|
fun endpoint(): String
|
||||||
|
|
||||||
data class Response(val status: RequestStatus, val body: String = "")
|
data class Response(val status: RequestStatus, val body: String = "")
|
||||||
|
|
||||||
data class MtbFileRequest(val requestId: String, val mtbFile: MtbFile)
|
data class MtbFileRequest(val requestId: String, val mtbFile: MtbFile)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -25,32 +25,39 @@ import org.slf4j.LoggerFactory
|
|||||||
import org.springframework.http.HttpEntity
|
import org.springframework.http.HttpEntity
|
||||||
import org.springframework.http.HttpHeaders
|
import org.springframework.http.HttpHeaders
|
||||||
import org.springframework.http.MediaType
|
import org.springframework.http.MediaType
|
||||||
|
import org.springframework.retry.support.RetryTemplate
|
||||||
import org.springframework.web.client.RestClientException
|
import org.springframework.web.client.RestClientException
|
||||||
import org.springframework.web.client.RestTemplate
|
import org.springframework.web.client.RestTemplate
|
||||||
|
|
||||||
class RestMtbFileSender(
|
class RestMtbFileSender(
|
||||||
private val restTemplate: RestTemplate,
|
private val restTemplate: RestTemplate,
|
||||||
private val restTargetProperties: RestTargetProperties
|
private val restTargetProperties: RestTargetProperties,
|
||||||
|
private val retryTemplate: RetryTemplate
|
||||||
) : MtbFileSender {
|
) : MtbFileSender {
|
||||||
|
|
||||||
private val logger = LoggerFactory.getLogger(RestMtbFileSender::class.java)
|
private val logger = LoggerFactory.getLogger(RestMtbFileSender::class.java)
|
||||||
|
|
||||||
override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
|
override fun send(request: MtbFileSender.MtbFileRequest): MtbFileSender.Response {
|
||||||
try {
|
try {
|
||||||
val headers = HttpHeaders()
|
return retryTemplate.execute<MtbFileSender.Response, Exception> {
|
||||||
headers.contentType = MediaType.APPLICATION_JSON
|
val headers = HttpHeaders()
|
||||||
val entityReq = HttpEntity(request.mtbFile, headers)
|
headers.contentType = MediaType.APPLICATION_JSON
|
||||||
val response = restTemplate.postForEntity(
|
val entityReq = HttpEntity(request.mtbFile, headers)
|
||||||
"${restTargetProperties.uri}/MTBFile",
|
val response = restTemplate.postForEntity(
|
||||||
entityReq,
|
"${restTargetProperties.uri}/MTBFile",
|
||||||
String::class.java
|
entityReq,
|
||||||
)
|
String::class.java
|
||||||
if (!response.statusCode.is2xxSuccessful) {
|
)
|
||||||
logger.warn("Error sending to remote system: {}", response.body)
|
if (!response.statusCode.is2xxSuccessful) {
|
||||||
return MtbFileSender.Response(response.statusCode.asRequestStatus(), "Status-Code: ${response.statusCode.value()}")
|
logger.warn("Error sending to remote system: {}", response.body)
|
||||||
|
return@execute MtbFileSender.Response(
|
||||||
|
response.statusCode.asRequestStatus(),
|
||||||
|
"Status-Code: ${response.statusCode.value()}"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
logger.debug("Sent file via RestMtbFileSender")
|
||||||
|
return@execute MtbFileSender.Response(response.statusCode.asRequestStatus(), response.body.orEmpty())
|
||||||
}
|
}
|
||||||
logger.debug("Sent file via RestMtbFileSender")
|
|
||||||
return MtbFileSender.Response(response.statusCode.asRequestStatus(), response.body.orEmpty())
|
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
logger.error("Not a valid URI to export to: '{}'", restTargetProperties.uri!!)
|
logger.error("Not a valid URI to export to: '{}'", restTargetProperties.uri!!)
|
||||||
} catch (e: RestClientException) {
|
} catch (e: RestClientException) {
|
||||||
@ -62,16 +69,18 @@ class RestMtbFileSender(
|
|||||||
|
|
||||||
override fun send(request: MtbFileSender.DeleteRequest): MtbFileSender.Response {
|
override fun send(request: MtbFileSender.DeleteRequest): MtbFileSender.Response {
|
||||||
try {
|
try {
|
||||||
val headers = HttpHeaders()
|
return retryTemplate.execute<MtbFileSender.Response, Exception> {
|
||||||
headers.contentType = MediaType.APPLICATION_JSON
|
val headers = HttpHeaders()
|
||||||
val entityReq = HttpEntity(null, headers)
|
headers.contentType = MediaType.APPLICATION_JSON
|
||||||
restTemplate.delete(
|
val entityReq = HttpEntity(null, headers)
|
||||||
"${restTargetProperties.uri}/Patient/${request.patientId}",
|
restTemplate.delete(
|
||||||
entityReq,
|
"${restTargetProperties.uri}/Patient/${request.patientId}",
|
||||||
String::class.java
|
entityReq,
|
||||||
)
|
String::class.java
|
||||||
logger.debug("Sent file via RestMtbFileSender")
|
)
|
||||||
return MtbFileSender.Response(RequestStatus.SUCCESS)
|
logger.debug("Sent file via RestMtbFileSender")
|
||||||
|
return@execute MtbFileSender.Response(RequestStatus.SUCCESS)
|
||||||
|
}
|
||||||
} catch (e: IllegalArgumentException) {
|
} catch (e: IllegalArgumentException) {
|
||||||
logger.error("Not a valid URI to export to: '{}'", restTargetProperties.uri!!)
|
logger.error("Not a valid URI to export to: '{}'", restTargetProperties.uri!!)
|
||||||
} catch (e: RestClientException) {
|
} catch (e: RestClientException) {
|
||||||
@ -81,4 +90,8 @@ class RestMtbFileSender(
|
|||||||
return MtbFileSender.Response(RequestStatus.ERROR, "Sonstiger Fehler bei der Übertragung")
|
return MtbFileSender.Response(RequestStatus.ERROR, "Sonstiger Fehler bei der Übertragung")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun endpoint(): String {
|
||||||
|
return this.restTargetProperties.uri.orEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -35,7 +35,10 @@ infix fun MtbFile.pseudonymizeWith(pseudonymizeService: PseudonymizeService) {
|
|||||||
this.familyMemberDiagnoses.forEach { it.patient = patientPseudonym }
|
this.familyMemberDiagnoses.forEach { it.patient = patientPseudonym }
|
||||||
this.geneticCounsellingRequests.forEach { it.patient = patientPseudonym }
|
this.geneticCounsellingRequests.forEach { it.patient = patientPseudonym }
|
||||||
this.histologyReevaluationRequests.forEach { it.patient = patientPseudonym }
|
this.histologyReevaluationRequests.forEach { it.patient = patientPseudonym }
|
||||||
this.histologyReports.forEach { it.patient = patientPseudonym }
|
this.histologyReports.forEach {
|
||||||
|
it.patient = patientPseudonym
|
||||||
|
it.tumorMorphology.patient = patientPseudonym
|
||||||
|
}
|
||||||
this.lastGuidelineTherapies.forEach { it.patient = patientPseudonym }
|
this.lastGuidelineTherapies.forEach { it.patient = patientPseudonym }
|
||||||
this.molecularPathologyFindings.forEach { it.patient = patientPseudonym }
|
this.molecularPathologyFindings.forEach { it.patient = patientPseudonym }
|
||||||
this.molecularTherapies.forEach { molecularTherapy -> molecularTherapy.history.forEach { it.patient = patientPseudonym } }
|
this.molecularTherapies.forEach { molecularTherapy -> molecularTherapy.history.forEach { it.patient = patientPseudonym } }
|
||||||
@ -45,6 +48,6 @@ infix fun MtbFile.pseudonymizeWith(pseudonymizeService: PseudonymizeService) {
|
|||||||
this.recommendations.forEach { it.patient = patientPseudonym }
|
this.recommendations.forEach { it.patient = patientPseudonym }
|
||||||
this.recommendations.forEach { it.patient = patientPseudonym }
|
this.recommendations.forEach { it.patient = patientPseudonym }
|
||||||
this.responses.forEach { it.patient = patientPseudonym }
|
this.responses.forEach { it.patient = patientPseudonym }
|
||||||
this.specimens.forEach { it.patient = patientPseudonym }
|
this.studyInclusionRequests.forEach { it.patient = patientPseudonym }
|
||||||
this.specimens.forEach { it.patient = patientPseudonym }
|
this.specimens.forEach { it.patient = patientPseudonym }
|
||||||
}
|
}
|
@ -38,6 +38,7 @@ import java.util.*
|
|||||||
@Service
|
@Service
|
||||||
class RequestProcessor(
|
class RequestProcessor(
|
||||||
private val pseudonymizeService: PseudonymizeService,
|
private val pseudonymizeService: PseudonymizeService,
|
||||||
|
private val transformationService: TransformationService,
|
||||||
private val sender: MtbFileSender,
|
private val sender: MtbFileSender,
|
||||||
private val requestService: RequestService,
|
private val requestService: RequestService,
|
||||||
private val objectMapper: ObjectMapper,
|
private val objectMapper: ObjectMapper,
|
||||||
@ -50,7 +51,7 @@ class RequestProcessor(
|
|||||||
|
|
||||||
mtbFile pseudonymizeWith pseudonymizeService
|
mtbFile pseudonymizeWith pseudonymizeService
|
||||||
|
|
||||||
val request = MtbFileSender.MtbFileRequest(requestId, mtbFile)
|
val request = MtbFileSender.MtbFileRequest(requestId, transformationService.transform(mtbFile))
|
||||||
|
|
||||||
requestService.save(
|
requestService.save(
|
||||||
Request(
|
Request(
|
||||||
|
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ETL-Processor
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* 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.services
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
import com.jayway.jsonpath.JsonPath
|
||||||
|
import com.jayway.jsonpath.PathNotFoundException
|
||||||
|
import de.ukw.ccc.bwhc.dto.MtbFile
|
||||||
|
|
||||||
|
class TransformationService(private val objectMapper: ObjectMapper, private val transformations: List<Transformation>) {
|
||||||
|
fun transform(mtbFile: MtbFile): MtbFile {
|
||||||
|
var json = objectMapper.writeValueAsString(mtbFile)
|
||||||
|
|
||||||
|
transformations.forEach { transformation ->
|
||||||
|
val jsonPath = JsonPath.parse(json)
|
||||||
|
|
||||||
|
try {
|
||||||
|
val before = transformation.path.substringBeforeLast(".")
|
||||||
|
val last = transformation.path.substringAfterLast(".")
|
||||||
|
|
||||||
|
val existingValue = if (transformation.existingValue is Number) transformation.existingValue else transformation.existingValue.toString()
|
||||||
|
val newValue = if (transformation.newValue is Number) transformation.newValue else transformation.newValue.toString()
|
||||||
|
|
||||||
|
jsonPath.set("$.$before.[?]$last", newValue, {
|
||||||
|
it.item(HashMap::class.java)[last] == existingValue
|
||||||
|
})
|
||||||
|
} catch (e: PathNotFoundException) {
|
||||||
|
// Ignore
|
||||||
|
}
|
||||||
|
|
||||||
|
json = jsonPath.jsonString()
|
||||||
|
}
|
||||||
|
|
||||||
|
return objectMapper.readValue(json, MtbFile::class.java)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getTransformations(): List<Transformation> {
|
||||||
|
return this.transformations
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class Transformation private constructor(val path: String) {
|
||||||
|
|
||||||
|
lateinit var existingValue: Any
|
||||||
|
private set
|
||||||
|
lateinit var newValue: Any
|
||||||
|
private set
|
||||||
|
|
||||||
|
infix fun from(value: Any): Transformation {
|
||||||
|
this.existingValue = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
infix fun to(value: Any): Transformation {
|
||||||
|
this.newValue = value
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
fun of(path: String): Transformation {
|
||||||
|
return Transformation(path)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ETL-Processor
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* 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.monitoring.ConnectionCheckService
|
||||||
|
import dev.dnpm.etl.processor.output.MtbFileSender
|
||||||
|
import dev.dnpm.etl.processor.pseudonym.Generator
|
||||||
|
import dev.dnpm.etl.processor.services.TransformationService
|
||||||
|
import org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.ui.Model
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
@RequestMapping(path = ["configs"])
|
||||||
|
class ConfigController(
|
||||||
|
private val transformationService: TransformationService,
|
||||||
|
private val pseudonymGenerator: Generator,
|
||||||
|
private val mtbFileSender: MtbFileSender,
|
||||||
|
private val connectionCheckService: ConnectionCheckService
|
||||||
|
|
||||||
|
) {
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
fun index(model: Model): String {
|
||||||
|
model.addAttribute("pseudonymGenerator", pseudonymGenerator.javaClass.simpleName)
|
||||||
|
model.addAttribute("mtbFileSender", mtbFileSender.javaClass.simpleName)
|
||||||
|
model.addAttribute("mtbFileEndpoint", mtbFileSender.endpoint())
|
||||||
|
model.addAttribute("connectionAvailable", connectionCheckService.connectionAvailable())
|
||||||
|
model.addAttribute("transformations", transformationService.getTransformations())
|
||||||
|
|
||||||
|
return "configs"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -23,6 +23,9 @@ import dev.dnpm.etl.processor.NotFoundException
|
|||||||
import dev.dnpm.etl.processor.monitoring.ReportService
|
import dev.dnpm.etl.processor.monitoring.ReportService
|
||||||
import dev.dnpm.etl.processor.monitoring.RequestId
|
import dev.dnpm.etl.processor.monitoring.RequestId
|
||||||
import dev.dnpm.etl.processor.monitoring.RequestRepository
|
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
|
||||||
import org.springframework.stereotype.Controller
|
import org.springframework.stereotype.Controller
|
||||||
import org.springframework.ui.Model
|
import org.springframework.ui.Model
|
||||||
import org.springframework.web.bind.annotation.GetMapping
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
@ -37,8 +40,8 @@ class HomeController(
|
|||||||
) {
|
) {
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
fun index(model: Model): String {
|
fun index(@PageableDefault(page = 0, size = 20, sort = ["processedAt"], direction = Sort.Direction.DESC) pageable: Pageable, model: Model): String {
|
||||||
val requests = requestRepository.findAll().sortedByDescending { it.processedAt }.take(25)
|
val requests = requestRepository.findAll(pageable)
|
||||||
model.addAttribute("requests", requests)
|
model.addAttribute("requests", requests)
|
||||||
|
|
||||||
return "index"
|
return "index"
|
||||||
|
@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* 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 org.springframework.stereotype.Controller
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
|
|
||||||
|
@Controller
|
||||||
|
class LoginController {
|
||||||
|
|
||||||
|
@GetMapping(path = ["/login"])
|
||||||
|
fun login(): String {
|
||||||
|
return "login"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -10,6 +10,9 @@ app:
|
|||||||
topic: test
|
topic: test
|
||||||
response-topic: test_response
|
response-topic: test_response
|
||||||
servers: localhost:9094
|
servers: localhost:9094
|
||||||
|
#security:
|
||||||
|
# admin-user: admin
|
||||||
|
# admin-password: "{noop}very-secret"
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: 8000
|
port: 8000
|
||||||
|
@ -4,4 +4,7 @@ spring:
|
|||||||
consumer:
|
consumer:
|
||||||
group-id: ${app.kafka.group-id}
|
group-id: ${app.kafka.group-id}
|
||||||
flyway:
|
flyway:
|
||||||
locations: "classpath:db/migration/{vendor}"
|
locations: "classpath:db/migration/{vendor}"
|
||||||
|
|
||||||
|
server:
|
||||||
|
forward-headers-strategy: framework
|
BIN
src/main/resources/static/bg.jpeg
Normal file
BIN
src/main/resources/static/bg.jpeg
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.0 KiB |
41
src/main/resources/static/icon.svg
Normal file
41
src/main/resources/static/icon.svg
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="256"
|
||||||
|
height="256"
|
||||||
|
viewBox="0 0 67.733332 67.733335"
|
||||||
|
version="1.1"
|
||||||
|
id="svg5"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<g
|
||||||
|
id="layer1">
|
||||||
|
<g
|
||||||
|
id="g26002"
|
||||||
|
transform="matrix(1.5,0,0,1.5,-16.933333,-1.8487648)">
|
||||||
|
<path
|
||||||
|
id="path12437"
|
||||||
|
transform="matrix(0.21771408,0,0,0.21771408,73.025692,24.874779)"
|
||||||
|
style="fill:#f59e00;fill-opacity:1"
|
||||||
|
d="m -110.41995,43.223174 -55.55561,-2e-6 -27.7778,-48.1125685 27.77781,-48.1125655 55.5556,3e-6 27.777803,48.1125679 z" />
|
||||||
|
<path
|
||||||
|
id="path13446"
|
||||||
|
transform="matrix(0.21771408,0,0,0.21771408,54.882836,14.399994)"
|
||||||
|
style="fill:#004d6e;fill-opacity:1"
|
||||||
|
d="m -110.41995,43.223174 -55.55561,-2e-6 -27.7778,-48.1125685 27.77781,-48.1125655 55.5556,3e-6 27.777803,48.1125679 z" />
|
||||||
|
<path
|
||||||
|
id="path13448"
|
||||||
|
transform="matrix(0.21771408,0,0,0.21771408,54.882835,35.349561)"
|
||||||
|
style="fill:#706f6f;fill-opacity:1"
|
||||||
|
d="m -110.41995,43.223174 -55.55561,-2e-6 -27.7778,-48.1125685 27.77781,-48.1125655 55.5556,3e-6 27.777803,48.1125679 z" />
|
||||||
|
<path
|
||||||
|
id="path25844"
|
||||||
|
transform="matrix(0.21771408,0,0,0.21771408,60.930454,24.874778)"
|
||||||
|
style="fill:#ffffff;fill-opacity:1"
|
||||||
|
d="m -110.41995,43.223174 -55.55561,-2e-6 -27.7778,-48.1125685 27.77781,-48.1125655 55.5556,3e-6 27.777803,48.1125679 z" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.6 KiB |
BIN
src/main/resources/static/kafka.png
Normal file
BIN
src/main/resources/static/kafka.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
@ -4,14 +4,14 @@ const dateFormat = new Intl.DateTimeFormat('de-DE', dateFormatOptions);
|
|||||||
const dateTimeFormatOptions = { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: 'numeric', second: 'numeric' };
|
const dateTimeFormatOptions = { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: 'numeric', second: 'numeric' };
|
||||||
const dateTimeFormat = new Intl.DateTimeFormat('de-DE', dateTimeFormatOptions);
|
const dateTimeFormat = new Intl.DateTimeFormat('de-DE', dateTimeFormatOptions);
|
||||||
|
|
||||||
window.onload = () => {
|
window.addEventListener('load', () => {
|
||||||
Array.from(document.getElementsByTagName('time')).forEach((timeTag) => {
|
Array.from(document.getElementsByTagName('time')).forEach((timeTag) => {
|
||||||
let date = Date.parse(timeTag.getAttribute('datetime'));
|
let date = Date.parse(timeTag.getAttribute('datetime'));
|
||||||
if (! isNaN(date)) {
|
if (! isNaN(date)) {
|
||||||
timeTag.innerText = dateTimeFormat.format(date);
|
timeTag.innerText = dateTimeFormat.format(date);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
});
|
||||||
|
|
||||||
function drawPieChart(url, elemId, title, data) {
|
function drawPieChart(url, elemId, title, data) {
|
||||||
if (data) {
|
if (data) {
|
||||||
|
BIN
src/main/resources/static/server.png
Normal file
BIN
src/main/resources/static/server.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
@ -1,44 +1,104 @@
|
|||||||
|
:root {
|
||||||
|
--text: #333;
|
||||||
|
--table-border: rgba(16, 24, 40, .1);
|
||||||
|
|
||||||
|
--bg-blue: rgb(0, 74, 157);
|
||||||
|
--bg-blue-op: rgba(0, 74, 157, .35);
|
||||||
|
|
||||||
|
--bg-green: rgb(0, 128, 0);
|
||||||
|
--bg-green-op: rgba(0, 128, 0, .35);
|
||||||
|
|
||||||
|
|
||||||
|
--bg-yellow: rgb(255, 140, 0);
|
||||||
|
--bg-yellow-op: rgba(255, 140, 0, .35);
|
||||||
|
|
||||||
|
|
||||||
|
--bg-red: rgb(255, 0, 0);
|
||||||
|
--bg-red-op: rgba(255, 0, 0, .35);
|
||||||
|
|
||||||
|
--bg-gray: rgb(112, 128, 144);
|
||||||
|
--bg-gray-op: rgba(112, 128, 144, .35);
|
||||||
|
}
|
||||||
|
|
||||||
|
html {
|
||||||
|
background: linear-gradient(-5deg, var(--bg-blue-op), transparent 10em);
|
||||||
|
min-height: 100vh;
|
||||||
|
overflow-y: scroll;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0 0 5em 0;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
font-size: .8rem;
|
font-size: .8rem;
|
||||||
color: #333;
|
color: var(--text);
|
||||||
|
|
||||||
|
min-height: 100vh;
|
||||||
|
|
||||||
|
background: url(bg.jpeg) no-repeat;
|
||||||
|
background-size: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav {
|
nav {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
background: #d5dad5;
|
padding: 2em 0;
|
||||||
height: 3rem;
|
|
||||||
|
line-height: 1.5rem;
|
||||||
max-width: 1140px;
|
max-width: 1140px;
|
||||||
|
|
||||||
|
border-bottom: 1px solid var(--table-border);
|
||||||
}
|
}
|
||||||
|
|
||||||
nav a {
|
nav > a.nav-home {
|
||||||
color: #004a8f;
|
float: left;
|
||||||
text-transform: uppercase;
|
|
||||||
|
color: var(--text);
|
||||||
|
line-height: 1.5em;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
line-height: 2rem;
|
|
||||||
font-weight: 700;
|
font-size: 1.5em;
|
||||||
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav a:hover {
|
nav > a.nav-home > img {
|
||||||
text-decoration: underline;
|
width: 1.5em;
|
||||||
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav > ul {
|
nav > ul {
|
||||||
margin: 0 3rem;
|
margin: 0 0 0 auto;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
||||||
|
width: max-content;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav > ul > li {
|
nav > ul > li {
|
||||||
background: #fbfbfb;
|
display: inline-block;
|
||||||
display: block;
|
padding: 0 1rem;
|
||||||
float: left;
|
|
||||||
padding: 2px 1rem;
|
|
||||||
border-left: 1px solid #d5dad5;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nav > ul > li:first-of-type {
|
nav > ul > li.login {
|
||||||
border-left: none;
|
margin: 0 0 0 1em;
|
||||||
|
padding: 0 0 0 2em;
|
||||||
|
border-left: 1px solid var(--table-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
nav li a {
|
||||||
|
color: var(--bg-blue);
|
||||||
|
text-transform: uppercase;
|
||||||
|
text-decoration: none;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
nav li.login a {
|
||||||
|
color: var(--bg-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
nav li a:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: var(--bg-blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
.breadcrumps {
|
.breadcrumps {
|
||||||
@ -57,22 +117,30 @@ nav > ul > li:first-of-type {
|
|||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.breadcrumps ul li+li:before {
|
.breadcrumps ul li + li:before {
|
||||||
padding: .4rem;
|
padding: .4rem;
|
||||||
color: gray;
|
color: gray;
|
||||||
content: "/\00a0";
|
content: "/\00a0";
|
||||||
}
|
}
|
||||||
|
|
||||||
.breadcrumps ul li a {
|
.breadcrumps ul li a {
|
||||||
color: #333333;
|
color: var(--text);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.centered {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
max-width: 1140px;
|
max-width: 1140px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
section {
|
||||||
|
margin: 3em 0;
|
||||||
|
}
|
||||||
|
|
||||||
form {
|
form {
|
||||||
margin: 1rem 0;
|
margin: 1rem 0;
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
@ -114,16 +182,91 @@ form.samplecode-input input:focus-visible {
|
|||||||
background: lightgreen;
|
background: lightgreen;
|
||||||
}
|
}
|
||||||
|
|
||||||
table {
|
.login-form {
|
||||||
border-top: 1px solid lightgray;
|
width: fit-content;
|
||||||
border-left: 1px solid lightgray;
|
margin: 3em auto;
|
||||||
border-spacing: 0;
|
padding: 2em 5em;
|
||||||
border-radius: 3px;
|
|
||||||
|
|
||||||
|
border: 1px solid var(--table-border);
|
||||||
|
border-radius: .5em;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form form {
|
||||||
|
width: 20em;
|
||||||
|
margin: 0 auto;
|
||||||
|
display: grid;
|
||||||
|
grid-gap: .5em;
|
||||||
|
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form form * {
|
||||||
|
padding: 0.5em;
|
||||||
|
border: 1px solid var(--table-border);
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.login-form button {
|
||||||
|
margin: 1em 0;
|
||||||
|
background: var(--bg-blue);
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.border {
|
||||||
|
padding: 1.5em;
|
||||||
|
border: 1px solid var(--table-border);
|
||||||
|
border-radius: .5em;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
table, .chart {
|
||||||
|
border: 1px solid var(--table-border);
|
||||||
|
padding: 1.5em;
|
||||||
|
|
||||||
|
border-spacing: 0;
|
||||||
|
border-radius: .5em;
|
||||||
|
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
table {
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.border > table {
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-control {
|
||||||
|
border-radius: .5em;
|
||||||
|
padding: 1em 2em;
|
||||||
|
text-align: center;
|
||||||
|
|
||||||
|
line-height: 1.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-control a {
|
||||||
|
padding: 0 .25em;
|
||||||
|
font-size: 1.75em;
|
||||||
|
color: var(--bg-gray);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-control a[href] {
|
||||||
|
color: var(--bg-blue);
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-control span {
|
||||||
|
padding: 0 .5em;
|
||||||
|
vertical-align: text-bottom;
|
||||||
|
}
|
||||||
|
|
||||||
#samples-table.max {
|
#samples-table.max {
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@ -140,43 +283,97 @@ table.samples {
|
|||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
th {
|
th, td {
|
||||||
background: #eee;
|
padding: 0.4rem .2rem;
|
||||||
}
|
|
||||||
|
|
||||||
td, th {
|
line-height: 2em;
|
||||||
padding: .2rem;
|
|
||||||
|
|
||||||
border-right: 1px solid lightgray;
|
|
||||||
border-bottom: 1px solid lightgray;
|
|
||||||
|
|
||||||
text-align: left;
|
text-align: left;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
th {
|
||||||
|
border-bottom: 1px solid var(--bg-gray);
|
||||||
|
}
|
||||||
|
|
||||||
td {
|
td {
|
||||||
font-family: monospace;
|
font-family: monospace;
|
||||||
|
border-bottom: 1px solid var(--bg-gray-op);
|
||||||
}
|
}
|
||||||
|
|
||||||
td.bg-green, th.bg-green {
|
tr:last-of-type > td {
|
||||||
background: green;
|
border-bottom: none;
|
||||||
color: white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
td.bg-yellow, th.bg-yellow {
|
td > small {
|
||||||
background: darkorange;
|
display: block;
|
||||||
color: white;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.bg-red, th.bg-red {
|
td.patient-id {
|
||||||
background: red;
|
width: 32em;
|
||||||
color: white;
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.bg-gray, th.bg-gray {
|
td.bg-blue, th.bg-blue,
|
||||||
background: slategray;
|
td.bg-green, th.bg-green,
|
||||||
|
td.bg-yellow, th.bg-yellow,
|
||||||
|
td.bg-red, th.bg-red,
|
||||||
|
td.bg-gray, th.bg-gray
|
||||||
|
{
|
||||||
|
width: 8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.bg-blue > small, th.bg-blue > small {
|
||||||
|
background: var(--bg-blue);
|
||||||
color: white;
|
color: white;
|
||||||
|
border-radius: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.bg-green > small, th.bg-green > small {
|
||||||
|
background: var(--bg-green);
|
||||||
|
color: white;
|
||||||
|
border-radius: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.bg-yellow > small, th.bg-yellow > small {
|
||||||
|
background: var(--bg-yellow);
|
||||||
|
color: white;
|
||||||
|
border-radius: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.bg-red > small, th.bg-red > small {
|
||||||
|
background: var(--bg-red);
|
||||||
|
color: white;
|
||||||
|
border-radius: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.bg-gray > small, th.bg-gray > small {
|
||||||
|
background: var(--bg-gray);
|
||||||
|
color: white;
|
||||||
|
border-radius: 0.4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg-path {
|
||||||
|
background: var(--bg-gray-op);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg-from {
|
||||||
|
background: var(--bg-red-op);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg-to {
|
||||||
|
background: var(--bg-green-op);
|
||||||
|
}
|
||||||
|
|
||||||
|
.bg-path, .bg-from, .bg-to {
|
||||||
|
padding: 0.25rem 0.5rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
|
||||||
|
font-family: monospace;
|
||||||
}
|
}
|
||||||
|
|
||||||
td.bg-shaded, th.bg-shaded {
|
td.bg-shaded, th.bg-shaded {
|
||||||
@ -276,12 +473,6 @@ input.inline:focus-visible {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.chart {
|
.chart {
|
||||||
padding: 1rem;
|
|
||||||
margin: .2rem;
|
|
||||||
|
|
||||||
border: 1px solid lightgray;
|
|
||||||
border-radius: 3px;
|
|
||||||
|
|
||||||
width: calc(100% - 2.4rem - 4px);
|
width: calc(100% - 2.4rem - 4px);
|
||||||
height: 320px;
|
height: 320px;
|
||||||
|
|
||||||
@ -290,4 +481,43 @@ input.inline:focus-visible {
|
|||||||
|
|
||||||
.chart-50pc {
|
.chart-50pc {
|
||||||
width: calc(50% - 2.4rem - 4px);
|
width: calc(50% - 2.4rem - 4px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-display {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 10em 16em 10em;
|
||||||
|
place-items: center;
|
||||||
|
width: fit-content;
|
||||||
|
margin: 1em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-display > * {
|
||||||
|
text-align: center;
|
||||||
|
margin: auto 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-display .connection {
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: 4px;
|
||||||
|
background: repeating-linear-gradient(to left, white, white 2px, transparent 2px, transparent 8px, white 8px) var(--bg-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-display .connection.available {
|
||||||
|
background: var(--bg-green);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification {
|
||||||
|
margin: 1em;
|
||||||
|
padding: .5em;
|
||||||
|
border-radius: 3px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification.success {
|
||||||
|
color: var(--bg-green);
|
||||||
|
}
|
||||||
|
|
||||||
|
.notification.error {
|
||||||
|
color: var(--bg-red);
|
||||||
}
|
}
|
104
src/main/resources/templates/configs.html
Normal file
104
src/main/resources/templates/configs.html
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de" xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>ETL-Prozessor</title>
|
||||||
|
<link rel="stylesheet" th:href="@{/style.css}" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div th:replace="~{fragments.html :: nav}"></div>
|
||||||
|
<main>
|
||||||
|
<h1>Konfiguration</h1>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>🔧 Allgemeine Konfiguration</h2>
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Name</th>
|
||||||
|
<th>Wert</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>Pseudonym erzeugt über</td>
|
||||||
|
<td>[[ ${pseudonymGenerator} ]]</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>MTBFile-Sender</td>
|
||||||
|
<td>[[ ${mtbFileSender} ]]</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td th:if="${mtbFileSender.startsWith('Rest')}">REST-Endpunkt</td>
|
||||||
|
<td th:if="${mtbFileSender.startsWith('Kafka')}">Kafka-Broker und Topics</td>
|
||||||
|
<td>[[ ${mtbFileEndpoint} ]]</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2><span th:if="${connectionAvailable}">✅</span><span th:if="${not(connectionAvailable)}">⚡</span> Verbindung zum bwHC-Backend</h2>
|
||||||
|
<div>
|
||||||
|
Verbindung über <code>[[ ${mtbFileSender} ]]</code>. Die Verbindung ist aktuell
|
||||||
|
<strong th:if="${connectionAvailable}" style="color: green">verfügbar.</strong>
|
||||||
|
<strong th:if="${not(connectionAvailable)}" 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:styleappend="${connectionAvailable ? '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('Rest')}">bwHC-Backend</span>
|
||||||
|
<span th:if="${mtbFileSender.startsWith('Kafka')}">Kafka-Broker</span>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2><span th:if="${not transformations.isEmpty()}">✅</span><span th:if="${transformations.isEmpty()}">⛔</span> Transformationen</h2>
|
||||||
|
|
||||||
|
<h3>Syntax</h3>
|
||||||
|
Hier einige Beispiele zum Syntax des JSON-Path
|
||||||
|
<ul>
|
||||||
|
<li style="padding: 0.6rem 0;"><span class="bg-path">diagnoses[*].icdO3T.version</span>: Ersetze die ICD-O3T-Version in allen Diagnosen, z.B. zur Version der deutschen Übersetzung</li>
|
||||||
|
<li style="padding: 0.6rem 0;"><span class="bg-path">patient.gender</span>: Ersetze das Geschlecht des Patienten, z.B. in das von bwHC verlangte Format</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h3>Konfigurierte Transformationen</h3>
|
||||||
|
<th:block th:if="${transformations.isEmpty()}">
|
||||||
|
<p>
|
||||||
|
Keine konfigurierten Transformationen.
|
||||||
|
</p>
|
||||||
|
</th:block>
|
||||||
|
<th:block th:if="${not transformations.isEmpty()}">
|
||||||
|
<p>
|
||||||
|
Hier sehen Sie eine Übersicht der konfigurierten Transformationen.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<table>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>JSON-Path</th>
|
||||||
|
<th>Transformation von ⇒ nach</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr th:each="transformation : ${transformations}">
|
||||||
|
<td>
|
||||||
|
<span class="bg-path" title="Ersetze Wert(e) an dieser Stelle im MTB-File">[[ ${transformation.path} ]]</span>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<span class="bg-from" title="Ersetze immer dann, wenn dieser Wert enthalten ist">[[ ${transformation.existingValue} ]]</span>
|
||||||
|
<strong>⇒</strong>
|
||||||
|
<span class="bg-to" title="Ersetze durch diesen Wert">[[ ${transformation.newValue} ]]</span>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</th:block>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -1,5 +1,5 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html xmlns:th="http://www.thymeleaf.org">
|
<html xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<link rel="stylesheet" th:href="@{/style.css}" />
|
<link rel="stylesheet" th:href="@{/style.css}" />
|
||||||
@ -7,9 +7,22 @@
|
|||||||
<body>
|
<body>
|
||||||
<div th:fragment="nav">
|
<div th:fragment="nav">
|
||||||
<nav>
|
<nav>
|
||||||
|
<a class="nav-home" th:href="@{/}">
|
||||||
|
<img th:src="@{/icon.svg}" alt="Icon" />
|
||||||
|
<span>ETL-Processor</span>
|
||||||
|
</a>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a th:href="@{/}">Übersicht</a></li>
|
<li><a th:href="@{/}">Übersicht</a></li>
|
||||||
<li><a th:href="@{/statistics}">Statistiken</a></li>
|
<li><a th:href="@{/statistics}">Statistiken</a></li>
|
||||||
|
<li sec:authorize="hasRole('ADMIN')">
|
||||||
|
<a th:href="@{/configs}">Konfiguration</a>
|
||||||
|
</li>
|
||||||
|
<li class="login" sec:authorize="not isAuthenticated()">
|
||||||
|
<a th:href="@{/login}">Login</a>
|
||||||
|
</li>
|
||||||
|
<li class="login" sec:authorize="isAuthenticated()">
|
||||||
|
<a th:href="@{/logout}">Abmelden</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="de" xmlns:th="http://www.thymeleaf.org">
|
<html lang="de" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>ETL-Prozessor</title>
|
<title>ETL-Prozessor</title>
|
||||||
@ -11,35 +11,63 @@
|
|||||||
|
|
||||||
<h1>Letzte Anfragen</h1>
|
<h1>Letzte Anfragen</h1>
|
||||||
|
|
||||||
<table>
|
<div class="border">
|
||||||
<thead>
|
<div class="page-control">
|
||||||
<tr>
|
<a id="first-page-link" th:href="@{/(page=${0})}" title="Zum Anfang: Taste W" th:if="${not requests.isFirst()}">⇤</a><a th:if="${requests.isFirst()}">⇤</a>
|
||||||
<th>Status</th>
|
<a id="prev-page-link" th:href="@{/(page=${requests.getNumber() - 1})}" title="Seite zurück: Taste A" th:if="${not requests.isFirst()}">←</a><a th:if="${requests.isFirst()}">←</a>
|
||||||
<th>Typ</th>
|
<span>Seite [[ ${requests.getNumber() + 1} ]] von [[ ${requests.getTotalPages()} ]]</span>
|
||||||
<th>ID</th>
|
<a id="next-page-link" th:href="@{/(page=${requests.getNumber() + 1})}" title="Seite vor: Taste D" th:if="${not requests.isLast()}">→</a><a th:if="${requests.isLast()}">→</a>
|
||||||
<th>Datum</th>
|
<a id="last-page-link" th:href="@{/(page=${requests.getTotalPages() - 1})}" title="Zum Ende: Taste S" th:if="${not requests.isLast()}">⇥</a><a th:if="${requests.isLast()}">⇥</a>
|
||||||
<th>Patienten-ID</th>
|
</div>
|
||||||
</tr>
|
<table class="paged">
|
||||||
</thead>
|
<thead>
|
||||||
<tbody>
|
<tr>
|
||||||
<tr th:each="request : ${requests}">
|
<th>Status</th>
|
||||||
<td th:if="${request.status.value.contains('success')}" class="bg-green"><small>[[ ${request.status} ]]</small></td>
|
<th>Typ</th>
|
||||||
<td th:if="${request.status.value.contains('warning')}" class="bg-yellow"><small>[[ ${request.status} ]]</small></td>
|
<th>ID</th>
|
||||||
<td th:if="${request.status.value.contains('error')}" class="bg-red"><small>[[ ${request.status} ]]</small></td>
|
<th>Datum</th>
|
||||||
<td th:if="${request.status.value == 'unknown'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
<th>Patienten-ID</th>
|
||||||
<td th:if="${request.status.value == 'duplication'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
</tr>
|
||||||
<td th:style="${request.type.value == 'delete'} ? 'color: red;'"><small>[[ ${request.type} ]]</small></td>
|
</thead>
|
||||||
<td th:if="not ${request.report}">[[ ${request.uuid} ]]</td>
|
<tbody>
|
||||||
<td th:if="${request.report}">
|
<tr th:each="request : ${requests}">
|
||||||
<a th:href="@{/report/{id}(id=${request.uuid})}">[[ ${request.uuid} ]]</a>
|
<td th:if="${request.status.value.contains('success')}" class="bg-green"><small>[[ ${request.status} ]]</small></td>
|
||||||
</td>
|
<td th:if="${request.status.value.contains('warning')}" class="bg-yellow"><small>[[ ${request.status} ]]</small></td>
|
||||||
<td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
|
<td th:if="${request.status.value.contains('error')}" class="bg-red"><small>[[ ${request.status} ]]</small></td>
|
||||||
<td>[[ ${request.patientId} ]]</td>
|
<td th:if="${request.status.value == 'unknown'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
||||||
</tr>
|
<td th:if="${request.status.value == 'duplication'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
||||||
</tbody>
|
<td th:style="${request.type.value == 'delete'} ? 'color: red;'"><small>[[ ${request.type} ]]</small></td>
|
||||||
</table>
|
<td th:if="not ${request.report}">[[ ${request.uuid} ]]</td>
|
||||||
|
<td th:if="${request.report}">
|
||||||
|
<a th:href="@{/report/{id}(id=${request.uuid})}">[[ ${request.uuid} ]]</a>
|
||||||
|
</td>
|
||||||
|
<td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
|
||||||
|
<td class="patient-id" sec:authorize="authenticated">[[ ${request.patientId} ]]</td>
|
||||||
|
<td class="patient-id" sec:authorize="not authenticated">***</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
</main>
|
</main>
|
||||||
<script th:src="@{/scripts.js}"></script>
|
<script th:src="@{/scripts.js}"></script>
|
||||||
|
<script>
|
||||||
|
window.addEventListener('load', () => {
|
||||||
|
let keyBindings = {
|
||||||
|
'w': 'first-page-link',
|
||||||
|
'a': 'prev-page-link',
|
||||||
|
'd': 'next-page-link',
|
||||||
|
's': 'last-page-link'
|
||||||
|
};
|
||||||
|
window.onkeydown = (event) => {
|
||||||
|
for (const [key, elemId] of Object.entries(keyBindings)) {
|
||||||
|
if (event.key === key && document.getElementById(elemId)) {
|
||||||
|
document.getElementById(elemId).style.background = 'yellow';
|
||||||
|
document.getElementById(elemId).click();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
23
src/main/resources/templates/login.html
Normal file
23
src/main/resources/templates/login.html
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de" xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<title>ETL-Prozessor</title>
|
||||||
|
<link rel="stylesheet" th:href="@{/style.css}" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div th:replace="~{fragments.html :: nav}"></div>
|
||||||
|
<main>
|
||||||
|
<div class="login-form">
|
||||||
|
<h2 class="centered">Anmelden</h2>
|
||||||
|
<div class="centered notification error" th:if="${param.error}">Anmeldung nicht erfolgreich</div>
|
||||||
|
<div class="centered notification success" th:if="${param.logout}">Sie haben sich abgemeldet</div>
|
||||||
|
<form method="post" th:action="@{/login}">
|
||||||
|
<input type="text" id="username" name="username" class="form-control" placeholder="Username" required="" autofocus="">
|
||||||
|
<input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
|
||||||
|
<button class="" type="submit">Anmelden</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -1,5 +1,5 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="de" xmlns:th="http://www.thymeleaf.org">
|
<html lang="de" xmlns:th="http://www.thymeleaf.org" xmlns:sec="http://www.thymeleaf.org">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>ETL-Prozessor</title>
|
<title>ETL-Prozessor</title>
|
||||||
@ -15,6 +15,7 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
|
<th>Typ</th>
|
||||||
<th>ID</th>
|
<th>ID</th>
|
||||||
<th>Datum</th>
|
<th>Datum</th>
|
||||||
<th>Patienten-ID</th>
|
<th>Patienten-ID</th>
|
||||||
@ -27,24 +28,31 @@
|
|||||||
<td th:if="${request.status.value == 'error'}" class="bg-red"><small>[[ ${request.status} ]]</small></td>
|
<td th:if="${request.status.value == 'error'}" class="bg-red"><small>[[ ${request.status} ]]</small></td>
|
||||||
<td th:if="${request.status.value == 'unknown'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
<td th:if="${request.status.value == 'unknown'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
||||||
<td th:if="${request.status.value == 'duplication'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
<td th:if="${request.status.value == 'duplication'}" class="bg-gray"><small>[[ ${request.status} ]]</small></td>
|
||||||
|
<td th:style="${request.type.value == 'delete'} ? 'color: red;'"><small>[[ ${request.type} ]]</small></td>
|
||||||
<td>[[ ${request.uuid} ]]</td>
|
<td>[[ ${request.uuid} ]]</td>
|
||||||
<td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
|
<td><time th:datetime="${request.processedAt}">[[ ${request.processedAt} ]]</time></td>
|
||||||
<td>[[ ${request.patientId} ]]</td>
|
<td class="patient-id" sec:authorize="authenticated">[[ ${request.patientId} ]]</td>
|
||||||
|
<td class="patient-id" sec:authorize="not authenticated">***</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<h2 th:text="${request.report.description}"></h2>
|
<h2 th:text="${request.report.description}"></h2>
|
||||||
|
|
||||||
<table th:if="not ${issues.isEmpty()}">
|
<p th:if="${issues.isEmpty()}">
|
||||||
|
Keine weiteren Angaben.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<table th:if="${not issues.isEmpty()}">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Schweregrad</th>
|
<th>Schweregrad</th>
|
||||||
<th>Beschreibung</th>
|
<th>Beschreibung</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr th:each="issue : ${issues}">
|
<tr th:each="issue : ${issues}">
|
||||||
|
<td th:if="${issue.severity.value == 'info'}" class="bg-blue"><small>[[ ${issue.severity} ]]</small></td>
|
||||||
<td th:if="${issue.severity.value == 'warning'}" class="bg-yellow"><small>[[ ${issue.severity} ]]</small></td>
|
<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 == 'error'}" class="bg-red"><small>[[ ${issue.severity} ]]</small></td>
|
||||||
<td>[[ ${issue.message} ]]</td>
|
<td>[[ ${issue.message} ]]</td>
|
||||||
|
@ -13,25 +13,29 @@
|
|||||||
Hier sehen Sie eine Übersicht über eingegangene Anfragen.
|
Hier sehen Sie eine Übersicht über eingegangene Anfragen.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2>MTB-File-Anfragen</h2>
|
<section>
|
||||||
<p>
|
<h2>MTB-File-Anfragen</h2>
|
||||||
Anfragen zur Aktualisierung von Patientendaten durch Übermittlung eines MTB-Files.
|
<p>
|
||||||
</p>
|
Anfragen zur Aktualisierung von Patientendaten durch Übermittlung eines MTB-Files.
|
||||||
<div>
|
</p>
|
||||||
<div id="piechart1" class="chart chart-50pc"></div>
|
<div>
|
||||||
<div id="piechart2" class="chart chart-50pc"></div>
|
<div id="piechart1" class="chart chart-50pc"></div>
|
||||||
</div>
|
<div id="piechart2" class="chart chart-50pc"></div>
|
||||||
<div id="barchart" class="chart"></div>
|
</div>
|
||||||
|
<div id="barchart" class="chart"></div>
|
||||||
|
</section>
|
||||||
|
|
||||||
<h2>Löschanfragen</h2>
|
<section>
|
||||||
<p>
|
<h2>Löschanfragen</h2>
|
||||||
Anfragen zur Löschung von Patientendaten, wenn kein Consent vorliegt.
|
<p>
|
||||||
</p>
|
Anfragen zur Löschung von Patientendaten, wenn kein Consent vorliegt.
|
||||||
<div>
|
</p>
|
||||||
<div id="piechartdel1" class="chart chart-50pc"></div>
|
<div>
|
||||||
<div id="piechartdel2" class="chart chart-50pc"></div>
|
<div id="piechartdel1" class="chart chart-50pc"></div>
|
||||||
</div>
|
<div id="piechartdel2" class="chart chart-50pc"></div>
|
||||||
<div id="barchartdel" class="chart"></div>
|
</div>
|
||||||
|
<div id="barchartdel" class="chart"></div>
|
||||||
|
</section>
|
||||||
|
|
||||||
</main>
|
</main>
|
||||||
<script th:src="@{/echarts.min.js}"></script>
|
<script th:src="@{/echarts.min.js}"></script>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -35,6 +35,8 @@ import org.mockito.junit.jupiter.MockitoExtension
|
|||||||
import org.mockito.kotlin.*
|
import org.mockito.kotlin.*
|
||||||
import org.springframework.kafka.core.KafkaTemplate
|
import org.springframework.kafka.core.KafkaTemplate
|
||||||
import org.springframework.kafka.support.SendResult
|
import org.springframework.kafka.support.SendResult
|
||||||
|
import org.springframework.retry.policy.SimpleRetryPolicy
|
||||||
|
import org.springframework.retry.support.RetryTemplateBuilder
|
||||||
import java.util.concurrent.CompletableFuture.completedFuture
|
import java.util.concurrent.CompletableFuture.completedFuture
|
||||||
import java.util.concurrent.ExecutionException
|
import java.util.concurrent.ExecutionException
|
||||||
|
|
||||||
@ -52,10 +54,12 @@ class KafkaMtbFileSenderTest {
|
|||||||
@Mock kafkaTemplate: KafkaTemplate<String, String>
|
@Mock kafkaTemplate: KafkaTemplate<String, String>
|
||||||
) {
|
) {
|
||||||
val kafkaTargetProperties = KafkaTargetProperties("testtopic")
|
val kafkaTargetProperties = KafkaTargetProperties("testtopic")
|
||||||
|
val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
|
||||||
|
|
||||||
this.objectMapper = ObjectMapper()
|
this.objectMapper = ObjectMapper()
|
||||||
this.kafkaTemplate = kafkaTemplate
|
this.kafkaTemplate = kafkaTemplate
|
||||||
|
|
||||||
this.kafkaMtbFileSender = KafkaMtbFileSender(kafkaTemplate, kafkaTargetProperties, objectMapper)
|
this.kafkaMtbFileSender = KafkaMtbFileSender(kafkaTemplate, kafkaTargetProperties, retryTemplate, objectMapper)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@ -118,6 +122,58 @@ class KafkaMtbFileSenderTest {
|
|||||||
assertThat(captor.secondValue).isEqualTo(objectMapper.writeValueAsString(kafkaRecordData("TestID", Consent.Status.REJECTED)))
|
assertThat(captor.secondValue).isEqualTo(objectMapper.writeValueAsString(kafkaRecordData("TestID", Consent.Status.REJECTED)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ParameterizedTest
|
||||||
|
@MethodSource("requestWithResponseSource")
|
||||||
|
fun shouldRetryOnMtbFileKafkaSendError(testData: TestData) {
|
||||||
|
val kafkaTargetProperties = KafkaTargetProperties("testtopic")
|
||||||
|
val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
|
||||||
|
this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaTargetProperties, 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 kafkaTargetProperties = KafkaTargetProperties("testtopic")
|
||||||
|
val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(3)).build()
|
||||||
|
this.kafkaMtbFileSender = KafkaMtbFileSender(this.kafkaTemplate, kafkaTargetProperties, 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 {
|
companion object {
|
||||||
fun mtbFile(consentStatus: Consent.Status): MtbFile {
|
fun mtbFile(consentStatus: Consent.Status): MtbFile {
|
||||||
return if (consentStatus == Consent.Status.ACTIVE) {
|
return if (consentStatus == Consent.Status.ACTIVE) {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of ETL-Processor
|
* This file is part of ETL-Processor
|
||||||
*
|
*
|
||||||
* Copyright (c) 2023 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
|
* 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
|
* it under the terms of the GNU Affero General Public License as published
|
||||||
@ -28,6 +28,9 @@ import org.junit.jupiter.params.ParameterizedTest
|
|||||||
import org.junit.jupiter.params.provider.MethodSource
|
import org.junit.jupiter.params.provider.MethodSource
|
||||||
import org.springframework.http.HttpMethod
|
import org.springframework.http.HttpMethod
|
||||||
import org.springframework.http.HttpStatus
|
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.MockRestServiceServer
|
||||||
import org.springframework.test.web.client.match.MockRestRequestMatchers.method
|
import org.springframework.test.web.client.match.MockRestRequestMatchers.method
|
||||||
import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
|
import org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo
|
||||||
@ -44,10 +47,11 @@ class RestMtbFileSenderTest {
|
|||||||
fun setup() {
|
fun setup() {
|
||||||
val restTemplate = RestTemplate()
|
val restTemplate = RestTemplate()
|
||||||
val restTargetProperties = RestTargetProperties("http://localhost:9000/mtbfile")
|
val restTargetProperties = RestTargetProperties("http://localhost:9000/mtbfile")
|
||||||
|
val retryTemplate = RetryTemplateBuilder().customPolicy(SimpleRetryPolicy(1)).build()
|
||||||
|
|
||||||
this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
|
this.mockRestServiceServer = MockRestServiceServer.createServer(restTemplate)
|
||||||
|
|
||||||
this.restMtbFileSender = RestMtbFileSender(restTemplate, restTargetProperties)
|
this.restMtbFileSender = RestMtbFileSender(restTemplate, restTargetProperties, retryTemplate)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ParameterizedTest
|
@ParameterizedTest
|
||||||
@ -80,6 +84,64 @@ class RestMtbFileSenderTest {
|
|||||||
assertThat(response.body).isEqualTo(requestWithResponse.response.body)
|
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 {
|
companion object {
|
||||||
data class RequestWithResponse(
|
data class RequestWithResponse(
|
||||||
val httpStatus: HttpStatus,
|
val httpStatus: HttpStatus,
|
||||||
|
@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ETL-Processor
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* 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 com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
import de.ukw.ccc.bwhc.dto.MtbFile
|
||||||
|
import org.assertj.core.api.Assertions.assertThat
|
||||||
|
import org.junit.jupiter.api.Test
|
||||||
|
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.doAnswer
|
||||||
|
import org.mockito.kotlin.whenever
|
||||||
|
import org.springframework.core.io.ClassPathResource
|
||||||
|
|
||||||
|
const val FAKE_MTB_FILE_PATH = "fake_MTBFile.json"
|
||||||
|
const val CLEAN_PATIENT_ID = "5dad2f0b-49c6-47d8-a952-7b9e9e0f7549"
|
||||||
|
|
||||||
|
@ExtendWith(MockitoExtension::class)
|
||||||
|
class ExtensionsTest {
|
||||||
|
|
||||||
|
private fun fakeMtbFile(): MtbFile {
|
||||||
|
val mtbFile = ClassPathResource(FAKE_MTB_FILE_PATH).inputStream
|
||||||
|
return ObjectMapper().readValue(mtbFile, MtbFile::class.java)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun MtbFile.serialized(): String {
|
||||||
|
return ObjectMapper().writeValueAsString(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
@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)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -70,6 +70,13 @@ class PseudonymizeServiceTest {
|
|||||||
assertThat(mtbFile.patient.id).isEqualTo("123")
|
assertThat(mtbFile.patient.id).isEqualTo("123")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun sanitizeFileName(@Mock generator: GpasPseudonymGenerator) {
|
||||||
|
val result= GpasPseudonymGenerator.sanitizeValue("l://a\\bs;1*2?3>")
|
||||||
|
|
||||||
|
assertThat(result).isEqualTo("l___a_bs_1_2_3_")
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun shouldUsePseudonymPrefixForBuiltin(@Mock generator: AnonymizingGenerator) {
|
fun shouldUsePseudonymPrefixForBuiltin(@Mock generator: AnonymizingGenerator) {
|
||||||
doAnswer {
|
doAnswer {
|
||||||
|
@ -41,6 +41,7 @@ class ReportServiceTest {
|
|||||||
{
|
{
|
||||||
"patient": "4711",
|
"patient": "4711",
|
||||||
"issues": [
|
"issues": [
|
||||||
|
{ "severity": "info", "message": "Info Message" },
|
||||||
{ "severity": "warning", "message": "Warning Message" },
|
{ "severity": "warning", "message": "Warning Message" },
|
||||||
{ "severity": "error", "message": "Error Message" }
|
{ "severity": "error", "message": "Error Message" }
|
||||||
]
|
]
|
||||||
@ -49,11 +50,13 @@ class ReportServiceTest {
|
|||||||
|
|
||||||
val actual = this.reportService.deserialize(json)
|
val actual = this.reportService.deserialize(json)
|
||||||
|
|
||||||
assertThat(actual).hasSize(2)
|
assertThat(actual).hasSize(3)
|
||||||
assertThat(actual[0].severity).isEqualTo(ReportService.Severity.WARNING)
|
assertThat(actual[0].severity).isEqualTo(ReportService.Severity.ERROR)
|
||||||
assertThat(actual[0].message).isEqualTo("Warning Message")
|
assertThat(actual[0].message).isEqualTo("Error Message")
|
||||||
assertThat(actual[1].severity).isEqualTo(ReportService.Severity.ERROR)
|
assertThat(actual[1].severity).isEqualTo(ReportService.Severity.WARNING)
|
||||||
assertThat(actual[1].message).isEqualTo("Error Message")
|
assertThat(actual[1].message).isEqualTo("Warning Message")
|
||||||
|
assertThat(actual[2].severity).isEqualTo(ReportService.Severity.INFO)
|
||||||
|
assertThat(actual[2].message).isEqualTo("Info Message")
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -37,6 +37,7 @@ import org.mockito.Mockito.*
|
|||||||
import org.mockito.junit.jupiter.MockitoExtension
|
import org.mockito.junit.jupiter.MockitoExtension
|
||||||
import org.mockito.kotlin.any
|
import org.mockito.kotlin.any
|
||||||
import org.mockito.kotlin.argumentCaptor
|
import org.mockito.kotlin.argumentCaptor
|
||||||
|
import org.mockito.kotlin.whenever
|
||||||
import org.springframework.context.ApplicationEventPublisher
|
import org.springframework.context.ApplicationEventPublisher
|
||||||
import java.time.Instant
|
import java.time.Instant
|
||||||
import java.util.*
|
import java.util.*
|
||||||
@ -46,6 +47,7 @@ import java.util.*
|
|||||||
class RequestProcessorTest {
|
class RequestProcessorTest {
|
||||||
|
|
||||||
private lateinit var pseudonymizeService: PseudonymizeService
|
private lateinit var pseudonymizeService: PseudonymizeService
|
||||||
|
private lateinit var transformationService: TransformationService
|
||||||
private lateinit var sender: MtbFileSender
|
private lateinit var sender: MtbFileSender
|
||||||
private lateinit var requestService: RequestService
|
private lateinit var requestService: RequestService
|
||||||
private lateinit var applicationEventPublisher: ApplicationEventPublisher
|
private lateinit var applicationEventPublisher: ApplicationEventPublisher
|
||||||
@ -55,11 +57,13 @@ class RequestProcessorTest {
|
|||||||
@BeforeEach
|
@BeforeEach
|
||||||
fun setup(
|
fun setup(
|
||||||
@Mock pseudonymizeService: PseudonymizeService,
|
@Mock pseudonymizeService: PseudonymizeService,
|
||||||
|
@Mock transformationService: TransformationService,
|
||||||
@Mock sender: RestMtbFileSender,
|
@Mock sender: RestMtbFileSender,
|
||||||
@Mock requestService: RequestService,
|
@Mock requestService: RequestService,
|
||||||
@Mock applicationEventPublisher: ApplicationEventPublisher
|
@Mock applicationEventPublisher: ApplicationEventPublisher
|
||||||
) {
|
) {
|
||||||
this.pseudonymizeService = pseudonymizeService
|
this.pseudonymizeService = pseudonymizeService
|
||||||
|
this.transformationService = transformationService
|
||||||
this.sender = sender
|
this.sender = sender
|
||||||
this.requestService = requestService
|
this.requestService = requestService
|
||||||
this.applicationEventPublisher = applicationEventPublisher
|
this.applicationEventPublisher = applicationEventPublisher
|
||||||
@ -68,6 +72,7 @@ class RequestProcessorTest {
|
|||||||
|
|
||||||
requestProcessor = RequestProcessor(
|
requestProcessor = RequestProcessor(
|
||||||
pseudonymizeService,
|
pseudonymizeService,
|
||||||
|
transformationService,
|
||||||
sender,
|
sender,
|
||||||
requestService,
|
requestService,
|
||||||
objectMapper,
|
objectMapper,
|
||||||
@ -98,6 +103,10 @@ class RequestProcessorTest {
|
|||||||
it.arguments[0] as String
|
it.arguments[0] as String
|
||||||
}.`when`(pseudonymizeService).patientPseudonym(any())
|
}.`when`(pseudonymizeService).patientPseudonym(any())
|
||||||
|
|
||||||
|
doAnswer {
|
||||||
|
it.arguments[0]
|
||||||
|
}.whenever(transformationService).transform(any())
|
||||||
|
|
||||||
val mtbFile = MtbFile.builder()
|
val mtbFile = MtbFile.builder()
|
||||||
.withPatient(
|
.withPatient(
|
||||||
Patient.builder()
|
Patient.builder()
|
||||||
@ -153,6 +162,10 @@ class RequestProcessorTest {
|
|||||||
it.arguments[0] as String
|
it.arguments[0] as String
|
||||||
}.`when`(pseudonymizeService).patientPseudonym(any())
|
}.`when`(pseudonymizeService).patientPseudonym(any())
|
||||||
|
|
||||||
|
doAnswer {
|
||||||
|
it.arguments[0]
|
||||||
|
}.whenever(transformationService).transform(any())
|
||||||
|
|
||||||
val mtbFile = MtbFile.builder()
|
val mtbFile = MtbFile.builder()
|
||||||
.withPatient(
|
.withPatient(
|
||||||
Patient.builder()
|
Patient.builder()
|
||||||
@ -212,6 +225,10 @@ class RequestProcessorTest {
|
|||||||
it.arguments[0] as String
|
it.arguments[0] as String
|
||||||
}.`when`(pseudonymizeService).patientPseudonym(any())
|
}.`when`(pseudonymizeService).patientPseudonym(any())
|
||||||
|
|
||||||
|
doAnswer {
|
||||||
|
it.arguments[0]
|
||||||
|
}.whenever(transformationService).transform(any())
|
||||||
|
|
||||||
val mtbFile = MtbFile.builder()
|
val mtbFile = MtbFile.builder()
|
||||||
.withPatient(
|
.withPatient(
|
||||||
Patient.builder()
|
Patient.builder()
|
||||||
@ -271,6 +288,10 @@ class RequestProcessorTest {
|
|||||||
it.arguments[0] as String
|
it.arguments[0] as String
|
||||||
}.`when`(pseudonymizeService).patientPseudonym(any())
|
}.`when`(pseudonymizeService).patientPseudonym(any())
|
||||||
|
|
||||||
|
doAnswer {
|
||||||
|
it.arguments[0]
|
||||||
|
}.whenever(transformationService).transform(any())
|
||||||
|
|
||||||
val mtbFile = MtbFile.builder()
|
val mtbFile = MtbFile.builder()
|
||||||
.withPatient(
|
.withPatient(
|
||||||
Patient.builder()
|
Patient.builder()
|
||||||
|
@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ETL-Processor
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
* 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.services
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper
|
||||||
|
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
|
||||||
|
|
||||||
|
class TransformationServiceTest {
|
||||||
|
|
||||||
|
private lateinit var service: TransformationService
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
fun setup() {
|
||||||
|
this.service = TransformationService(
|
||||||
|
ObjectMapper(), listOf(
|
||||||
|
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 = MtbFile.builder().withDiagnoses(
|
||||||
|
listOf(
|
||||||
|
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].icd10.version).isEqualTo("2014")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun shouldOnlyTransformGivenValues() {
|
||||||
|
val mtbFile = MtbFile.builder().withDiagnoses(
|
||||||
|
listOf(
|
||||||
|
Diagnosis.builder().withId("1234").withIcd10(Icd10("F79.9").also {
|
||||||
|
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].icd10.code).isEqualTo("F79.9")
|
||||||
|
assertThat(actual.diagnoses[0].icd10.version).isEqualTo("2014")
|
||||||
|
assertThat(actual.diagnoses[1].icd10.code).isEqualTo("F79.8")
|
||||||
|
assertThat(actual.diagnoses[1].icd10.version).isEqualTo("2019")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun shouldTransformMtbFileWithConsentEnum() {
|
||||||
|
val mtbFile = MtbFile.builder().withConsent(
|
||||||
|
Consent("123", "456", Consent.Status.ACTIVE)
|
||||||
|
).build()
|
||||||
|
|
||||||
|
val actual = this.service.transform(mtbFile)
|
||||||
|
|
||||||
|
assertThat(actual.consent).isNotNull
|
||||||
|
assertThat(actual.consent.status).isEqualTo(Consent.Status.REJECTED)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
1
src/test/resources/fake_MTBFile.json
Normal file
1
src/test/resources/fake_MTBFile.json
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user