From 8ae958b8c4ffdef1694e2a0da88cf0bd69e211be Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 26 Mar 2024 09:56:31 +0100 Subject: [PATCH] feat: show information if no output is defined --- .../etl/processor/web/ConfigControllerTest.kt | 4 +- .../etl/processor/web/ConfigController.kt | 2 +- .../configs/outputConnectionAvailable.html | 47 ++++++++++--------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt index 7fc0121..749cbdd 100644 --- a/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt +++ b/src/integrationTest/kotlin/dev/dnpm/etl/processor/web/ConfigControllerTest.kt @@ -21,7 +21,7 @@ package dev.dnpm.etl.processor.web import dev.dnpm.etl.processor.config.AppConfiguration import dev.dnpm.etl.processor.config.AppSecurityConfiguration -import dev.dnpm.etl.processor.monitoring.ConnectionCheckService +import dev.dnpm.etl.processor.monitoring.GPasConnectionCheckService import dev.dnpm.etl.processor.monitoring.RestConnectionCheckService import dev.dnpm.etl.processor.output.MtbFileSender import dev.dnpm.etl.processor.pseudonym.Generator @@ -69,10 +69,10 @@ abstract class MockSink : Sinks.Many @MockBean( Generator::class, MtbFileSender::class, - ConnectionCheckService::class, RequestProcessor::class, TransformationService::class, TokenRepository::class, + GPasConnectionCheckService::class, RestConnectionCheckService::class ) class ConfigControllerTest { diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/ConfigController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/ConfigController.kt index eb9d541..36589c8 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/web/ConfigController.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/web/ConfigController.kt @@ -56,7 +56,7 @@ class ConfigController( @GetMapping fun index(model: Model): String { val outputConnectionAvailable = - connectionCheckServices.filterIsInstance().first().connectionAvailable() + connectionCheckServices.filterIsInstance().firstOrNull()?.connectionAvailable() val gPasConnectionAvailable = connectionCheckServices.filterIsInstance().firstOrNull()?.connectionAvailable() diff --git a/src/main/resources/templates/configs/outputConnectionAvailable.html b/src/main/resources/templates/configs/outputConnectionAvailable.html index e6e970b..4b7f8d1 100644 --- a/src/main/resources/templates/configs/outputConnectionAvailable.html +++ b/src/main/resources/templates/configs/outputConnectionAvailable.html @@ -1,21 +1,26 @@ -

MTB-File Verbindung

-
- Stand: -  |  - Letzte Änderung: -
-
- Verbindung über [[ ${mtbFileSender} ]]. Die Verbindung ist aktuell - verfügbar. - nicht verfügbar. -
-
- ETL-Processor - - bwHC-Backend - Kafka-Broker - ETL-Processor - - bwHC-Backend - Kafka-Broker -
\ No newline at end of file + +

🟦 Keine Ausgabenkonfiguration

+
+ +

MTB-File Verbindung

+
+ Stand: +  |  + Letzte Änderung: +
+
+ Verbindung über [[ ${mtbFileSender} ]]. Die Verbindung ist aktuell + verfügbar. + nicht verfügbar. +
+
+ ETL-Processor + + bwHC-Backend + Kafka-Broker + ETL-Processor + + bwHC-Backend + Kafka-Broker +
+
\ No newline at end of file