fix: Add provided connectors to dashboard (#147)

sovity · Mar 25, 2024 · 2c9455c · 2c9455c
1 parent abad673
commit 2c9455c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md).
 
 #### Patch
 
+- Fixed provided connectors' statuses missing on the dashboard ([#138](https://github.com/sovity/authority-portal/issues/138))
+
 ### Known issues
 
 ### Deployment Migration Notes

diff --git a/...-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/ComponentStatusApiService.kt b/...-quarkus/src/main/kotlin/de/sovity/authorityportal/web/pages/ComponentStatusApiService.kt
@@ -21,11 +21,13 @@ import de.sovity.authorityportal.db.jooq.enums.ComponentType
 import de.sovity.authorityportal.db.jooq.tables.records.ComponentDowntimesRecord
 import de.sovity.authorityportal.web.services.ComponentStatusService
 import de.sovity.authorityportal.web.services.ConnectorMetadataService
+import de.sovity.authorityportal.web.services.ConnectorService
 import de.sovity.authorityportal.web.thirdparty.broker.model.AuthorityPortalConnectorInfo
 import de.sovity.authorityportal.web.thirdparty.broker.model.ConnectorOnlineStatus.DEAD
 import de.sovity.authorityportal.web.thirdparty.broker.model.ConnectorOnlineStatus.OFFLINE
 import de.sovity.authorityportal.web.thirdparty.broker.model.ConnectorOnlineStatus.ONLINE
 import de.sovity.authorityportal.web.thirdparty.uptimekuma.model.toDto
+import de.sovity.authorityportal.web.utils.idmanagement.DataspaceComponentIdUtils
 import jakarta.enterprise.context.ApplicationScoped
 import jakarta.inject.Inject
 import org.jooq.DSLContext
@@ -45,6 +47,12 @@ class ComponentStatusApiService {
     @Inject
     lateinit var componentStatusService: ComponentStatusService
 
+    @Inject
+    lateinit var connectorService: ConnectorService
+
+    @Inject
+    lateinit var dataspaceComponentIdUtils: DataspaceComponentIdUtils
+
     @Inject
     lateinit var dsl: DSLContext
 
@@ -58,10 +66,15 @@ class ComponentStatusApiService {
     }
 
     fun getComponentsStatusForMdsId(environmentId: String, mdsId: String): ComponentStatusOverview {
-        val connectorMetadata = connectorMetadataService.getConnectorInfoByMdsId(mdsId, environmentId)
+        val connectorMetadata = connectorMetadataService.getConnectorInfoByEnvironment(environmentId)
+        val providedConnectorIds = connectorService.getProvidedConnectorsByMdsId(mdsId, environmentId).map { it.connectorId }
+        val filteredMetadata = connectorMetadata.filter {
+            dataspaceComponentIdUtils.toMdsId(it.participantId) == mdsId
+                || it.participantId in providedConnectorIds
+        }
 
-        val unknownConnectorCount = getNumberOfUnknownConnectors(connectorMetadata, environmentId, mdsId)
-        val connectorStatusCount = countConnectorStatuses(connectorMetadata, unknownConnectorCount)
+        val unknownConnectorCount = getNumberOfUnknownConnectors(filteredMetadata, environmentId, mdsId)
+        val connectorStatusCount = countConnectorStatuses(filteredMetadata, unknownConnectorCount)
 
         return buildComponenStatusOverview(connectorStatusCount, environmentId)
     }
@@ -165,10 +178,13 @@ class ComponentStatusApiService {
 
         val conditions = mutableListOf(
             c.ENVIRONMENT.eq(environmentId),
-            DSL.or(c.ENDPOINT_URL.isNull, c.ENDPOINT_URL.notIn(connectorMetadata.map { it.connectorEndpoint }))
+            DSL.or(
+                c.ENDPOINT_URL.isNull,
+                c.ENDPOINT_URL.notIn(connectorMetadata.map { it.connectorEndpoint })
+            )
         )
         if (mdsId != null) {
-            conditions += c.MDS_ID.eq(mdsId)
+            conditions += DSL.or(c.MDS_ID.eq(mdsId), c.PROVIDER_MDS_ID.eq(mdsId))
         }
 
         return dsl.selectCount().from(c).where(conditions).fetchSingle().value1()

diff --git a/...uarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorMetadataService.kt b/...uarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorMetadataService.kt
@@ -57,9 +57,6 @@ class ConnectorMetadataService {
     fun getConnectorInfoByEnvironment(environmentId: String): List<AuthorityPortalConnectorInfo> =
         getByEnvironment(environmentId).connectorInfos
 
-    fun getConnectorInfoByMdsId(mdsId: String, environmentId: String): List<AuthorityPortalConnectorInfo> =
-        getByEnvironment(environmentId).getByMdsId(mdsId)
-
     fun getTotalDataOffersByMdsId(mdsId: String, environmentId: String): Int =
         getByEnvironment(environmentId).getByMdsId(mdsId).sumOf { it.dataOfferCount }
 

diff --git a/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt b/...portal-quarkus/src/main/kotlin/de/sovity/authorityportal/web/services/ConnectorService.kt
@@ -95,6 +95,18 @@ class ConnectorService {
             .fetchOneInto(ConnectorDetailRs::class.java)
     }
 
+    fun getProvidedConnectorsByMdsId(mdsId: String, environment: String): List<ConnectorRecord> {
+        val c = Tables.CONNECTOR
+
+        return dsl.selectFrom(c)
+            .where(
+                c.TYPE.eq(ConnectorType.PROVIDED),
+                c.PROVIDER_MDS_ID.eq(mdsId),
+                c.ENVIRONMENT.eq(environment)
+            )
+            .fetch()
+    }
+
     fun updateConnectorsCreator(newCreatedBy: String, oldCreatedBy: String) {
         val c = Tables.CONNECTOR
         dsl.update(c)

diff --git a/...main/kotlin/de/sovity/authorityportal/web/utils/idmanagement/DataspaceComponentIdUtils.kt b/...main/kotlin/de/sovity/authorityportal/web/utils/idmanagement/DataspaceComponentIdUtils.kt
@@ -41,6 +41,10 @@ class DataspaceComponentIdUtils {
         return dataspaceComponentId
     }
 
+    fun toMdsId(dataspaceComponentId: String): String {
+        return dataspaceComponentId.substringBefore(".")
+    }
+
     private fun getDataspaceComponentIdCandidate(mdsId: String): String {
         val prefix = "$mdsId.C"
         val identifier = idUtils.randomIdentifier(dataspaceComponentIdLength)