feat: Show DEAD connectors as OFFLINE in the FE

sovity · Apr 29, 2024 · 3d094a5 · 3d094a5
1 parent 0a71e0d
commit 3d094a5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 #### Minor
 
+- Changed connector status DEAD to OFFLINE in UI responses ([#184](https://github.com/sovity/authority-portal/issues/184))
+
 #### Patch
 
 - Fixed the connector status missing in the CSV reports ([#190](https://github.com/sovity/authority-portal/issues/189))

diff --git a/.../de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt b/.../de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt
@@ -33,6 +33,7 @@ import de.sovity.authorityportal.web.services.ConnectorService
 import de.sovity.authorityportal.web.services.OrganizationService
 import de.sovity.authorityportal.web.thirdparty.broker.BrokerClientService
 import de.sovity.authorityportal.web.thirdparty.broker.model.AddedConnector
+import de.sovity.authorityportal.web.thirdparty.broker.model.ConnectorOnlineStatus
 import de.sovity.authorityportal.web.thirdparty.caas.CaasClient
 import de.sovity.authorityportal.web.thirdparty.daps.DapsClientService
 import de.sovity.authorityportal.web.utils.idmanagement.ClientIdUtils
@@ -109,7 +110,7 @@ class ConnectorManagementApiService {
             connector.frontendUrl,
             connector.endpointUrl,
             connector.managementUrl,
-            buildConnectorStatus(connector)
+            buildConnectorStatusFromConnectorDetails(connector)
         )
     }
 
@@ -158,7 +159,7 @@ class ConnectorManagementApiService {
                 it.type.toDto(),
                 deploymentEnvironmentDtoService.findByIdOrThrow(it.environment),
                 it.name,
-                if (it.type == ConnectorType.CAAS) it.caasStatus.toDto() else connectorMetadataService.getConnectorStatus(it.connectorId, it.environment).toDto(),
+                buildConnectorStatusFromConnectorRecord(it),
                 it.frontendUrl
             )
         }
@@ -346,11 +347,28 @@ class ConnectorManagementApiService {
         dapsClient.configureMappers(clientId, connectorId, connector.certificate)
     }
 
-    private fun buildConnectorStatus(connector: ConnectorService.ConnectorDetailRs): ConnectorStatusDto {
-        return if (connector.type == ConnectorType.CAAS) {
+    private fun buildConnectorStatusFromConnectorDetails(connector: ConnectorService.ConnectorDetailRs) =
+        if (connector.type == ConnectorType.CAAS) {
             connector.caasStatus!!.toDto()
         } else {
-            connectorMetadataService.getConnectorStatus(connector.connectorId, connector.environment).toDto()
+            connectorMetadataService.getConnectorStatus(connector.connectorId, connector.environment).let { status ->
+                filterDeadConnectorStatus(status)
+            }.toDto()
+        }
+
+    private fun buildConnectorStatusFromConnectorRecord(it: ConnectorRecord) =
+        if (it.type == ConnectorType.CAAS) {
+            it.caasStatus.toDto()
+        } else {
+            connectorMetadataService.getConnectorStatus(it.connectorId, it.environment).let { status ->
+                filterDeadConnectorStatus(status)
+            }.toDto()
+        }
+
+    private fun filterDeadConnectorStatus(status: ConnectorOnlineStatus) =
+        if (status == ConnectorOnlineStatus.DEAD) {
+            ConnectorOnlineStatus.OFFLINE
+        } else {
+            status
         }
-    }
 }