Renamed tables colums and keys added as per ticket and discussion

docs/api/administration-service.yaml

@@ -6349,9 +6349,9 @@ components:
         name:
           type: string
         userType:
-          $ref: '#/components/schemas/CompanyServiceAccountKindId'
+          $ref: '#/components/schemas/TechnicalUserKindId'
         serviceAccountType:
-          $ref: '#/components/schemas/CompanyServiceAccountTypeId'
+          $ref: '#/components/schemas/TechnicalUserTypeId'
         status:
           $ref: '#/components/schemas/UserStatusId'
         isOwner:
@@ -6377,16 +6377,6 @@ components:
           items:
             $ref: '#/components/schemas/CompanyServiceAccountData'
       additionalProperties: false
-    CompanyServiceAccountKindId:
-      enum:
-        - INTERNAL
-        - EXTERNAL
-      type: string
-    CompanyServiceAccountTypeId:
-      enum:
-        - MANAGED
-        - OWN
-      type: string
     CompanyUniqueIdData:
       type: object
       properties:
@@ -7506,9 +7496,9 @@ components:
           items:
             $ref: '#/components/schemas/UserRoleData'
         companyServiceAccountTypeId:
-          $ref: '#/components/schemas/CompanyServiceAccountTypeId'
+          $ref: '#/components/schemas/TechnicalUserTypeId'
         usertype:
-          $ref: '#/components/schemas/CompanyServiceAccountKindId'
+          $ref: '#/components/schemas/TechnicalUserKindId'
         authenticationServiceUrl:
           type: string
         status:
@@ -7564,7 +7554,7 @@ components:
           items:
             $ref: '#/components/schemas/UserRoleData'
         companyServiceAccountTypeId:
-          $ref: '#/components/schemas/CompanyServiceAccountTypeId'
+          $ref: '#/components/schemas/TechnicalUserTypeId'
         secret:
           type: string
           nullable: true
@@ -7600,6 +7590,16 @@ components:
         description:
           type: string
       additionalProperties: false
+    TechnicalUserKindId:
+      enum:
+        - INTERNAL
+        - EXTERNAL
+      type: string
+    TechnicalUserTypeId:
+      enum:
+        - MANAGED
+        - OWN
+      type: string
     UniqueIdentifierId:
       enum:
         - COMMERCIAL_REG_NUMBER

src/administration/Administration.Service/BusinessLogic/ConnectorsBusinessLogic.cs

@@ -232,7 +232,7 @@ private async Task<Guid> CreateAndRegisterConnectorAsync(
                 connector.StatusId = _settings.ClearinghouseConnectDisabled ? ConnectorStatusId.ACTIVE : ConnectorStatusId.PENDING;
                 if (technicalUserId != null)
                 {
-                    connector.CompanyServiceAccountId = technicalUserId;
+                    connector.TechnicalUserId = technicalUserId;
                 }
             });
 
