fix review findings

eclipse-tractusx · Oct 8, 2024 · 11f1955 · 11f1955
1 parent 3544ccd
commit 11f1955
Show file tree

Hide file tree

Showing 24 changed files with 922 additions and 388 deletions.
diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs
@@ -1,5 +1,4 @@
 /********************************************************************************
- * Copyright (c) 2022 BMW Group AG
  * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
@@ -18,7 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;

diff --git a/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountWithRoleDataClientId.cs b/src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountWithRoleDataClientId.cs
@@ -17,7 +17,6 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Entities;
 using Org.Eclipse.TractusX.Portal.Backend.PortalBackend.PortalEntities.Enums;
 
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/AppInstanceRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/AppInstanceRepository.cs
@@ -48,8 +48,8 @@ public void RemoveAppInstance(Guid appInstanceId) =>
     /// <inheritdoc />
     public void CreateAppInstanceAssignedServiceAccounts(
         IEnumerable<(Guid AppInstanceId, Guid CompanyServiceAccountId)> instanceAccounts) =>
-        _portalDbContext.AppInstanceAssignedServiceAccounts.AddRange(instanceAccounts
-            .Select(x => new AppInstanceAssignedCompanyServiceAccount(
+        _portalDbContext.AppInstanceAssignedTechnicalUsers.AddRange(instanceAccounts
+            .Select(x => new AppInstanceAssignedTechnicalUser(
                 x.AppInstanceId,
                 x.CompanyServiceAccountId)));
 
@@ -59,7 +59,7 @@ public Task<bool> CheckInstanceExistsForOffer(Guid offerId) =>
 
     /// <inheritdoc />
     public IAsyncEnumerable<Guid> GetAssignedServiceAccounts(Guid appInstanceId) =>
-        _portalDbContext.AppInstanceAssignedServiceAccounts
+        _portalDbContext.AppInstanceAssignedTechnicalUsers
             .Where(x => x.AppInstanceId == appInstanceId)
             .Select(x => x.TechnicalUserId)
             .ToAsyncEnumerable();
@@ -72,6 +72,6 @@ public Task<bool> CheckInstanceHasAssignedSubscriptions(Guid appInstanceId) =>
 
     /// <inheritdoc />
     public void RemoveAppInstanceAssignedServiceAccounts(Guid appInstanceId, IEnumerable<Guid> serviceAccountIds) =>
-        _portalDbContext.AppInstanceAssignedServiceAccounts
-            .RemoveRange(serviceAccountIds.Select(x => new AppInstanceAssignedCompanyServiceAccount(appInstanceId, x)));
+        _portalDbContext.AppInstanceAssignedTechnicalUsers
+            .RemoveRange(serviceAccountIds.Select(x => new AppInstanceAssignedTechnicalUser(appInstanceId, x)));
 }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ServiceAccountRepository.cs
@@ -102,7 +102,7 @@ public void AttachAndModifyCompanyServiceAccount(
                 sa.Identity!.IdentityAssignedRoles.Select(r => r.UserRoleId),
                 sa.Id,
                 sa.Identity!.UserStatusId,
-                sa.CompaniesLinkedServiceAccount!.Owners == companyId || sa.CompaniesLinkedServiceAccount!.Provider == companyId,
+                sa.CompaniesLinkedTechnicalUser!.Owners == companyId || sa.CompaniesLinkedTechnicalUser!.Provider == companyId,
                 sa.Version,
                 sa.Connector!.Id,
                 sa.ClientClientId,
@@ -127,12 +127,12 @@ public void AttachAndModifyCompanyServiceAccount(
                 serviceAccount.OfferSubscription,
                 serviceAccount.Identity!.LastEditor,
                 serviceAccount.ExternalTechnicalUser,
-                serviceAccount.CompaniesLinkedServiceAccount
+                serviceAccount.CompaniesLinkedTechnicalUser
             })
             .Where(x =>
                 x.ServiceAccount.Id == serviceAccountId &&
                 x.Identity!.UserStatusId != UserStatusId.DELETED &&
-                (x.CompaniesLinkedServiceAccount!.Owners == companyId || x.CompaniesLinkedServiceAccount!.Provider == companyId))
+                (x.CompaniesLinkedTechnicalUser!.Owners == companyId || x.CompaniesLinkedTechnicalUser!.Provider == companyId))
             .Select(x => new CompanyServiceAccountDetailedData(
                 x.ServiceAccount.Id,
                 x.ServiceAccount.ClientClientId,
@@ -184,8 +184,8 @@ public void AttachAndModifyCompanyServiceAccount(
                 .Select(serviceAccount => new
                 {
                     ServiceAccount = serviceAccount,
-                    IsOwner = serviceAccount.CompaniesLinkedServiceAccount!.Owners == userCompanyId,
-                    IsProvider = serviceAccount.CompaniesLinkedServiceAccount!.Provider == userCompanyId
+                    IsOwner = serviceAccount.CompaniesLinkedTechnicalUser!.Owners == userCompanyId,
+                    IsProvider = serviceAccount.CompaniesLinkedTechnicalUser!.Provider == userCompanyId
                 })
                 .Where(x =>
                     (isOwner.HasValue