collection user refactor

src/Sql/Sql.sqlproj

@@ -82,8 +82,6 @@
     <Build Include="dbo\Tables\OrganizationUser.sql" />
     <Build Include="dbo\Views\GrantView.sql" />
     <Build Include="dbo\Views\UserView.sql" />
-    <Build Include="dbo\Views\CollectionUserUserDetailsView.sql" />
-    <Build Include="dbo\Views\CollectionUserView.sql" />
     <Build Include="dbo\Views\CollectionView.sql" />
     <Build Include="dbo\Views\CipherView.sql" />
     <Build Include="dbo\Views\DeviceView.sql" />
@@ -127,16 +125,11 @@
     <Build Include="dbo\Stored Procedures\CollectionCipher_ReadByUserIdCipherId.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollections.sql" />
     <Build Include="dbo\Stored Procedures\CollectionCipher_UpdateCollectionsAdmin.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_Create.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_DeleteById.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_Create.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_ReadByOrganizationUserId.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_DeleteById.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_ReadById.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUser_Update.sql" />
     <Build Include="dbo\Stored Procedures\Collection_ReadByUserId.sql" />
-    <Build Include="dbo\Stored Procedures\CollectionUserUserDetails_ReadByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUserDetails_ReadByCollectionId.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_Update.sql" />
     <Build Include="dbo\Stored Procedures\Device_Create.sql" />
     <Build Include="dbo\Stored Procedures\Device_DeleteById.sql" />
@@ -188,11 +181,13 @@
     <Build Include="dbo\Stored Procedures\Collection_UpdateWithGroups.sql" />
     <Build Include="dbo\Stored Procedures\Collection_CreateWithGroups.sql" />
     <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsById.sql" />
-    <Build Include="dbo\Views\GroupUserUserDetailsView.sql" />
-    <Build Include="dbo\Stored Procedures\GroupUserUserDetails_ReadByGroupId.sql" />
+    <Build Include="dbo\Stored Procedures\GroupUserDetails_ReadByGroupId.sql" />
     <Build Include="dbo\Stored Procedures\GroupUser_ReadGroupIdsByOrganizationUserId.sql" />
     <Build Include="dbo\Stored Procedures\GroupUser_UpdateGroups.sql" />
     <Build Include="dbo\Stored Procedures\GroupUser_Delete.sql" />
     <Build Include="dbo\User Defined Types\SelectionReadOnlyArray.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_CreateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\OrganizationUser_UpdateWithCollections.sql" />
+    <Build Include="dbo\Stored Procedures\CollectionUser_Delete.sql" />
   </ItemGroup>
 </Project>

src/Sql/dbo/Stored Procedures/CollectionUserDetails_ReadByCollectionId.sql

@@ -0,0 +1,44 @@
+CREATE PROCEDURE [dbo].[CollectionUserDetails_ReadByCollectionId]
+    @CollectionId UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        OU.[Id] AS [OrganizationUserId],
+        CASE
+            WHEN OU.[AccessAll] = 1 OR G.[AccessAll] = 1 THEN 1
+            ELSE 0
+        END [AccessAll],
+        U.[Name],
+        ISNULL(U.[Email], OU.[Email]) Email,
+        OU.[Status],
+        OU.[Type],
+        CASE
+            WHEN OU.[AccessAll] = 1 OR CU.[ReadOnly] = 0 OR G.[AccessAll] = 1 OR CG.[ReadOnly] = 0 THEN 0
+            ELSE 1
+        END [ReadOnly]
+    FROM
+        [dbo].[OrganizationUser] OU
+    LEFT JOIN
+        [dbo].[User] U ON U.[Id] = OU.[UserId]
+    LEFT JOIN
+        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = @CollectionId
+    LEFT JOIN
+        [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
+    LEFT JOIN
+        [dbo].[Group] G ON G.[Id] = GU.[GroupId]
+    LEFT JOIN
+        [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId] AND CG.[CollectionId] = @CollectionId
+    WHERE
+        CU.[CollectionId] IS NOT NULL
+        OR CG.[CollectionId] IS NOT NULL
+        OR (
+            OU.[OrganizationId] = @OrganizationId
+            AND (
+                OU.[AccessAll] = 1
+                OR G.[AccessAll] = 1
+            )
+        )
+END

src/Sql/dbo/Stored Procedures/CollectionUserUserDetails_ReadByCollectionId.sql

@@ -1,19 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUserUserDetails_ReadByCollectionId]
-    @CollectionId UNIQUEIDENTIFIER,
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[CollectionUserUserDetailsView]
-    WHERE
-        [CollectionId] = @CollectionId
-        OR
-        (
-            [OrganizationId] = @OrganizationId
-            AND [AccessAll] = 1
-        )
-END

src/Sql/dbo/Stored Procedures/CollectionUser_Create.sql