@@ -305,7 +305,7 @@ private async Task DeleteUpdateConnectorDetail(Guid connectorId, IConnectorsRepo
     {
         connectorsRepository.AttachAndModifyConnector(connectorId, null, con =>
         {
-            con.CompanyServiceAccountId = null;
+            con.TechnicalUserId = null;
             con.StatusId = ConnectorStatusId.INACTIVE;
             con.DateLastChanged = DateTimeOffset.UtcNow;
         });

src/administration/Administration.Service/BusinessLogic/ServiceAccountBusinessLogic.cs

@@ -79,8 +79,8 @@ public async Task<IEnumerable<ServiceAccountDetails>> CreateOwnCompanyServiceAcc
         serviceAccountCreationInfos.UserRoleIds.Except(result.TechnicalUserRoleIds)
             .IfAny(unassignable => throw ControllerArgumentException.Create(AdministrationServiceAccountErrors.SERVICE_ROLES_NOT_ASSIGN_ARGUMENT, parameters: [new("unassignable", string.Join(",", unassignable)), new("userRoleIds", string.Join(",", result.TechnicalUserRoleIds))]));
 
-        const CompanyServiceAccountTypeId CompanyServiceAccountTypeId = CompanyServiceAccountTypeId.OWN;
-        var (_, _, serviceAccounts) = await serviceAccountCreation.CreateServiceAccountAsync(serviceAccountCreationInfos, companyId, [result.Bpn], CompanyServiceAccountTypeId, false, true, new ServiceAccountCreationProcessData(ProcessTypeId.DIM_TECHNICAL_USER, null)).ConfigureAwait(ConfigureAwaitOptions.None);
+        const TechnicalUserTypeId TechnicalUserTypeId = TechnicalUserTypeId.OWN;
+        var (_, _, serviceAccounts) = await serviceAccountCreation.CreateServiceAccountAsync(serviceAccountCreationInfos, companyId, [result.Bpn], TechnicalUserTypeId, false, true, new ServiceAccountCreationProcessData(ProcessTypeId.DIM_TECHNICAL_USER, null)).ConfigureAwait(ConfigureAwaitOptions.None);
 
         await portalRepositories.SaveAsync().ConfigureAwait(ConfigureAwaitOptions.None);
         return serviceAccounts.Select(sa => new ServiceAccountDetails(
@@ -91,7 +91,7 @@ public async Task<IEnumerable<ServiceAccountDetails>> CreateOwnCompanyServiceAcc
             sa.Status,
             sa.ServiceAccountData?.AuthData.IamClientAuthMethod,
             sa.UserRoleData,
-            CompanyServiceAccountTypeId,
+            TechnicalUserTypeId,
             sa.ServiceAccountData?.AuthData.Secret));
     }
 
@@ -141,11 +141,11 @@ private void ModifyConnectorForDeleteServiceAccount(Guid serviceAccountId, OwnSe
             portalRepositories.GetInstance<IConnectorsRepository>().AttachAndModifyConnector(result.ConnectorId.Value,
                 connector =>
                 {
-                    connector.CompanyServiceAccountId = serviceAccountId;
+                    connector.TechnicalUserId = serviceAccountId;
                 },
                 connector =>
                 {
-                    connector.CompanyServiceAccountId = null;
+                    connector.TechnicalUserId = null;
                 });
         }
     }
@@ -193,8 +193,8 @@ public async Task<ServiceAccountConnectorOfferData> GetOwnCompanyServiceAccountD
             result.Description,
             iamClientAuthMethod,
             result.UserRoleDatas,
-            result.CompanyServiceAccountTypeId,
-            result.CompanyServiceAccountKindId,
+            result.TechnicalUserTypeId,
+            result.TechnicalUserKindId,
             authServiceUrl,
             result.Status,
             secret,
@@ -227,7 +227,7 @@ public async Task<ServiceAccountDetails> ResetOwnCompanyServiceAccountSecretAsyn
             result.Status,
             authData.IamClientAuthMethod,
             result.UserRoleDatas,
-            result.CompanyServiceAccountTypeId,
+            result.TechnicalUserTypeId,
             authData.Secret);
     }
 
@@ -262,7 +262,7 @@ public async Task<ServiceAccountDetails> UpdateOwnCompanyServiceAccountDetailsAs
         }
 
         ClientAuthData? authData;
-        if (result.CompanyServiceAccountKindId == CompanyServiceAccountKindId.INTERNAL)
+        if (result.TechnicalUserKindId == TechnicalUserKindId.INTERNAL)
         {
             var internalClientId = await provisioningManager.UpdateCentralClientAsync(
                 result.ClientClientId,
@@ -302,7 +302,7 @@ public async Task<ServiceAccountDetails> UpdateOwnCompanyServiceAccountDetailsAs
             result.UserStatusId,
             authData?.IamClientAuthMethod,
             result.UserRoleDatas,
-            result.CompanyServiceAccountTypeId,
+            result.TechnicalUserTypeId,
             authData?.Secret,
             result.OfferSubscriptionId);
     }

src/administration/Administration.Service/Models/ServiceAccountConnectorOfferData.cs

