From 006bb3516e92710b4790df51301f04953e6e8717 Mon Sep 17 00:00:00 2001
From: Phil Schneider <info@philschneider.de>
Date: Mon, 16 Sep 2024 14:38:57 +0200
Subject: [PATCH] fix(serviceAccount): adjust response for get serviceaccount
 detail (#964)

* remove subscriptionId from response

Refs: #897
---
 .../BusinessLogic/ServiceAccountBusinessLogic.cs            | 6 ++----
 .../Models/ServiceAccountConnectorOfferData.cs              | 3 +--
 .../Models/CompanyServiceAccountDetailedData.cs             | 1 -
 .../Repositories/ServiceAccountRepository.cs                | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/administration/Administration.Service/BusinessLogic/ServiceAccountBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/ServiceAccountBusinessLogic.cs
index 2ba65c4e25..2ff5885a86 100644
--- a/src/administration/Administration.Service/BusinessLogic/ServiceAccountBusinessLogic.cs
+++ b/src/administration/Administration.Service/BusinessLogic/ServiceAccountBusinessLogic.cs
@@ -187,8 +187,7 @@ public async Task<ServiceAccountConnectorOfferData> GetOwnCompanyServiceAccountD
             result.ConnectorData,
             result.OfferSubscriptionData,
             result.CompanyLastEditorData!.Name,
-            result.CompanyLastEditorData.CompanyName,
-            result.SubscriptionId);
+            result.CompanyLastEditorData.CompanyName);
     }
 
     public async Task<ServiceAccountDetails> ResetOwnCompanyServiceAccountSecretAsync(Guid serviceAccountId)
@@ -215,8 +214,7 @@ public async Task<ServiceAccountDetails> ResetOwnCompanyServiceAccountSecretAsyn
             authData.IamClientAuthMethod,
             result.UserRoleDatas,
             result.CompanyServiceAccountTypeId,
-            authData.Secret,
-            result.SubscriptionId);
+            authData.Secret);
     }
 
     public async Task<ServiceAccountDetails> UpdateOwnCompanyServiceAccountDetailsAsync(Guid serviceAccountId, ServiceAccountEditableDetails serviceAccountDetails)
diff --git a/src/administration/Administration.Service/Models/ServiceAccountConnectorOfferData.cs b/src/administration/Administration.Service/Models/ServiceAccountConnectorOfferData.cs
index ac2e4a0ca4..ca0ae893b8 100644
--- a/src/administration/Administration.Service/Models/ServiceAccountConnectorOfferData.cs
+++ b/src/administration/Administration.Service/Models/ServiceAccountConnectorOfferData.cs
@@ -38,6 +38,5 @@ public record ServiceAccountConnectorOfferData(
     [property: JsonPropertyName("connector")] ConnectorResponseData? Connector,
     [property: JsonPropertyName("offer")] OfferResponseData? Offer,
     [property: JsonPropertyName("LastEditorName")] string? LastName,
-    [property: JsonPropertyName("LastEditorCompanyName")] string? CompanyName,
-    [property: JsonPropertyName("subscriptionId")] Guid? SubscriptionId = null
+    [property: JsonPropertyName("LastEditorCompanyName")] string? CompanyName
 );
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs
index 6f4c6c6a87..fee038ac16 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs
@@ -30,7 +30,6 @@ public record CompanyServiceAccountDetailedData(
     UserStatusId Status,
     IEnumerable<UserRoleData> UserRoleDatas,
     CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
-    Guid? SubscriptionId,
     ConnectorResponseData? ConnectorData,
     OfferResponseData? OfferSubscriptionData,
     CompanyLastEditorData? CompanyLastEditorData,
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs
index 15862fa27a..2f3052dca5 100644
--- a/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs
+++ b/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs
@@ -146,7 +146,6 @@ public void AttachAndModifyCompanyServiceAccount(
                         userRole.Offer!.AppInstances.First().IamClient!.ClientClientId,
                         userRole.UserRoleText)),
                 x.ServiceAccount.CompanyServiceAccountTypeId,
-                x.ServiceAccount.OfferSubscriptionId,
                 x.Connector == null
                     ? null
                     : new ConnectorResponseData(