Changes EF to match collection type comparison

sven-bitwarden · sven-bitwarden · commit 07c7e7639120 · 2026-01-26T14:36:05.000-06:00
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
@@ -472,7 +472,7 @@ join ou in userIdEntities on gu.OrganizationUserId equals ou.Id
                 collections = (await (from cu in dbContext.CollectionUsers
                                       join ou in userIdEntities on cu.OrganizationUserId equals ou.Id
                                       join c in dbContext.Collections on cu.CollectionId equals c.Id
-                                      where c.Type != CollectionType.DefaultUserCollection
+                                      where c.Type == CollectionType.SharedCollection
                                       select cu).ToListAsync())
                     .GroupBy(c => c.OrganizationUserId).ToList();
             }
diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionAdminDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionAdminDetailsQuery.cs
@@ -62,7 +62,7 @@ where cg.Manage
         {
             baseCollectionQuery = baseCollectionQuery.Where(x =>
                 x.c.OrganizationId == _organizationId &&
-                x.c.Type != CollectionType.DefaultUserCollection);
+                x.c.Type == CollectionType.SharedCollection);
         }
         else if (_collectionId.HasValue)
         {

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ join ou in userIdEntities on gu.OrganizationUserId equals ou.Id`
`472`	`472`	`collections = (await (from cu in dbContext.CollectionUsers`
`473`	`473`	`join ou in userIdEntities on cu.OrganizationUserId equals ou.Id`
`474`	`474`	`join c in dbContext.Collections on cu.CollectionId equals c.Id`
`475`		`- where c.Type != CollectionType.DefaultUserCollection`
	`475`	`+ where c.Type == CollectionType.SharedCollection`
`476`	`476`	`select cu).ToListAsync())`
`477`	`477`	`.GroupBy(c => c.OrganizationUserId).ToList();`
`478`	`478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ where cg.Manage`
`62`	`62`	`{`
`63`	`63`	`baseCollectionQuery = baseCollectionQuery.Where(x =>`
`64`	`64`	`x.c.OrganizationId == _organizationId &&`
`65`		`- x.c.Type != CollectionType.DefaultUserCollection);`
	`65`	`+ x.c.Type == CollectionType.SharedCollection);`
`66`	`66`	`}`
`67`	`67`	`else if (_collectionId.HasValue)`
`68`	`68`	`{`