From 7739afad1fc82f4ffe0debbebae58874f046d82d Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Wed, 9 Aug 2023 08:13:27 +0200
Subject: Handle MTB File with rejected consent as deletion request
---
.../dnpm/etl/processor/web/MtbFileController.kt | 49 -------------------
.../etl/processor/web/MtbFileRestController.kt | 55 ++++++++++++++++++++++
2 files changed, 55 insertions(+), 49 deletions(-)
delete mode 100644 src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
create mode 100644 src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt
(limited to 'src/main')
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
deleted file mode 100644
index cf0e693..0000000
--- a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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 .
- */
-
-package dev.dnpm.etl.processor.web
-
-import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.dnpm.etl.processor.services.RequestProcessor
-import org.slf4j.LoggerFactory
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-
-@RestController
-class MtbFileController(
- private val requestProcessor: RequestProcessor,
-) {
-
- private val logger = LoggerFactory.getLogger(MtbFileController::class.java)
-
- @PostMapping(path = ["/mtbfile"])
- fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity {
- logger.debug("Accepted MTB File for processing")
- requestProcessor.processMtbFile(mtbFile)
- return ResponseEntity.accepted().build()
- }
-
- @DeleteMapping(path = ["/mtbfile/{patientId}"])
- fun deleteData(@PathVariable patientId: String): ResponseEntity {
- logger.debug("Accepted patient ID to process deletion")
- requestProcessor.processDeletion(patientId)
- return ResponseEntity.accepted().build()
- }
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt
new file mode 100644
index 0000000..9b441f6
--- /dev/null
+++ b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt
@@ -0,0 +1,55 @@
+/*
+ * 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 .
+ */
+
+package dev.dnpm.etl.processor.web
+
+import de.ukw.ccc.bwhc.dto.Consent
+import de.ukw.ccc.bwhc.dto.MtbFile
+import dev.dnpm.etl.processor.services.RequestProcessor
+import org.slf4j.LoggerFactory
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+@RestController
+class MtbFileRestController(
+ private val requestProcessor: RequestProcessor,
+) {
+
+ private val logger = LoggerFactory.getLogger(MtbFileRestController::class.java)
+
+ @PostMapping(path = ["/mtbfile"])
+ fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity {
+ if (mtbFile.consent.status == Consent.Status.ACTIVE) {
+ logger.debug("Accepted MTB File for processing")
+ requestProcessor.processMtbFile(mtbFile)
+ } else {
+ logger.debug("Accepted MTB File and process deletion")
+ requestProcessor.processDeletion(mtbFile.patient.id)
+ }
+ return ResponseEntity.accepted().build()
+ }
+
+ @DeleteMapping(path = ["/mtbfile/{patientId}"])
+ fun deleteData(@PathVariable patientId: String): ResponseEntity {
+ logger.debug("Accepted patient ID to process deletion")
+ requestProcessor.processDeletion(patientId)
+ return ResponseEntity.accepted().build()
+ }
+
+}
\ No newline at end of file
--
cgit v1.2.3