From 0e95f6752d9f7cceb8d8f316ddb789cacb701506 Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:11:42 -0400 Subject: [PATCH] Handle Constant Expression Warning (#4613) * Add Collections Tests * Update CollectionRepository Implementation * Test Adding And Deleting Through Replace * Format * Fix Most Test Warnings * Format * Handle Constant Expression Warning * Revert AccountRevisionDate Changes * Revert RevisionData Changes More Exactly --- .../Repositories/DatabaseContextExtensions.cs | 8 ++++---- .../Queries/CollectionCipherReadByUserIdQuery.cs | 2 +- .../Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs | 4 ++-- .../Repositories/Queries/UserCipherDetailsQuery.cs | 2 +- .../Repositories/Queries/UserCollectionDetailsQuery.cs | 2 +- .../Queries/CipherReadCanEditByIdUserIdQuery.cs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs index fd7b682b08..6e954e030c 100644 --- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs +++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContextExtensions.cs @@ -68,8 +68,8 @@ public static class DatabaseContextExtensions from cg in cg_g.DefaultIfEmpty() where ou.OrganizationId == organizationId && ou.Status == OrganizationUserStatusType.Confirmed && - (cu.CollectionId != null || - cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || + (cg == null ? (Guid?)null : cg.CollectionId) != null) select u; var users = await query.ToListAsync(); @@ -99,8 +99,8 @@ public static class DatabaseContextExtensions from cg in cg_g.DefaultIfEmpty() where ou.OrganizationId == organizationId && collectionIds.Contains(c.Id) && ou.Status == OrganizationUserStatusType.Confirmed && - (cu.CollectionId != null || - cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || + (cg == null ? (Guid?)null : cg.CollectionId) != null) select u; var users = await query.ToListAsync(); diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs index 72db379ea1..fa35129052 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/CollectionCipherReadByUserIdQuery.cs @@ -43,7 +43,7 @@ public class CollectionCipherReadByUserIdQuery : IQuery from cg in cg_g.DefaultIfEmpty() where ou.Status == OrganizationUserStatusType.Confirmed && - (cu.CollectionId != null || cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null) select cc; return query; } diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs index ce018313d0..a23c140df5 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserBumpAccountRevisionDateByCipherIdQuery.cs @@ -46,8 +46,8 @@ public class UserBumpAccountRevisionDateByCipherIdQuery : IQuery where ou.OrganizationId == _organizationId && ou.Status == OrganizationUserStatusType.Confirmed && - (cu.CollectionId != null || - cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || + (cg == null ? (Guid?)null : cg.CollectionId) != null) select u; return query; } diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs index ec381ff820..fdfb9a1bc9 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCipherDetailsQuery.cs @@ -48,7 +48,7 @@ public class UserCipherDetailsQuery : IQuery new { cg.CollectionId, cg.GroupId } into cg_g from cg in cg_g.DefaultIfEmpty() - where cu.CollectionId != null || cg.CollectionId != null + where (cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null select c; diff --git a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs index 74e15f99b4..6e513e8098 100644 --- a/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs +++ b/src/Infrastructure.EntityFramework/Repositories/Queries/UserCollectionDetailsQuery.cs @@ -44,7 +44,7 @@ public class UserCollectionDetailsQuery : IQuery where ou.UserId == _userId && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled && - (cu.CollectionId != null || cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null) select new { c, ou, o, cu, gu, g, cg }; return query.Select(x => new CollectionDetails diff --git a/src/Infrastructure.EntityFramework/Vault/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs b/src/Infrastructure.EntityFramework/Vault/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs index 76133ed310..892299a850 100644 --- a/src/Infrastructure.EntityFramework/Vault/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs +++ b/src/Infrastructure.EntityFramework/Vault/Repositories/Queries/CipherReadCanEditByIdUserIdQuery.cs @@ -60,7 +60,7 @@ public class CipherReadCanEditByIdUserIdQuery : IQuery c.UserId == _userId || ( !c.UserId.HasValue && ou.Status == OrganizationUserStatusType.Confirmed && o.Enabled && - (cu.CollectionId != null || cg.CollectionId != null) + ((cu == null ? (Guid?)null : cu.CollectionId) != null || (cg == null ? (Guid?)null : cg.CollectionId) != null) ) ) && (c.UserId.HasValue || !cu.ReadOnly || !cg.ReadOnly)