@@ -1,35 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUser_Create]
-    @Id UNIQUEIDENTIFIER,
-    @CollectionId UNIQUEIDENTIFIER,
-    @OrganizationUserId UNIQUEIDENTIFIER,
-    @ReadOnly BIT,
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[CollectionUser]
-    (
-        [Id],
-        [CollectionId],
-        [OrganizationUserId],
-        [ReadOnly],
-        [CreationDate],
-        [RevisionDate]
-    )
-    VALUES
-    (
-        @Id,
-        @CollectionId,
-        @OrganizationUserId,
-        @ReadOnly,
-        @CreationDate,
-        @RevisionDate
-    )
-
-    IF @OrganizationUserId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
-    END
-END

src/Sql/dbo/Stored Procedures/CollectionUser_Delete.sql

@@ -0,0 +1,16 @@
+CREATE PROCEDURE [dbo].[CollectionUser_Delete]
+    @CollectionId UNIQUEIDENTIFIER,
+    @OrganizationUserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DELETE
+    FROM
+        [dbo].[CollectionUser]
+    WHERE
+        [CollectionId] = @CollectionId
+        AND [OrganizationUserId] = @OrganizationUserId
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
+END

src/Sql/dbo/Stored Procedures/CollectionUser_DeleteById.sql

@@ -1,19 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUser_DeleteById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    DECLARE @OrganizationUserId UNIQUEIDENTIFIER = (SELECT TOP 1 [OrganizationUserId] FROM [dbo].[CollectionUser] WHERE [Id] = @Id)
-
-    DELETE
-    FROM
-        [dbo].[CollectionUser]
-    WHERE
-        [Id] = @Id
-
-    IF @OrganizationUserId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
-    END
-END

src/Sql/dbo/Stored Procedures/CollectionUser_ReadById.sql

@@ -1,13 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUser_ReadById]
-    @Id UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[CollectionUserView]
-    WHERE
-        [Id] = @Id
-END

src/Sql/dbo/Stored Procedures/CollectionUser_ReadByOrganizationUserId.sql

@@ -1,13 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUser_ReadByOrganizationUserId]
-    @OrganizationUserId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[CollectionUserView]
-    WHERE
-        [OrganizationUserId] = @OrganizationUserId
-END

src/Sql/dbo/Stored Procedures/CollectionUser_Update.sql

@@ -1,27 +0,0 @@
-CREATE PROCEDURE [dbo].[CollectionUser_Update]
-    @Id UNIQUEIDENTIFIER,
-    @CollectionId UNIQUEIDENTIFIER,
-    @OrganizationUserId UNIQUEIDENTIFIER,
-    @ReadOnly BIT,
-    @CreationDate DATETIME2(7),
-    @RevisionDate DATETIME2(7)
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        [dbo].[CollectionUser]
-    SET
-        [CollectionId] = @CollectionId,
-        [OrganizationUserId] = @OrganizationUserId,
-        [ReadOnly] = @ReadOnly,
-        [CreationDate] = @CreationDate,
-        [RevisionDate] = @RevisionDate
-    WHERE
-        [Id] = @Id
-
-    IF @OrganizationUserId IS NOT NULL
-    BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @OrganizationUserId
-    END
-END

src/Sql/dbo/Stored Procedures/Collection_ReadByUserId.sql

@@ -22,7 +22,7 @@ BEGIN
         OU.[UserId] = @UserId
         AND (
             OU.[AccessAll] = 1
-            OR CU.[Id] IS NOT NULL
+            OR CU.[CollectionId] IS NOT NULL
             OR G.[AccessAll] = 1
             OR CG.[CollectionId] IS NOT NULL
         )

src/Sql/dbo/Stored Procedures/GroupUserDetails_ReadByGroupId.sql

@@ -0,0 +1,22 @@
+CREATE PROCEDURE [dbo].[GroupUserDetails_ReadByGroupId]
+    @GroupId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    SELECT
+        OU.[Id] AS [OrganizationUserId],
+        OU.[AccessAll],
+        U.[Name],
+        ISNULL(U.[Email], OU.[Email]) Email,
+        OU.[Status],
+        OU.[Type]
+    FROM
+        [dbo].[OrganizationUser] OU
+    INNER JOIN
+        [dbo].[GroupUser] GU ON GU.[OrganizationUserId] = OU.[Id]
+    INNER JOIN
+        [dbo].[User] U ON U.[Id] = OU.[UserId]
+    WHERE
+        GU.[GroupId] = @GroupId
+END

src/Sql/dbo/Stored Procedures/GroupUserUserDetails_ReadByGroupId.sql

@@ -1,13 +0,0 @@
-CREATE PROCEDURE [dbo].[GroupUserUserDetails_ReadByGroupId]
-    @GroupId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    SELECT
-        *
-    FROM
-        [dbo].[GroupUserUserDetailsView]
-    WHERE
-        [GroupId] = @GroupId
-END

src/Sql/dbo/Stored Procedures/OrganizationUser_CreateWithCollections.sql

