From 3e45bf84940b1e94c642bf3a88e94514e5a83c41 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Thu, 29 Feb 2024 09:19:32 +0100 Subject: feat: implement KafkaInputListener --- .../dnpm/etl/processor/config/AppKafkaConfiguration.kt | 5 +++-- .../dev/dnpm/etl/processor/input/KafkaInputListener.kt | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt index 0977527..1ff5e58 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt @@ -25,6 +25,7 @@ import dev.dnpm.etl.processor.monitoring.ConnectionCheckService import dev.dnpm.etl.processor.monitoring.KafkaConnectionCheckService import dev.dnpm.etl.processor.output.KafkaMtbFileSender import dev.dnpm.etl.processor.output.MtbFileSender +import dev.dnpm.etl.processor.services.RequestProcessor import dev.dnpm.etl.processor.services.kafka.KafkaResponseProcessor import org.slf4j.LoggerFactory import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean @@ -97,9 +98,9 @@ class AppKafkaConfiguration { @Bean @ConditionalOnProperty(value = ["app.kafka.input-topic"]) fun kafkaInputListener( - applicationEventPublisher: ApplicationEventPublisher, + requestProcessor: RequestProcessor ): KafkaInputListener { - return KafkaInputListener(applicationEventPublisher) + return KafkaInputListener(requestProcessor) } @Bean diff --git a/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt b/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt index ee6b56e..f3c0ab4 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt @@ -19,15 +19,25 @@ package dev.dnpm.etl.processor.input +import de.ukw.ccc.bwhc.dto.Consent import de.ukw.ccc.bwhc.dto.MtbFile +import dev.dnpm.etl.processor.services.RequestProcessor import org.apache.kafka.clients.consumer.ConsumerRecord -import org.springframework.context.ApplicationEventPublisher +import org.slf4j.LoggerFactory import org.springframework.kafka.listener.MessageListener class KafkaInputListener( - private val applicationEventPublisher: ApplicationEventPublisher + private val requestProcessor: RequestProcessor ) : MessageListener { + private val logger = LoggerFactory.getLogger(KafkaInputListener::class.java) + override fun onMessage(data: ConsumerRecord) { - TODO("Not yet implemented") + if (data.value().consent.status == Consent.Status.ACTIVE) { + logger.debug("Accepted MTB File for processing") + requestProcessor.processMtbFile(data.value()) + } else { + logger.debug("Accepted MTB File and process deletion") + requestProcessor.processDeletion(data.value().patient.id) + } } } \ No newline at end of file -- cgit v1.2.3 From 952ad8c0cfc64cf9c5e02f1b4f7fc2466f9f2bb3 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Thu, 29 Feb 2024 12:49:06 +0100 Subject: test: add test for incoming kafka message processing --- .../dnpm/etl/processor/config/AppKafkaConfiguration.kt | 5 +++-- .../dev/dnpm/etl/processor/input/KafkaInputListener.kt | 15 +++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src/main') diff --git a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt index 1ff5e58..3799762 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/config/AppKafkaConfiguration.kt @@ -98,9 +98,10 @@ class AppKafkaConfiguration { @Bean @ConditionalOnProperty(value = ["app.kafka.input-topic"]) fun kafkaInputListener( - requestProcessor: RequestProcessor + requestProcessor: RequestProcessor, + objectMapper: ObjectMapper ): KafkaInputListener { - return KafkaInputListener(requestProcessor) + return KafkaInputListener(requestProcessor, objectMapper) } @Bean diff --git a/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt b/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt index f3c0ab4..63bf60a 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/input/KafkaInputListener.kt @@ -19,6 +19,7 @@ package dev.dnpm.etl.processor.input +import com.fasterxml.jackson.databind.ObjectMapper import de.ukw.ccc.bwhc.dto.Consent import de.ukw.ccc.bwhc.dto.MtbFile import dev.dnpm.etl.processor.services.RequestProcessor @@ -27,17 +28,19 @@ import org.slf4j.LoggerFactory import org.springframework.kafka.listener.MessageListener class KafkaInputListener( - private val requestProcessor: RequestProcessor -) : MessageListener { + private val requestProcessor: RequestProcessor, + private val objectMapper: ObjectMapper +) : MessageListener { private val logger = LoggerFactory.getLogger(KafkaInputListener::class.java) - override fun onMessage(data: ConsumerRecord) { - if (data.value().consent.status == Consent.Status.ACTIVE) { + override fun onMessage(data: ConsumerRecord) { + val mtbFile = objectMapper.readValue(data.value(), MtbFile::class.java) + if (mtbFile.consent.status == Consent.Status.ACTIVE) { logger.debug("Accepted MTB File for processing") - requestProcessor.processMtbFile(data.value()) + requestProcessor.processMtbFile(mtbFile) } else { logger.debug("Accepted MTB File and process deletion") - requestProcessor.processDeletion(data.value().patient.id) + requestProcessor.processDeletion(mtbFile.patient.id) } } } \ No newline at end of file -- cgit v1.2.3