@@ -32,8 +32,8 @@ public record ServiceAccountConnectorOfferData(
     [property: JsonPropertyName("description")] string Description,
     [property: JsonPropertyName("authenticationType")] IamClientAuthMethod? IamClientAuthMethod,
     [property: JsonPropertyName("roles")] IEnumerable<UserRoleData> UserRoleDatas,
-    [property: JsonPropertyName("companyServiceAccountTypeId")] CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
-    [property: JsonPropertyName("usertype")] CompanyServiceAccountKindId CompanyServiceAccountKindId,
+    [property: JsonPropertyName("companyServiceAccountTypeId")] TechnicalUserTypeId TechnicalUserTypeId,
+    [property: JsonPropertyName("usertype")] TechnicalUserKindId TechnicalUserKindId,
     [property: JsonPropertyName("authenticationServiceUrl")] string AuthenticationServiceUrl,
     [property: JsonPropertyName("status")] UserStatusId UserStatusId,
     [property: JsonPropertyName("secret")] string? Secret,

src/administration/Administration.Service/Models/ServiceAccountDetails.cs

@@ -26,14 +26,14 @@
 namespace Org.Eclipse.TractusX.Portal.Backend.Administration.Service.Models;
 
 public record ServiceAccountDetails(
-    [property: JsonPropertyName("serviceAccountId")] Guid ServiceAccountId,
+    [property: JsonPropertyName("serviceAccountId")] Guid TechnicalUserId,
     [property: JsonPropertyName("clientId")] string? ClientId,
     [property: JsonPropertyName("name")] string Name,
     [property: JsonPropertyName("description")] string Description,
     [property: JsonPropertyName("status")] UserStatusId Status,
     [property: JsonPropertyName("authenticationType")] IamClientAuthMethod? IamClientAuthMethod,
     [property: JsonPropertyName("roles")] IEnumerable<UserRoleData> UserRoleDatas,
-    [property: JsonPropertyName("companyServiceAccountTypeId")] CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
+    [property: JsonPropertyName("companyServiceAccountTypeId")] TechnicalUserTypeId TechnicalUserTypeId,
     [property: JsonPropertyName("secret")] string? Secret,
     [property: JsonPropertyName("subscriptionId")] Guid? SubscriptionId = null
 );

src/externalsystems/OfferProvider.Library/BusinessLogic/OfferProviderBusinessLogic.cs

@@ -141,7 +141,7 @@ await _offerProviderService
             }
             technicalUserInfoData = new CallbackTechnicalUserInfoData(
                 serviceAccount.TechnicalUserId,
-                serviceAccount.CompanyServiceAccountKindId == CompanyServiceAccountKindId.INTERNAL
+                serviceAccount.TechnicalUserKindId == TechnicalUserKindId.INTERNAL
                     ? await GetServiceAccountSecret(serviceAccount.TechnicalClientId).ConfigureAwait(ConfigureAwaitOptions.None)
                     : null,
                 serviceAccount.TechnicalClientId);

src/marketplace/Offers.Library/Service/OfferSetupService.cs

@@ -185,7 +185,7 @@ private async Task<OfferAutoSetupResponseData> AutoSetupOfferMultiInstance(Offer
                 serviceAccountCreationInfo,
                 data.CompanyId,
                 data.Bpn == null ? Enumerable.Empty<string>() : Enumerable.Repeat(data.Bpn, 1),
-                CompanyServiceAccountTypeId.MANAGED,
+                TechnicalUserTypeId.MANAGED,
                 data.EnhanceTechnicalUserName,
                 data.Enabled,
                 new ServiceAccountCreationProcessData(ProcessTypeId.OFFER_SUBSCRIPTION, processId),
@@ -280,7 +280,7 @@ private async IAsyncEnumerable<IEnumerable<TechnicalUserInfoData>> CreateTechnic
                     creationInfo,
                     data.CompanyId,
                     data.Bpn == null ? Enumerable.Empty<string>() : [data.Bpn],
-                    CompanyServiceAccountTypeId.MANAGED,
+                    TechnicalUserTypeId.MANAGED,
                     data.EnhanceTechnicalUserName,
                     data.Enabled,
                     new ServiceAccountCreationProcessData(ProcessTypeId.DIM_TECHNICAL_USER, null))

src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountData.cs

