Use single MtbFileSender

src/integrationTest/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt

@@ -19,19 +19,22 @@
 
 package dev.dnpm.etl.processor
 
+import dev.dnpm.etl.processor.output.MtbFileSender
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.testcontainers.junit.jupiter.Testcontainers
 
 @Testcontainers
 @ExtendWith(SpringExtension::class)
 @SpringBootTest
+@MockBean(MtbFileSender::class)
 class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
 
     @Test
-    fun contextLoads() {
+    fun contextLoadsIfMtbFileSenderConfigured() {
     }
 
 }

src/integrationTest/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt

@@ -24,12 +24,14 @@ import dev.dnpm.etl.processor.monitoring.Request
 import dev.dnpm.etl.processor.monitoring.RequestRepository
 import dev.dnpm.etl.processor.monitoring.RequestStatus
 import dev.dnpm.etl.processor.monitoring.RequestType
+import dev.dnpm.etl.processor.output.MtbFileSender
 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.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 import org.springframework.transaction.annotation.Transactional
 import org.testcontainers.junit.jupiter.Testcontainers
@@ -40,6 +42,7 @@ import java.util.*
 @ExtendWith(SpringExtension::class)
 @SpringBootTest
 @Transactional
+@MockBean(MtbFileSender::class)
 class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
 
     private lateinit var requestRepository: RequestRepository

src/main/kotlin/dev/dnpm/etl/processor/services/RequestProcessor.kt

@@ -37,7 +37,7 @@ import java.util.*
 @Service
 class RequestProcessor(
     private val pseudonymizeService: PseudonymizeService,
-    private val senders: List<MtbFileSender>,
+    private val sender: MtbFileSender,
     private val requestService: RequestService,
     private val objectMapper: ObjectMapper,
     private val statisticsUpdateProducer: Sinks.Many<Any>
@@ -66,32 +66,26 @@ class RequestProcessor(
 
         val request = MtbFileSender.MtbFileRequest(UUID.randomUUID().toString(), pseudonymized)
 
-        val responses = senders.map {
+        val responseStatus = sender.send(request)
-            val responseStatus = it.send(request)
         if (responseStatus.status == MtbFileSender.ResponseStatus.SUCCESS || responseStatus.status == MtbFileSender.ResponseStatus.WARNING) {
             logger.info(
                 "Sent file for Patient '{}' using '{}'",
                 pseudonymized.patient.id,
-                    it.javaClass.simpleName
+                sender.javaClass.simpleName
             )
         } else {
             logger.error(
                 "Error sending file for Patient '{}' using '{}'",
                 pseudonymized.patient.id,
-                    it.javaClass.simpleName
+                sender.javaClass.simpleName
             )
         }
-            responseStatus
-        }
 
-        val requestStatus = if (responses.map { it.status }.contains(MtbFileSender.ResponseStatus.ERROR)) {
+        val requestStatus = when (responseStatus.status) {
-            RequestStatus.ERROR
+            MtbFileSender.ResponseStatus.ERROR -> RequestStatus.ERROR
-        } else if (responses.map { it.status }.contains(MtbFileSender.ResponseStatus.WARNING)) {
+            MtbFileSender.ResponseStatus.WARNING -> RequestStatus.WARNING
-            RequestStatus.WARNING
+            MtbFileSender.ResponseStatus.SUCCESS -> RequestStatus.SUCCESS
-        } else if (responses.map { it.status }.contains(MtbFileSender.ResponseStatus.SUCCESS)) {
+            else -> RequestStatus.UNKNOWN
-            RequestStatus.SUCCESS
-        } else {
-            RequestStatus.UNKNOWN
         }
 
         requestService.save(
@@ -104,9 +98,7 @@ class RequestProcessor(
                 type = RequestType.MTB_FILE,
                 report = when (requestStatus) {
                     RequestStatus.ERROR -> Report("Fehler bei der Datenübertragung oder Inhalt nicht verarbeitbar")
-                    RequestStatus.WARNING -> Report("Warnungen über mangelhafte Daten",
+                    RequestStatus.WARNING -> Report("Warnungen über mangelhafte Daten", responseStatus.reason)
-                        responses.joinToString("\n") { it.reason })
-
                     RequestStatus.UNKNOWN -> Report("Keine Informationen")
                     else -> null
                 }
@@ -132,14 +124,13 @@ class RequestProcessor(
         try {
             val patientPseudonym = pseudonymizeService.patientPseudonym(patientId)
 
-            val responses = senders.map {
+            val responseStatus = sender.send(MtbFileSender.DeleteRequest(requestId, patientPseudonym))
-                val responseStatus = it.send(MtbFileSender.DeleteRequest(requestId, patientPseudonym))
             when (responseStatus.status) {
                 MtbFileSender.ResponseStatus.SUCCESS -> {
                     logger.info(
                         "Sent delete for Patient '{}' using '{}'",
                         patientPseudonym,
-                            it.javaClass.simpleName
+                        sender.javaClass.simpleName
                     )
                 }
 
@@ -147,7 +138,7 @@ class RequestProcessor(
                     logger.error(
                         "Error deleting data for Patient '{}' using '{}'",
                         patientPseudonym,
-                            it.javaClass.simpleName
+                        sender.javaClass.simpleName
                     )
                 }
 
@@ -155,19 +146,16 @@ class RequestProcessor(
                     logger.error(
                         "Unknown result on deleting data for Patient '{}' using '{}'",
                         patientPseudonym,
-                            it.javaClass.simpleName
+                        sender.javaClass.simpleName
                     )
                 }
             }
-                responseStatus
-            }
 
-            val overallRequestStatus = if (responses.map { it.status }.contains(MtbFileSender.ResponseStatus.ERROR)) {
+            val requestStatus = when (responseStatus.status) {
-                RequestStatus.ERROR
+                MtbFileSender.ResponseStatus.ERROR -> RequestStatus.ERROR
-            } else if (responses.map { it.status }.contains(MtbFileSender.ResponseStatus.SUCCESS)) {
+                MtbFileSender.ResponseStatus.WARNING -> RequestStatus.WARNING
-                RequestStatus.SUCCESS
+                MtbFileSender.ResponseStatus.SUCCESS -> RequestStatus.SUCCESS
-            } else {
+                else -> RequestStatus.UNKNOWN
-                RequestStatus.UNKNOWN
             }
 
             requestService.save(
@@ -176,9 +164,9 @@ class RequestProcessor(
                     patientId = patientPseudonym,
                     pid = patientId,
                     fingerprint = fingerprint(patientPseudonym),
-                    status = overallRequestStatus,
+                    status = requestStatus,
                     type = RequestType.DELETE,
-                    report = when (overallRequestStatus) {
+                    report = when (requestStatus) {
                         RequestStatus.ERROR -> Report("Fehler bei der Datenübertragung oder Inhalt nicht verarbeitbar")
                         RequestStatus.UNKNOWN -> Report("Keine Informationen")
                         else -> null

src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt

@@ -67,7 +67,7 @@ class RequestProcessorTest {
 
         requestProcessor = RequestProcessor(
             pseudonymizeService,
-            listOf(sender),
+            sender,
             requestService,
             objectMapper,
             statisticsUpdateProducer