summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul-Christian Volkmer2023-08-09 08:13:27 +0200
committerPaul-Christian Volkmer2023-08-09 08:13:27 +0200
commit7739afad1fc82f4ffe0debbebae58874f046d82d (patch)
treeeed6ab37a812afd057b448e33c3def70118af01b
parent6ad6ee13a1cae8ed286e80b3a46c458e1052480b (diff)
Handle MTB File with rejected consent as deletion request
-rw-r--r--src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt (renamed from src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt)14
-rw-r--r--src/test/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt150
2 files changed, 160 insertions, 4 deletions
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt
index cf0e693..9b441f6 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileRestController.kt
@@ -19,6 +19,7 @@
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
@@ -26,16 +27,21 @@ import org.springframework.http.ResponseEntity
import org.springframework.web.bind.annotation.*
@RestController
-class MtbFileController(
+class MtbFileRestController(
private val requestProcessor: RequestProcessor,
) {
- private val logger = LoggerFactory.getLogger(MtbFileController::class.java)
+ private val logger = LoggerFactory.getLogger(MtbFileRestController::class.java)
@PostMapping(path = ["/mtbfile"])
fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity<Void> {
- logger.debug("Accepted MTB File for processing")
- requestProcessor.processMtbFile(mtbFile)
+ 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()
}
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt
new file mode 100644
index 0000000..2fde35a
--- /dev/null
+++ b/src/test/kotlin/dev/dnpm/etl/processor/web/MtbFileRestControllerTest.kt
@@ -0,0 +1,150 @@
+/*
+ * 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 com.fasterxml.jackson.databind.ObjectMapper
+import de.ukw.ccc.bwhc.dto.*
+import dev.dnpm.etl.processor.services.RequestProcessor
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.mockito.Mock
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.junit.jupiter.MockitoExtension
+import org.mockito.kotlin.any
+import org.mockito.kotlin.argumentCaptor
+import org.springframework.http.MediaType
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.delete
+import org.springframework.test.web.servlet.post
+import org.springframework.test.web.servlet.setup.MockMvcBuilders
+
+@ExtendWith(MockitoExtension::class)
+class MtbFileRestControllerTest {
+
+ private lateinit var mockMvc: MockMvc
+
+ private lateinit var requestProcessor: RequestProcessor
+
+ private val objectMapper = ObjectMapper()
+
+ @BeforeEach
+ fun setup(
+ @Mock requestProcessor: RequestProcessor
+ ) {
+ this.requestProcessor = requestProcessor
+ val controller = MtbFileRestController(requestProcessor)
+ this.mockMvc = MockMvcBuilders.standaloneSetup(controller).build()
+ }
+
+ @Test
+ fun shouldProcessMtbFilePostRequest() {
+ 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()
+ )
+ .build()
+
+ mockMvc.post("/mtbfile") {
+ content = objectMapper.writeValueAsString(mtbFile)
+ contentType = MediaType.APPLICATION_JSON
+ }.andExpect {
+ status {
+ isAccepted()
+ }
+ }
+
+ verify(requestProcessor, times(1)).processMtbFile(any())
+ }
+
+ @Test
+ fun shouldProcessMtbFilePostRequestWithRejectedConsent() {
+ val mtbFile = MtbFile.builder()
+ .withPatient(
+ Patient.builder()
+ .withId("TEST_12345678")
+ .withBirthDate("2000-08-08")
+ .withGender(Patient.Gender.MALE)
+ .build()
+ )
+ .withConsent(
+ Consent.builder()
+ .withId("1")
+ .withStatus(Consent.Status.REJECTED)
+ .withPatient("TEST_12345678")
+ .build()
+ )
+ .withEpisode(
+ Episode.builder()
+ .withId("1")
+ .withPatient("TEST_12345678")
+ .withPeriod(PeriodStart("2023-08-08"))
+ .build()
+ )
+ .build()
+
+ mockMvc.post("/mtbfile") {
+ content = objectMapper.writeValueAsString(mtbFile)
+ contentType = MediaType.APPLICATION_JSON
+ }.andExpect {
+ status {
+ isAccepted()
+ }
+ }
+
+ val captor = argumentCaptor<String>()
+ verify(requestProcessor, times(1)).processDeletion(captor.capture())
+ assertThat(captor.firstValue).isEqualTo("TEST_12345678")
+ }
+
+ @Test
+ fun shouldProcessMtbFileDeleteRequest() {
+ mockMvc.delete("/mtbfile/TEST_12345678").andExpect {
+ status {
+ isAccepted()
+ }
+ }
+
+ val captor = argumentCaptor<String>()
+ verify(requestProcessor, times(1)).processDeletion(captor.capture())
+ assertThat(captor.firstValue).isEqualTo("TEST_12345678")
+ }
+
+} \ No newline at end of file