@@ -24,11 +24,11 @@
 namespace Org.Eclipse.TractusX.Portal.Backend.PortalBackend.DBAccess.Models;
 
 public record CompanyServiceAccountData(
-    [property: JsonPropertyName("serviceAccountId")] Guid ServiceAccountId,
+    [property: JsonPropertyName("serviceAccountId")] Guid TechnicalUserId,
     [property: JsonPropertyName("clientId")] string? ClientId,
     [property: JsonPropertyName("name")] string Name,
-    [property: JsonPropertyName("userType")] CompanyServiceAccountKindId CompanyServiceAccountKindId,
-    [property: JsonPropertyName("serviceAccountType")] CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
+    [property: JsonPropertyName("userType")] TechnicalUserKindId TechnicalUserKindId,
+    [property: JsonPropertyName("serviceAccountType")] TechnicalUserTypeId TechnicalUserTypeId,
     [property: JsonPropertyName("status")] UserStatusId UserStatusId,
     [property: JsonPropertyName("isOwner")] bool IsOwner,
     [property: JsonPropertyName("isProvider")] bool IsProvider,

src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountDetailedData.cs

@@ -18,6 +18,7 @@
  * 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;
@@ -29,8 +30,8 @@ public record CompanyServiceAccountDetailedData(
     string Description,
     UserStatusId Status,
     IEnumerable<UserRoleData> UserRoleDatas,
-    CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
-    CompanyServiceAccountKindId CompanyServiceAccountKindId,
+    TechnicalUserTypeId TechnicalUserTypeId,
+    TechnicalUserKindId TechnicalUserKindId,
     ConnectorResponseData? ConnectorData,
     OfferResponseData? OfferSubscriptionData,
     CompanyLastEditorData? CompanyLastEditorData,

src/portalbackend/PortalBackend.DBAccess/Models/CompanyServiceAccountWithRoleDataClientId.cs

@@ -17,6 +17,7 @@
  * 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;
@@ -26,8 +27,8 @@ public record CompanyServiceAccountWithRoleDataClientId(
     string Name,
     string Description,
     string? ClientClientId,
-    CompanyServiceAccountTypeId CompanyServiceAccountTypeId,
-    CompanyServiceAccountKindId CompanyServiceAccountKindId,
+    TechnicalUserTypeId TechnicalUserTypeId,
+    TechnicalUserKindId TechnicalUserKindId,
     Guid? OfferSubscriptionId,
     UserStatusId UserStatusId,
     IEnumerable<UserRoleData> UserRoleDatas);

src/portalbackend/PortalBackend.DBAccess/Repositories/AppInstanceRepository.cs

@@ -61,7 +61,7 @@ public Task<bool> CheckInstanceExistsForOffer(Guid offerId) =>
     public IAsyncEnumerable<Guid> GetAssignedServiceAccounts(Guid appInstanceId) =>
         _portalDbContext.AppInstanceAssignedServiceAccounts
             .Where(x => x.AppInstanceId == appInstanceId)
-            .Select(x => x.CompanyServiceAccountId)
+            .Select(x => x.TechnicalUserId)
             .ToAsyncEnumerable();
 
     /// <inheritdoc />

src/portalbackend/PortalBackend.DBAccess/Repositories/ConnectorsRepository.cs

@@ -49,11 +49,11 @@ public class ConnectorsRepository(PortalDbContext dbContext) : IConnectorsReposi
                 con.HostId,
                 con.Host!.Name,
                 con.SelfDescriptionDocumentId,
-                con.CompanyServiceAccountId == null ? null : new TechnicalUserData(
-                    con.CompanyServiceAccount!.Id,
-                    con.CompanyServiceAccount.Name,
-                    con.CompanyServiceAccount.ClientClientId,
-                    con.CompanyServiceAccount.Description),
+                con.TechnicalUserId == null ? null : new TechnicalUserData(
+                    con.TechnicalUser!.Id,
+                    con.TechnicalUser.Name,
+                    con.TechnicalUser.ClientClientId,
+                    con.TechnicalUser.Description),
                 con.ConnectorUrl)
         ).SingleOrDefaultAsync();
 
@@ -76,11 +76,11 @@ public class ConnectorsRepository(PortalDbContext dbContext) : IConnectorsReposi
                     c.StatusId,
                     c.Provider!.Name,
                     c.SelfDescriptionDocumentId,
-                    c.CompanyServiceAccountId == default ? null : new TechnicalUserData(
-                        c.CompanyServiceAccount!.Id,
-                        c.CompanyServiceAccount.Name,
-                        c.CompanyServiceAccount.ClientClientId,
-                        c.CompanyServiceAccount.Description),
+                    c.TechnicalUserId == default ? null : new TechnicalUserData(
+                        c.TechnicalUser!.Id,
+                        c.TechnicalUser.Name,
+                        c.TechnicalUser.ClientClientId,
+                        c.TechnicalUser.Description),
                     c.ConnectorUrl)
         ).SingleOrDefaultAsync();
 
