Process collections client-side (#1591)

CollectionDetails is not an entity and so cannot be processed server-side

src/Core/Repositories/EntityFramework/CollectionRepository.cs

@@ -70,9 +70,7 @@ namespace Bit.Core.Repositories.EntityFramework
             using (var scope = ServiceScopeFactory.CreateScope())
             {
                 var dbContext = GetDatabaseContext(scope);
-                var query = new CollectionReadByIdUserId(id, userId).Run(dbContext);
+                return (await GetManyByUserIdAsync(userId)).FirstOrDefault(c => c.Id == id);
-                var collection = await query.FirstOrDefaultAsync();
-                return collection;
             }
         }
 
@@ -138,9 +136,19 @@ namespace Bit.Core.Repositories.EntityFramework
             using (var scope = ServiceScopeFactory.CreateScope())
             {
                 var dbContext = GetDatabaseContext(scope);
-                var query = new CollectionReadByUserId(userId).Run(dbContext);
+                return (await new UserCollectionDetailsQuery(userId).Run(dbContext).ToListAsync())
-                var collections = await query.ToListAsync();
+                    .GroupBy(c => c.Id)
-                return collections;
+                    .Select(g => new CollectionDetails
+                    {
+                        Id = g.Key,
+                        OrganizationId = g.FirstOrDefault().OrganizationId,
+                        Name = g.FirstOrDefault().Name,
+                        ExternalId = g.FirstOrDefault().ExternalId,
+                        CreationDate = g.FirstOrDefault().CreationDate,
+                        RevisionDate = g.FirstOrDefault().RevisionDate,
+                        ReadOnly = g.Min(c => c.ReadOnly),
+                        HidePasswords = g.Min(c => c.HidePasswords)
+                    }).ToList();
             }
         }
 

src/Core/Repositories/EntityFramework/Queries/CollectionReadByIdUserId.cs

@@ -1,22 +0,0 @@
-using System.Linq;
-using System;
-using Bit.Core.Models.Data;
-
-namespace Bit.Core.Repositories.EntityFramework.Queries
-{
-    public class CollectionReadByIdUserId : CollectionReadByUserId
-    {
-        private readonly Guid _id;
-
-        public CollectionReadByIdUserId(Guid id, Guid userId) : base(userId)
-        {
-            _id = id;
-        }
-
-        public override IQueryable<CollectionDetails> Run(DatabaseContext dbContext)
-        {
-            var query = base.Run(dbContext);
-            return query.Where(c => c.Id == _id);
-        }
-    }
-}

src/Core/Repositories/EntityFramework/Queries/CollectionReadByUserId.cs

@@ -1,34 +0,0 @@
-using System.Linq;
-using System;
-using Bit.Core.Models.Data;
-
-namespace Bit.Core.Repositories.EntityFramework.Queries
-{
-    public class CollectionReadByUserId : UserCollectionDetailsQuery
-    {
-        private readonly Guid _userId;
-
-        public CollectionReadByUserId(Guid userId) : base(userId)
-        {
-            _userId = userId;
-        }
-
-        public override IQueryable<CollectionDetails> Run(DatabaseContext dbContext)
-        {
-            var query = base.Run(dbContext);
-            return query
-                .GroupBy(c => c.Id)
-                .Select(g => new CollectionDetails
-                {
-                    Id = g.Key,
-                    OrganizationId = g.FirstOrDefault().OrganizationId,
-                    Name = g.FirstOrDefault().Name,
-                    ExternalId = g.FirstOrDefault().ExternalId,
-                    CreationDate = g.FirstOrDefault().CreationDate,
-                    RevisionDate = g.FirstOrDefault().RevisionDate,
-                    ReadOnly = g.Min(c => c.ReadOnly),
-                    HidePasswords = g.Min(c => c.HidePasswords)
-                });
-        }
-    }
-}