summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorPaul-Christian Volkmer2023-07-25 16:48:45 +0200
committerPaul-Christian Volkmer2023-07-25 16:48:45 +0200
commit46928964ef2b469a8c3f9eb997591ead0e6ea093 (patch)
tree84b0a7431f1fa82f2f43f20de032d94c7308f5f7 /src/main
parentc8e99133e2c560a10a2d512d1985518f3e373949 (diff)
Add postgres migration file and configuration for postgres
Diffstat (limited to 'src/main')
-rw-r--r--src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt1
-rw-r--r--src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt3
-rw-r--r--src/main/resources/db/migration/mariadb/V0_1_0__Init.sql3
-rw-r--r--src/main/resources/db/migration/postgresql/V0_1_0__Init.sql11
4 files changed, 17 insertions, 1 deletions
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt
index 80ddde8..e1dd267 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt
@@ -32,6 +32,7 @@ data class Request(
@Id val id: Long? = null,
val uuid: RequestId = RequestId.randomUUID(),
val patientId: String,
+ val pid: String,
val fingerprint: String,
val status: RequestStatus,
val processedAt: Instant = Instant.now()
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
index 7276561..04c1594 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
@@ -46,6 +46,7 @@ class MtbFileController(
@PostMapping(path = ["/mtbfile"])
fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity<Void> {
+ val pid = mtbFile.patient.id
val pseudonymized = pseudonymizeService.pseudonymize(mtbFile)
val lastRequestForPatient =
@@ -55,6 +56,7 @@ class MtbFileController(
requestRepository.save(
Request(
patientId = pseudonymized.patient.id,
+ pid = pid,
fingerprint = fingerprint(mtbFile),
status = RequestStatus.DUPLICATION
)
@@ -93,6 +95,7 @@ class MtbFileController(
requestRepository.save(
Request(
patientId = pseudonymized.patient.id,
+ pid = pid,
fingerprint = fingerprint(mtbFile),
status = requestStatus
)
diff --git a/src/main/resources/db/migration/mariadb/V0_1_0__Init.sql b/src/main/resources/db/migration/mariadb/V0_1_0__Init.sql
index 0683195..38a3d5f 100644
--- a/src/main/resources/db/migration/mariadb/V0_1_0__Init.sql
+++ b/src/main/resources/db/migration/mariadb/V0_1_0__Init.sql
@@ -1,8 +1,9 @@
CREATE TABLE IF NOT EXISTS request
(
id int auto_increment primary key,
- uuid varchar(255) not null,
+ uuid varchar(255) not null unique,
patient_id varchar(255) not null,
+ pid varchar(255) not null,
fingerprint varchar(255) not null,
status varchar(16) not null,
processed_at datetime default utc_timestamp() not null
diff --git a/src/main/resources/db/migration/postgresql/V0_1_0__Init.sql b/src/main/resources/db/migration/postgresql/V0_1_0__Init.sql
new file mode 100644
index 0000000..483479d
--- /dev/null
+++ b/src/main/resources/db/migration/postgresql/V0_1_0__Init.sql
@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS request
+(
+ id serial,
+ uuid varchar(255) not null unique,
+ patient_id varchar(255) not null,
+ pid varchar(255) not null,
+ fingerprint varchar(255) not null,
+ status varchar(16) not null,
+ processed_at timestamp with time zone default now() not null,
+ PRIMARY KEY (id)
+); \ No newline at end of file