refactor: rename attribute to better suit it's use-case

sovity · Dec 10, 2024 · 4331b9f · 4331b9f
1 parent 50fcecc
commit 4331b9f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/...portal-api/src/main/java/de/sovity/authorityportal/api/model/ConnectorOverviewEntryDto.kt b/...portal-api/src/main/java/de/sovity/authorityportal/api/model/ConnectorOverviewEntryDto.kt
@@ -20,7 +20,7 @@ data class ConnectorOverviewEntryDto(
     @field:Schema(description = "Connector ID", requiredMode = Schema.RequiredMode.REQUIRED)
     val id: String,
     @field:Schema(description = "Organization Name", requiredMode = Schema.RequiredMode.REQUIRED)
-    val customerOrgName: String,
+    val organizationName: String,
     @field:Schema(description = "Host Name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     val hostName: String?,
     @field:Schema(description = "Type", requiredMode = Schema.RequiredMode.REQUIRED)

diff --git a/.../de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt b/.../de/sovity/authorityportal/web/pages/connectormanagement/ConnectorManagementApiService.kt
@@ -116,7 +116,7 @@ class ConnectorManagementApiService(
         val connectorDtos = connectors.map {
             ConnectorOverviewEntryDto(
                 id = it.connectorId,
-                customerOrgName = orgNames[it.organizationId] ?: "",
+                organizationName = orgNames[it.organizationId] ?: "",
                 hostName = if (it.type == ConnectorType.CAAS) "sovity GmbH" else orgNames[it.providerOrganizationId] ?: "",
                 type = it.type.toDto(),
                 environment = deploymentEnvironmentDtoService.findByIdOrThrow(it.environment),

diff --git a/.../sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt b/.../sovity/authorityportal/web/tests/services/connector/ConnectorManagementApiServiceTest.kt
@@ -443,7 +443,7 @@ class ConnectorManagementApiServiceTest {
 
         result.connectors.forEachIndexed { i, connector ->
             assertThat(connector.id).isEqualTo(dummyDevConnectorId(0, i))
-            assertThat(connector.customerOrgName).isEqualTo(dummyDevOrganizationName(0))
+            assertThat(connector.organizationName).isEqualTo(dummyDevOrganizationName(0))
         }
     }
 

diff --git a/authority-portal-frontend/src/app/core/api/fake-backend/impl/fake-connectors.ts b/authority-portal-frontend/src/app/core/api/fake-backend/impl/fake-connectors.ts
@@ -158,7 +158,7 @@ export const getListOfConnectorsForTable = (
     ).map((c) => {
       return {
         id: c.connectorId,
-        customerOrgName: c.organizationName,
+        organizationName: c.organizationName,
         hostOrganizationName: c.hostOrganizationName,
         type: c.type,
         environment: c.environment,
@@ -196,7 +196,7 @@ export const getListOfOwnConnectorsForTable = (): ConnectorOverviewResult => {
     ).map((c) => {
       return {
         id: c.connectorId,
-        customerOrgName: c.organizationName,
+        organizationName: c.organizationName,
         hostOrganizationName: c.hostOrganizationName,
         type: c.type,
         environment: c.environment,
@@ -222,7 +222,7 @@ export const getListOfAllConnectorsForTable = (): ConnectorOverviewResult => {
     connectors: TEST_CONNECTORS.map((c) => {
       return {
         id: c.connectorId,
-        customerOrgName: c.organizationName,
+        organizationName: c.organizationName,
         hostOrganizationName: c.hostOrganizationName,
         type: c.type,
         environment: c.environment,

diff --git a/...ctor-list-page/authority-connector-list-page/authority-connector-list-page.component.html b/...ctor-list-page/authority-connector-list-page/authority-connector-list-page.component.html
@@ -80,7 +80,7 @@
                     </td>
                     <td
                       class="py-8 text-sm font-medium whitespace-nowrap text-gray-700">
-                      {{ connector.customerOrgName }}
+                      {{ connector.organizationName }}
                     </td>
                     <td class="py-8 text-sm whitespace-nowrap text-gray-700">
                       {{ connector.hostName }}

diff --git a/...p/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts b/...p/pages/sp-connector-list-page/sp-connector-list-page/sp-connector-list-page.component.ts
@@ -17,8 +17,8 @@ import {Subject, interval} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 import {Store} from '@ngxs/store';
 import {
-  ConnectorOverviewEntryDto,
   ConnectorTypeDto,
+  ProvidedConnectorOverviewEntryDto,
   UserRoleDto,
 } from '@sovity.de/authority-portal-client';
 import {GlobalStateUtils} from 'src/app/core/global-state/global-state-utils';
@@ -187,7 +187,7 @@ export class SpConnectorListPageComponent implements OnInit, OnDestroy {
     this.slideOverService.slideOverReset();
   }
 
-  openDetailPage(connector: ConnectorOverviewEntryDto) {
+  openDetailPage(connector: ProvidedConnectorOverviewEntryDto) {
     this.slideOverConfig = {
       childComponentInput: {
         id: connector.id,