From f2348d22646f32077662819b9938a469656765e3 Mon Sep 17 00:00:00 2001
From: hinton <hinton.oscar@gmail.com>
Date: Fri, 22 May 2020 22:16:01 +0200
Subject: [PATCH] Resolve review comments

---
 .../Request/SelectionReadOnlyRequestModel.cs   |  2 +-
 .../dbo/Functions/UserCollectionDetails.sql    | 18 ++----------------
 src/Sql/dbo/Tables/CollectionGroup.sql         |  2 +-
 src/Sql/dbo/Tables/CollectionUser.sql          |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/Core/Models/Api/Request/SelectionReadOnlyRequestModel.cs b/src/Core/Models/Api/Request/SelectionReadOnlyRequestModel.cs
index cb4f5619cd..36fc5edc0b 100644
--- a/src/Core/Models/Api/Request/SelectionReadOnlyRequestModel.cs
+++ b/src/Core/Models/Api/Request/SelectionReadOnlyRequestModel.cs
@@ -19,7 +19,7 @@ namespace Bit.Core.Models.Api
             {
                 Id = new Guid(Id),
                 ReadOnly = ReadOnly,
-                HidePasswords = HidePasswords
+                HidePasswords = HidePasswords,
             };
         }
     }
diff --git a/src/Sql/dbo/Functions/UserCollectionDetails.sql b/src/Sql/dbo/Functions/UserCollectionDetails.sql
index ceea95d3ef..453344fa34 100644
--- a/src/Sql/dbo/Functions/UserCollectionDetails.sql
+++ b/src/Sql/dbo/Functions/UserCollectionDetails.sql
@@ -3,22 +3,8 @@ RETURNS TABLE
 AS RETURN
 SELECT
     C.*,
-    CASE
-        WHEN
-            OU.[AccessAll] = 1
-            OR G.[AccessAll] = 1
-            OR CU.[ReadOnly] = 0
-            OR CG.[ReadOnly] = 0
-        THEN 0
-        ELSE 1
-    END [ReadOnly],
-    CASE
-        WHEN
-            CU.[HidePasswords] = 0
-            OR CG.[HidePasswords] = 0
-        THEN 0
-        ELSE 1
-    END [HidePasswords]
+    COALESCE(CU.[ReadOnly], CG.[ReadOnly], 0) AS [ReadOnly],
+    COALESCE(CU.[HidePasswords], CG.[HidePasswords], 0) AS [HidePasswords]
 FROM
     [dbo].[CollectionView] C
 INNER JOIN
diff --git a/src/Sql/dbo/Tables/CollectionGroup.sql b/src/Sql/dbo/Tables/CollectionGroup.sql
index 255a6a6ca4..2329349aa8 100644
--- a/src/Sql/dbo/Tables/CollectionGroup.sql
+++ b/src/Sql/dbo/Tables/CollectionGroup.sql
@@ -2,7 +2,7 @@
     [CollectionId]  UNIQUEIDENTIFIER NOT NULL,
     [GroupId]       UNIQUEIDENTIFIER NOT NULL,
     [ReadOnly]      BIT              NOT NULL,
-    [HidePasswords] BIT              NOT NULL DEFAULT 0,
+    [HidePasswords] BIT              NOT NULL,
     CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC),
     CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]),
     CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE
diff --git a/src/Sql/dbo/Tables/CollectionUser.sql b/src/Sql/dbo/Tables/CollectionUser.sql
index 976d27872b..333bf0f087 100644
--- a/src/Sql/dbo/Tables/CollectionUser.sql
+++ b/src/Sql/dbo/Tables/CollectionUser.sql
@@ -2,7 +2,7 @@
     [CollectionId]       UNIQUEIDENTIFIER NOT NULL,
     [OrganizationUserId] UNIQUEIDENTIFIER NOT NULL,
     [ReadOnly]           BIT              NOT NULL,
-    [HidePasswords]      BIT              NOT NULL DEFAULT 0,
+    [HidePasswords]      BIT              NOT NULL,
     CONSTRAINT [PK_CollectionUser] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [OrganizationUserId] ASC),
     CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE,
     CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id])