From 35cb258b13543b37ce061f78eef4427e542ca72a Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <volkmer_p@ukw.de>
Date: Wed, 2 Aug 2023 16:10:18 +0200
Subject: [PATCH] Do not return specific status code based on remote status
 code

---
 .../processor/services/RequestProcessor.kt    | 17 ++++-----------
 .../etl/processor/web/MtbFileController.kt    | 21 ++++++-------------
 src/main/resources/application.yml            |  2 ++
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
index 8588ebe..7d110b1 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt
@@ -42,7 +42,7 @@ class RequestProcessor(
 
     private val logger = LoggerFactory.getLogger(RequestProcessor::class.java)
 
-    fun processMtbFile(mtbFile: MtbFile): RequestStatus {
+    fun processMtbFile(mtbFile: MtbFile) {
         val pid = mtbFile.patient.id
         val pseudonymized = pseudonymizeService.pseudonymize(mtbFile)
 
@@ -62,7 +62,7 @@ class RequestProcessor(
                 )
             )
             statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
-            return RequestStatus.DUPLICATION
+            return
         }
 
         val request = MtbFileSender.MtbFileRequest(UUID.randomUUID().toString(), pseudonymized)
@@ -115,11 +115,9 @@ class RequestProcessor(
         )
 
         statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
-
-        return requestStatus
     }
 
-    fun processDeletion(patientId: String): RequestStatus {
+    fun processDeletion(patientId: String) {
         val requestId = UUID.randomUUID().toString()
 
         try {
@@ -178,10 +176,6 @@ class RequestProcessor(
                     }
                 )
             )
-
-            statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
-
-            return overallRequestStatus
         } catch (e: Exception) {
             requestRepository.save(
                 Request(
@@ -194,11 +188,8 @@ class RequestProcessor(
                     report = Report("Fehler bei der Pseudonymisierung")
                 )
             )
-
-            statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
-
-            return RequestStatus.ERROR
         }
+        statisticsUpdateProducer.emitNext("", Sinks.EmitFailureHandler.FAIL_FAST)
     }
 
     private fun fingerprint(mtbFile: MtbFile): String {
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 a2cc953..cf0e693 100644
--- a/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
+++ b/src/main/kotlin/dev/dnpm/etl/processor/web/MtbFileController.kt
@@ -20,7 +20,6 @@
 package dev.dnpm.etl.processor.web
 
 import de.ukw.ccc.bwhc.dto.MtbFile
-import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.services.RequestProcessor
 import org.slf4j.LoggerFactory
 import org.springframework.http.ResponseEntity
@@ -35,24 +34,16 @@ class MtbFileController(
 
     @PostMapping(path = ["/mtbfile"])
     fun mtbFile(@RequestBody mtbFile: MtbFile): ResponseEntity<Void> {
-        val requestStatus = requestProcessor.processMtbFile(mtbFile)
-
-        return if (requestStatus == RequestStatus.ERROR) {
-            ResponseEntity.unprocessableEntity().build()
-        } else {
-            ResponseEntity.noContent().build()
-        }
+        logger.debug("Accepted MTB File for processing")
+        requestProcessor.processMtbFile(mtbFile)
+        return ResponseEntity.accepted().build()
     }
 
     @DeleteMapping(path = ["/mtbfile/{patientId}"])
     fun deleteData(@PathVariable patientId: String): ResponseEntity<Void> {
-        val requestStatus = requestProcessor.processDeletion(patientId)
-
-        return if (requestStatus == RequestStatus.ERROR) {
-            ResponseEntity.unprocessableEntity().build()
-        } else {
-            ResponseEntity.noContent().build()
-        }
+        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/resources/application.yml b/src/main/resources/application.yml
index 39acb37..72edde6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,5 +3,7 @@ spring:
     bootstrap-servers: ${app.kafka.servers}
     template:
       default-topic: ${app.kafka.topic}
+    consumer:
+      group-id: ${app.kafka.group-id}
   flyway:
     locations: "classpath:db/migration/{vendor}"
\ No newline at end of file