fix review findings

eclipse-tractusx · Oct 15, 2024 · 32e02f6 · 32e02f6
1 parent 5bd3e64
commit 32e02f6
Show file tree

Hide file tree

Showing 10 changed files with 483 additions and 386 deletions.
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/ApplicationRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/ApplicationRepository.cs
@@ -206,19 +206,20 @@ public IQueryable<CompanyApplication> GetExternalCompanyApplicationsFilteredQuer
             .SingleOrDefaultAsync();
 
     /// <inheritdoc />
-    public Task<(Guid CompanyId, string CompanyName, string? BusinessPartnerNumber, CompanyApplicationTypeId ApplicationTypeId, Guid? NetworkRegistrationProcessId)> GetCompanyAndApplicationDetailsForApprovalAsync(Guid applicationId) =>
+    public Task<(Guid CompanyId, string CompanyName, string? BusinessPartnerNumber, CompanyApplicationTypeId ApplicationTypeId, VerifyProcessData? NetworkRegistrationProcessData)> GetCompanyAndApplicationDetailsForApprovalAsync(Guid applicationId) =>
         portalDbContext.CompanyApplications
+            .AsNoTracking()
             .Where(companyApplication =>
                 companyApplication.Id == applicationId &&
                 companyApplication.ApplicationStatusId == CompanyApplicationStatusId.SUBMITTED)
-            .Select(ca => new ValueTuple<Guid, string, string?, CompanyApplicationTypeId, Guid?>(
+            .Select(ca => new ValueTuple<Guid, string, string?, CompanyApplicationTypeId, VerifyProcessData?>(
                 ca.CompanyId,
                 ca.Company!.Name,
                 ca.Company.BusinessPartnerNumber,
                 ca.CompanyApplicationTypeId,
-                ca.CompanyApplicationTypeId == CompanyApplicationTypeId.EXTERNAL ?
-                    ca.Company.NetworkRegistration!.ProcessId :
-                    null))
+                ca.CompanyApplicationTypeId == CompanyApplicationTypeId.EXTERNAL
+                    ? new(ca.Company.NetworkRegistration!.Process, ca.Company.NetworkRegistration!.Process!.ProcessSteps.Where(ps => ps.ProcessStepStatusId == ProcessStepStatusId.TODO))
+                    : null))
             .SingleOrDefaultAsync();
 
     /// <inheritdoc />
@@ -258,8 +259,14 @@ public IAsyncEnumerable<CompanyInvitedUserData> GetInvitedUsersWithoutInitialRol
     public IAsyncEnumerable<Guid> GetInvitedUserDataByApplicationWithoutBpn(Guid applicationId) =>
         portalDbContext.Invitations
             .Where(invitation => invitation.CompanyApplicationId == applicationId)
-            .Select(invitation => new { invitation.CompanyUser, invitation.CompanyApplication!.Company!.BusinessPartnerNumber })
-            .Where(x => x.CompanyUser!.Identity!.UserStatusId == UserStatusId.ACTIVE && !x.CompanyUser.CompanyUserAssignedBusinessPartners.Any(cuabp => cuabp.BusinessPartnerNumber == x.BusinessPartnerNumber))
+            .Select(invitation => new
+            {
+                invitation.CompanyUser,
+                invitation.CompanyApplication!.Company!.BusinessPartnerNumber
+            })
+            .Where(x =>
+                x.CompanyUser!.Identity!.UserStatusId == UserStatusId.ACTIVE &&
+                !x.CompanyUser.CompanyUserAssignedBusinessPartners.Any(cuabp => cuabp.BusinessPartnerNumber == x.BusinessPartnerNumber))
             .Select(x => x.CompanyUser!.Id)
             .Take(2)
             .AsAsyncEnumerable();
@@ -596,13 +603,20 @@ public Task<bool> IsValidApplicationForCompany(Guid applicationId, Guid companyI
     public Task<(string CompanyName, string? BusinessPartnerNumber)> GetBpnAndCompanyNameForApplicationId(Guid applicationId) =>
         portalDbContext.CompanyApplications
             .Where(x => x.Id == applicationId)
-            .Select(x => new ValueTuple<string, string?>(x.Company!.Name, x.Company!.BusinessPartnerNumber))
+            .Select(x => new ValueTuple<string, string?>(
+                x.Company!.Name,
+                x.Company.BusinessPartnerNumber))
             .SingleOrDefaultAsync();
 
     public IAsyncEnumerable<string> GetSharedIdpAliasseForApplicationId(Guid applicationId) =>
         portalDbContext.CompanyApplications
             .Where(x => x.Id == applicationId)
-            .SelectMany(ca => ca.Company!.IdentityProviders.Where(x => x.IdentityProviderTypeId == IdentityProviderTypeId.SHARED && x.IamIdentityProvider != null).Select(x => x.IamIdentityProvider!.IamIdpAlias))
+            .SelectMany(ca =>
+                ca.Company!.IdentityProviders
+                    .Where(x =>
+                        x.IdentityProviderTypeId == IdentityProviderTypeId.SHARED &&
+                        x.IamIdentityProvider != null)
+                    .Select(x => x.IamIdentityProvider!.IamIdpAlias))
             .ToAsyncEnumerable()
     ;
 }
diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/IApplicationRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/IApplicationRepository.cs
@@ -38,7 +38,7 @@ public interface IApplicationRepository
     Task<CompanyApplicationDetailData?> GetCompanyApplicationDetailDataAsync(Guid applicationId, Guid userCompanyId, Guid? companyId);
     Task<(string CompanyName, string? FirstName, string? LastName, string? Email, IEnumerable<(Guid ApplicationId, CompanyApplicationStatusId ApplicationStatusId, IEnumerable<(string? FirstName, string? LastName, string? Email)> InvitedUsers)> Applications)> GetCompanyApplicationsDeclineData(Guid companyUserId, IEnumerable<CompanyApplicationStatusId> applicationStatusIds);
     Task<(bool IsValidApplicationId, Guid CompanyId, bool IsSubmitted)> GetCompanyIdSubmissionStatusForApplication(Guid applicationId);
-    Task<(Guid CompanyId, string CompanyName, string? BusinessPartnerNumber, CompanyApplicationTypeId ApplicationTypeId, Guid? NetworkRegistrationProcessId)> GetCompanyAndApplicationDetailsForApprovalAsync(Guid applicationId);
+    Task<(Guid CompanyId, string CompanyName, string? BusinessPartnerNumber, CompanyApplicationTypeId ApplicationTypeId, VerifyProcessData? NetworkRegistrationProcessData)> GetCompanyAndApplicationDetailsForApprovalAsync(Guid applicationId);
     Task<(Guid CompanyId, string CompanyName, string? BusinessPartnerNumber)> GetCompanyAndApplicationDetailsForCreateWalletAsync(Guid applicationId);
     IAsyncEnumerable<CompanyInvitedUserData> GetInvitedUsersWithoutInitialRoles(Guid applicationId, IEnumerable<Guid> userRoleIds);
     IAsyncEnumerable<EmailData> GetEmailDataUntrackedAsync(Guid applicationId);

diff --git a/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRolesRepository.cs b/src/portalbackend/PortalBackend.DBAccess/Repositories/UserRolesRepository.cs
@@ -261,24 +261,28 @@ public async IAsyncEnumerable<CompanyUserNameData> GetUserDataByAssignedRoles(Gu
 
     public IAsyncEnumerable<(Guid IdentityId, IEnumerable<(string ClientClientId, Guid UserRoleId, string UserRoleText)> InstanceRoleData)> GetUsersWithUserRolesForApplicationId(Guid applicationId, IEnumerable<string> iamClientIds) =>
         _dbContext.Identities
-        .Where(identity => identity.Company!.CompanyApplications.Any(companyApplication => companyApplication.Id == applicationId))
-        .Select(identity => new
-        {
-            Identity = identity,
-            RoleData = identity.IdentityAssignedRoles.SelectMany(identityAssignedRole =>
-                identityAssignedRole.UserRole!.Offer!.AppInstances
-                    .Where(instance => iamClientIds.Contains(instance.IamClient!.ClientClientId))
-                    .Select(appInstance =>
-                        new { AppInstance = appInstance, UserRole = identityAssignedRole.UserRole }))
-        })
-        .Where(x => x.RoleData.Any())
-        .Select(x => new ValueTuple<Guid, IEnumerable<(string, Guid, string)>>(
-            x.Identity.Id,
-            x.RoleData.Select(roleData => new ValueTuple<string, Guid, string>(
-                        roleData.AppInstance.IamClient!.ClientClientId,
-                        roleData.UserRole.Id, roleData.UserRole.UserRoleText))))
-        .Take(2)
-        .ToAsyncEnumerable();
+            .Where(identity => identity.Company!.CompanyApplications.Any(companyApplication => companyApplication.Id == applicationId))
+            .Select(identity => new
+            {
+                Identity = identity,
+                RoleData = identity.IdentityAssignedRoles.SelectMany(identityAssignedRole =>
+                    identityAssignedRole.UserRole!.Offer!.AppInstances
+                        .Where(instance => iamClientIds.Contains(instance.IamClient!.ClientClientId))
+                        .Select(appInstance => new
+                        {
+                            AppInstance = appInstance,
+                            UserRole = identityAssignedRole.UserRole
+                        }))
+            })
+            .Where(x => x.RoleData.Any())
+            .Select(x => new ValueTuple<Guid, IEnumerable<(string, Guid, string)>>(
+                x.Identity.Id,
+                x.RoleData.Select(roleData => new ValueTuple<string, Guid, string>(
+                            roleData.AppInstance.IamClient!.ClientClientId,
+                            roleData.UserRole.Id,
+                            roleData.UserRole.UserRoleText))))
+            .Take(2)
+            .ToAsyncEnumerable();
 
     /// <inheritdoc />
     public IAsyncEnumerable<Guid> GetRolesForClient(string technicalUserProfileClient) =>