From 2c9df6d1ff3098ce164bbd53db92ca6ccc18fca1 Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Tue, 7 Mar 2023 14:35:39 +0100
Subject: [PATCH] [PM-1191] collections cannot be managed in family
 organization (#2765)

* [PM-1191] fix: use join instead of select-subquery

EF6 is currently not able to translate LINQ that include selects after groupby statements. Using join let's us bypass this issue.

* [PM-1191] chore: simplify queries

* Revert "[PM-1191] chore: simplify queries"

This reverts commit f57443d8c40d349056948915504bff724e2def50.
---
 .../Repositories/CollectionRepository.cs      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index 755e69264d..ce5b07b1c0 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -186,13 +186,13 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
         {
             var dbContext = GetDatabaseContext(scope);
             var groups =
-                from cg in dbContext.CollectionGroups
-                where cg.Collection.OrganizationId == organizationId
+                from c in collections
+                join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
                 group cg by cg.CollectionId into g
                 select g;
             var users =
-                from cu in dbContext.CollectionUsers
-                where cu.Collection.OrganizationId == organizationId
+                from c in collections
+                join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
                 group cu by cu.CollectionId into u
                 select u;
 
@@ -230,19 +230,16 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
         {
             var dbContext = GetDatabaseContext(scope);
             var groups =
-                from cg in dbContext.CollectionGroups
-                where cg.Collection.OrganizationId == organizationId
-                 && collections.Select(c => c.Id).Contains(cg.Collection.Id)
+                from c in collections
+                join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
                 group cg by cg.CollectionId into g
                 select g;
             var users =
-                from cu in dbContext.CollectionUsers
-                where cu.Collection.OrganizationId == organizationId
-                 && collections.Select(c => c.Id).Contains(cu.Collection.Id)
+                from c in collections
+                join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
                 group cu by cu.CollectionId into u
                 select u;
 
-
             return collections.Select(collection =>
                 new Tuple<Core.Entities.Collection, CollectionAccessDetails>(
                     collection,