fix(serviceAccount): adjust response for get serviceaccount detail (#964

) * remove subscriptionId from response Refs: #897
eclipse-tractusx · Sep 16, 2024 · 006bb35 · 006bb35
1 parent bb16156
commit 006bb35
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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(