Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-02 23:41:21 +01:00
Code Issues Projects Releases Wiki Activity

[PM-1191] chore: simplify queries

Browse Source
This commit is contained in:
Andreas Coroiu 2023-03-03 14:23:31 +01:00
parent 353d7fa0e2
commit f57443d8c4
No known key found for this signature in database
GPG Key ID: E70B5FFC81DFEC1A
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
View File

@ -188,13 +188,11 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
var groups =
from c in collections
join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
group cg by cg.CollectionId into g
select g;
select cg;
var users =
from c in collections
join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
group cu by cu.CollectionId into u
select u;
select cu;
return collections.Select(collection =>
new Tuple<Core.Entities.Collection, CollectionAccessDetails>(
@ -202,7 +200,6 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
new CollectionAccessDetails
{
Groups = groups
.FirstOrDefault(g => g.Key == collection.Id)?
.Select(g => new CollectionAccessSelection
{
Id = g.GroupId,
@ -210,7 +207,6 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
ReadOnly = g.ReadOnly
}).ToList() ?? new List<CollectionAccessSelection>(),
Users = users
.FirstOrDefault(u => u.Key == collection.Id)?
.Select(c => new CollectionAccessSelection
{
Id = c.OrganizationUserId,
@ -232,13 +228,11 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
var groups =
from c in collections
join cg in dbContext.CollectionGroups on c.Id equals cg.CollectionId
group cg by cg.CollectionId into g
select g;
select cg;
var users =
from c in collections
join cu in dbContext.CollectionUsers on c.Id equals cu.CollectionId
group cu by cu.CollectionId into u
select u;
select cu;
return collections.Select(collection =>
new Tuple<Core.Entities.Collection, CollectionAccessDetails>(
@ -246,7 +240,6 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
new CollectionAccessDetails
{
Groups = groups
.FirstOrDefault(g => g.Key == collection.Id)?
.Select(g => new CollectionAccessSelection
{
Id = g.GroupId,
@ -254,7 +247,6 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
ReadOnly = g.ReadOnly
}).ToList() ?? new List<CollectionAccessSelection>(),
Users = users
.FirstOrDefault(u => u.Key == collection.Id)?
.Select(c => new CollectionAccessSelection
{
Id = c.OrganizationUserId,