@@ -98,11 +98,11 @@ public class ConnectorsRepository(PortalDbContext dbContext) : IConnectorsReposi
                     connector.HostId,
                     connector.Host!.Name,
                     connector.SelfDescriptionDocumentId,
-                    connector.CompanyServiceAccountId == default ? null : new TechnicalUserData(
-                        connector.CompanyServiceAccount!.Id,
-                        connector.CompanyServiceAccount.Name,
-                        connector.CompanyServiceAccount.ClientClientId,
-                        connector.CompanyServiceAccount.Description),
+                    connector.TechnicalUserId == default ? null : new TechnicalUserData(
+                        connector.TechnicalUser!.Id,
+                        connector.TechnicalUser.Name,
+                        connector.TechnicalUser.ClientClientId,
+                        connector.TechnicalUser.Description),
                     connector.ConnectorUrl),
                 connector.ProviderId == companyId
             ))
@@ -170,17 +170,17 @@ public Connector AttachAndModifyConnector(Guid connectorId, Action<Connector>? i
                     x.OfferSubscriptionId,
                     x.OfferSubscription!.OfferSubscriptionStatusId
                 )),
-                connector.CompanyServiceAccount!.Identity!.UserStatusId,
-                connector.CompanyServiceAccountId,
+                connector.TechnicalUser!.Identity!.UserStatusId,
+                connector.TechnicalUserId,
                 new DeleteServiceAccountData(
-                    connector.CompanyServiceAccount!.Identity!.IdentityAssignedRoles.Select(r => r.UserRoleId),
-                    connector.CompanyServiceAccount.ClientClientId,
-                    connector.CompanyServiceAccount.CompanyServiceAccountKindId == CompanyServiceAccountKindId.EXTERNAL,
-                    connector.CompanyServiceAccount.DimUserCreationData!.Process!.ProcessSteps
+                    connector.TechnicalUser!.Identity!.IdentityAssignedRoles.Select(r => r.UserRoleId),
+                    connector.TechnicalUser.ClientClientId,
+                    connector.TechnicalUser.TechnicalUserKindId == TechnicalUserKindId.EXTERNAL,
+                    connector.TechnicalUser.DimUserCreationData!.Process!.ProcessSteps
                         .Any(ps =>
                             ps.ProcessStepStatusId == ProcessStepStatusId.TODO &&
                             processStepsToFilter.Contains(ps.ProcessStepTypeId)),
-                    connector.CompanyServiceAccount.DimUserCreationData == null ? null : connector.CompanyServiceAccount.DimUserCreationData!.ProcessId)
+                    connector.TechnicalUser.DimUserCreationData == null ? null : connector.TechnicalUser.DimUserCreationData!.ProcessId)
             )).SingleOrDefaultAsync();
 
     /// <inheritdoc />

src/portalbackend/PortalBackend.DBAccess/Repositories/IOfferSubscriptionsRepository.cs

@@ -159,7 +159,7 @@ public interface IOfferSubscriptionsRepository
     Task<VerifyProcessData?> GetProcessStepData(Guid offerSubscriptionId, IEnumerable<ProcessStepTypeId> processStepTypeIds);
     Task<OfferSubscriptionClientCreationData?> GetClientCreationData(Guid offerSubscriptionId);
     Task<OfferSubscriptionTechnicalUserCreationData?> GetTechnicalUserCreationData(Guid offerSubscriptionId);
-    Task<(IEnumerable<(Guid TechnicalUserId, string? TechnicalClientId, CompanyServiceAccountKindId CompanyServiceAccountKindId)> ServiceAccounts, string? ClientId, string? CallbackUrl, OfferSubscriptionStatusId Status)> GetTriggerProviderCallbackInformation(Guid offerSubscriptionId);
+    Task<(IEnumerable<(Guid TechnicalUserId, string? TechnicalClientId, TechnicalUserKindId TechnicalUserKindId)> ServiceAccounts, string? ClientId, string? CallbackUrl, OfferSubscriptionStatusId Status)> GetTriggerProviderCallbackInformation(Guid offerSubscriptionId);
     OfferSubscriptionProcessData CreateOfferSubscriptionProcessData(Guid offerSubscriptionId, string offerUrl);
     void RemoveOfferSubscriptionProcessData(Guid offerSubscriptionProcessDataId);
     IAsyncEnumerable<ProcessStepData> GetProcessStepsForSubscription(Guid offerSubscriptionId);