fix(registration): fix applicationsWithStatus not showing user after …

…decline (#873) * fall back to all users in selection of first user if no active user is found --------- Co-authored-by: Norbert Truchsess <[email protected]>
eclipse-tractusx · Aug 6, 2024 · 76138ca · 76138ca
1 parent 7a931b9
commit 76138ca
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/administration/Administration.Service/BusinessLogic/RegistrationBusinessLogic.cs b/src/administration/Administration.Service/BusinessLogic/RegistrationBusinessLogic.cs
@@ -240,13 +240,20 @@ private async Task<CompanyWithAddressData> GetCompanyWithAddressAsyncInternal(Gu
                     .Select(application => new
                     {
                         Application = application,
-                        CompanyUser = application.Invitations.Select(invitation => invitation.CompanyUser)
-                    .FirstOrDefault(companyUser =>
-                        companyUser!.Identity!.UserStatusId == UserStatusId.ACTIVE
-                        && companyUser.Firstname != null
-                        && companyUser.Lastname != null
-                        && companyUser.Email != null
-                    )
+                        CompanyUsers = application.Invitations.Select(invitation => invitation.CompanyUser)
+                    })
+                    .Select(x => new
+                    {
+                        x.Application,
+                        CompanyUser = x.CompanyUsers.FirstOrDefault(companyUser =>
+                                    companyUser!.Identity!.UserStatusId == UserStatusId.ACTIVE
+                                    && companyUser!.Firstname != null
+                                    && companyUser.Lastname != null
+                                    && companyUser.Email != null)
+                            ?? x.CompanyUsers.FirstOrDefault(companyUser =>
+                                    companyUser!.Firstname != null
+                                    && companyUser.Lastname != null
+                                    && companyUser.Email != null)
                     })
                     .Select(s => new CompanyApplicationWithCompanyUserDetails(
                         s.Application.Id,