@@ -0,0 +1,41 @@
+CREATE PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(50),
+    @Key VARCHAR(MAX),
+    @Status TINYINT,
+    @Type TINYINT,
+    @AccessAll BIT,
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            [Id]
+        FROM
+            [dbo].[Collection]
+        WHERE
+            [OrganizationId] = @OrganizationId
+    )
+    INSERT INTO [dbo].[CollectionUser]
+    (
+        [CollectionId],
+        [OrganizationUserId],
+        [ReadOnly]
+    )
+    SELECT
+        [Id],
+        @Id,
+        [ReadOnly]
+    FROM
+        @Collections
+    WHERE
+        [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
+END

src/Sql/dbo/Stored Procedures/OrganizationUser_Update.sql

@@ -27,4 +27,6 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
+
+    EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
 END

src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql

@@ -0,0 +1,48 @@
+CREATE PROCEDURE [dbo].[OrganizationUser_UpdateWithCollections]
+    @Id UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER,
+    @Email NVARCHAR(50),
+    @Key VARCHAR(MAX),
+    @Status TINYINT,
+    @Type TINYINT,
+    @AccessAll BIT,
+    @CreationDate DATETIME2(7),
+    @RevisionDate DATETIME2(7),
+    @Collections AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @CreationDate, @RevisionDate
+
+    ;WITH [AvailableCollectionsCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[Collection]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionUser] AS [Target]
+    USING 
+        @Collections AS [Source]
+    ON
+        [Target].[CollectionId] = [Source].[Id]
+        AND [Target].[OrganizationUserId] = @Id
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE]) THEN
+        INSERT VALUES
+        (
+            [Source].[Id],
+            @Id,
+            [Source].[ReadOnly]
+        )
+    WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[OrganizationUserId] = @Id THEN
+        DELETE
+    ;
+END

src/Sql/dbo/Tables/CollectionUser.sql

@@ -1,17 +1,9 @@
 CREATE TABLE [dbo].[CollectionUser] (
-    [Id]                 UNIQUEIDENTIFIER NOT NULL,
     [CollectionId]       UNIQUEIDENTIFIER NOT NULL,
     [OrganizationUserId] UNIQUEIDENTIFIER NOT NULL,
-    [ReadOnly]           BIT              NOT NULL,
-    [CreationDate]       DATETIME2 (7)    NOT NULL,
-    [RevisionDate]       DATETIME2 (7)    NOT NULL,
-    CONSTRAINT [PK_CollectionUser] PRIMARY KEY CLUSTERED ([Id] ASC),
+    [ReadOnly]           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])
 );
 
-
-GO
-CREATE NONCLUSTERED INDEX [IX_CollectionUser_CollectionId]
-    ON [dbo].[CollectionUser]([CollectionId] ASC);
-

src/Sql/dbo/Views/CollectionUserUserDetailsView.sql

@@ -1,28 +0,0 @@
-CREATE VIEW [dbo].[CollectionUserUserDetailsView]
-AS
-SELECT
-    OU.[Id] AS [OrganizationUserId],
-    OU.[OrganizationId],
-    OU.[AccessAll],
-    CU.[Id],
-    CU.[CollectionId],
-    U.[Name],
-    ISNULL(U.[Email], OU.[Email]) Email,
-    OU.[Status],
-    OU.[Type],
-    CASE
-        WHEN OU.[AccessAll] = 0 AND CU.[ReadOnly] = 1 AND G.[AccessAll] = 0 AND CG.[ReadOnly] = 1 THEN 1
-        ELSE 0
-    END [ReadOnly]
-FROM
-    [dbo].[OrganizationUser] OU
-LEFT JOIN
-    [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[User] U ON U.[Id] = OU.[UserId]
-LEFT JOIN
-    [dbo].[GroupUser] GU ON CU.[CollectionId] IS NULL AND OU.[AccessAll] = 0 AND GU.[OrganizationUserId] = OU.[Id]
-LEFT JOIN
-    [dbo].[Group] G ON G.[Id] = GU.[GroupId]
-LEFT JOIN
-    [dbo].[CollectionGroup] CG ON G.[AccessAll] = 0 AND CG.[GroupId] = GU.[GroupId]

src/Sql/dbo/Views/CollectionUserView.sql

@@ -1,6 +0,0 @@
-CREATE VIEW [dbo].[CollectionUserView]
-AS
-SELECT
-    *
-FROM
-    [dbo].[CollectionUser]

src/Sql/dbo/Views/GroupUserUserDetailsView.sql

@@ -1,17 +0,0 @@
-CREATE VIEW [dbo].[GroupUserUserDetailsView]
-AS
-SELECT
-    OU.[Id] AS [OrganizationUserId],
-    OU.[OrganizationId],
-    OU.[AccessAll],
-    GU.[GroupId],
-    U.[Name],
-    ISNULL(U.[Email], OU.[Email]) Email,
-    OU.[Status],
-    OU.[Type]
-FROM
-    [dbo].[OrganizationUser] OU
-INNER JOIN
-    [dbo].[GroupUser] GU ON GU.[OrganizationUserId] = OU.[Id]
-INNER JOIN
-    [dbo].[User] U ON U.[Id] = OU.[UserId]