From c222562b6f3c4d3b29328bef484b945ace7c8873 Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Tue, 8 Nov 2022 10:01:32 -0500 Subject: [PATCH] [PS-1806] Fix EF `LEFT JOIN`'s on multiple values (#2389) * Fix OrganizationUserOrganizationDetails * Rewrote query to be equal with SQL Server implementation * Fix OrganizationUserUserView * Rewrote query to be equal to SQL Server implementation * Formatting --- ...izationUserOrganizationDetailsViewQuery.cs | 92 +++++++++---------- .../Queries/OrganizationUserUserViewQuery.cs | 6 +- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs index 84dc4a7ad6..09eac0fbe0 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserOrganizationDetailsViewQuery.cs @@ -7,58 +7,58 @@ public class OrganizationUserOrganizationDetailsViewQuery : IQuery Run(DatabaseContext dbContext) { var query = from ou in dbContext.OrganizationUsers - join o in dbContext.Organizations on ou.OrganizationId equals o.Id - join su in dbContext.SsoUsers on ou.UserId equals su.UserId into su_g + join o in dbContext.Organizations on ou.OrganizationId equals o.Id into outerOrganization + from o in outerOrganization.DefaultIfEmpty() + join su in dbContext.SsoUsers on new { ou.UserId, OrganizationId = (Guid?)ou.OrganizationId } equals new { UserId = (Guid?)su.UserId, su.OrganizationId } into su_g from su in su_g.DefaultIfEmpty() join po in dbContext.ProviderOrganizations on o.Id equals po.OrganizationId into po_g from po in po_g.DefaultIfEmpty() join p in dbContext.Providers on po.ProviderId equals p.Id into p_g from p in p_g.DefaultIfEmpty() - join os in dbContext.OrganizationSponsorships on ou.Id equals os.SponsoringOrganizationUserId into os_g - from os in os_g.DefaultIfEmpty() join ss in dbContext.SsoConfigs on ou.OrganizationId equals ss.OrganizationId into ss_g from ss in ss_g.DefaultIfEmpty() - where ((su == null || !su.OrganizationId.HasValue) || su.OrganizationId == ou.OrganizationId) - select new { ou, o, su, p, ss, os }; - - return query.Select(x => new OrganizationUserOrganizationDetails - { - OrganizationId = x.ou.OrganizationId, - UserId = x.ou.UserId, - Name = x.o.Name, - Enabled = x.o.Enabled, - PlanType = x.o.PlanType, - UsePolicies = x.o.UsePolicies, - UseSso = x.o.UseSso, - UseKeyConnector = x.o.UseKeyConnector, - UseScim = x.o.UseScim, - UseGroups = x.o.UseGroups, - UseDirectory = x.o.UseDirectory, - UseEvents = x.o.UseEvents, - UseTotp = x.o.UseTotp, - Use2fa = x.o.Use2fa, - UseApi = x.o.UseApi, - SelfHost = x.o.SelfHost, - UsersGetPremium = x.o.UsersGetPremium, - Seats = x.o.Seats, - MaxCollections = x.o.MaxCollections, - MaxStorageGb = x.o.MaxStorageGb, - Identifier = x.o.Identifier, - Key = x.ou.Key, - ResetPasswordKey = x.ou.ResetPasswordKey, - Status = x.ou.Status, - Type = x.ou.Type, - SsoExternalId = x.su.ExternalId, - Permissions = x.ou.Permissions, - PublicKey = x.o.PublicKey, - PrivateKey = x.o.PrivateKey, - ProviderId = x.p.Id, - ProviderName = x.p.Name, - SsoConfig = x.ss.Data, - FamilySponsorshipFriendlyName = x.os.FriendlyName, - FamilySponsorshipLastSyncDate = x.os.LastSyncDate, - FamilySponsorshipToDelete = x.os.ToDelete, - FamilySponsorshipValidUntil = x.os.ValidUntil - }); + join os in dbContext.OrganizationSponsorships on ou.Id equals os.SponsoringOrganizationUserId into os_g + from os in os_g.DefaultIfEmpty() + select new OrganizationUserOrganizationDetails + { + UserId = ou.UserId, + OrganizationId = ou.OrganizationId, + Name = o.Name, + Enabled = o.Enabled, + PlanType = o.PlanType, + UsePolicies = o.UsePolicies, + UseSso = o.UseSso, + UseKeyConnector = o.UseKeyConnector, + UseScim = o.UseScim, + UseGroups = o.UseGroups, + UseDirectory = o.UseDirectory, + UseEvents = o.UseEvents, + UseTotp = o.UseTotp, + Use2fa = o.Use2fa, + UseApi = o.UseApi, + UseResetPassword = o.UseResetPassword, + SelfHost = o.SelfHost, + UsersGetPremium = o.UsersGetPremium, + Seats = o.Seats, + MaxCollections = o.MaxCollections, + MaxStorageGb = o.MaxStorageGb, + Identifier = o.Identifier, + Key = ou.Key, + ResetPasswordKey = ou.ResetPasswordKey, + PublicKey = o.PublicKey, + PrivateKey = o.PrivateKey, + Status = ou.Status, + Type = ou.Type, + SsoExternalId = su.ExternalId, + Permissions = ou.Permissions, + ProviderId = p.Id, + ProviderName = p.Name, + SsoConfig = ss.Data, + FamilySponsorshipFriendlyName = os.FriendlyName, + FamilySponsorshipLastSyncDate = os.LastSyncDate, + FamilySponsorshipToDelete = os.ToDelete, + FamilySponsorshipValidUntil = os.ValidUntil + }; + return query; } } diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs index 2a5bf06fd1..62888d2a3e 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/OrganizationUserUserViewQuery.cs @@ -9,14 +9,14 @@ public class OrganizationUserUserDetailsViewQuery : IQuery new OrganizationUserUserDetails { Id = x.ou.Id, - OrganizationId = x.ou.OrganizationId, UserId = x.ou.UserId, + OrganizationId = x.ou.OrganizationId, Name = x.u.Name, Email = x.u.Email ?? x.ou.Email, TwoFactorProviders = x.u.TwoFactorProviders, @@ -28,7 +28,7 @@ public class OrganizationUserUserDetailsViewQuery : IQuery