api adjustments for manager role and collections

src/Sql/Sql.sqlproj

@@ -153,7 +153,6 @@
     <Build Include="dbo\Stored Procedures\Device_ReadByUserId.sql" />
     <Build Include="dbo\Stored Procedures\Device_Update.sql" />
     <Build Include="dbo\Stored Procedures\User_Create.sql" />
-    <Build Include="dbo\Stored Procedures\Collection_CreateWithGroups.sql" />
     <Build Include="dbo\Stored Procedures\User_DeleteById.sql" />
     <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsById.sql" />
     <Build Include="dbo\Stored Procedures\User_ReadByEmail.sql" />
@@ -233,5 +232,10 @@
     <Build Include="dbo\Stored Procedures\User_ReadKdfByEmail.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_DeleteByOrganizationId.sql" />
     <Build Include="dbo\Stored Procedures\AzureSQLMaintenance.sql" />
+    <Build Include="dbo\Functions\UserCollectionDetails.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_ReadWithGroupsByIdUserId.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_CreateWithGroups.sql" />
+    <Build Include="dbo\Stored Procedures\Collection_UpdateUsers.sql" />
   </ItemGroup>
 </Project>

src/Sql/dbo/Functions/UserCollectionDetails.sql

@@ -0,0 +1,38 @@
+CREATE FUNCTION [dbo].[UserCollectionDetails](@UserId UNIQUEIDENTIFIER)
+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]
+FROM
+    [dbo].[CollectionView] C
+INNER JOIN
+    [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
+INNER JOIN
+    [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
+LEFT JOIN
+    [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
+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.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
+WHERE
+    OU.[UserId] = @UserId
+    AND OU.[Status] = 2 -- 2 = Confirmed
+    AND O.[Enabled] = 1
+    AND (
+        OU.[AccessAll] = 1
+        OR CU.[CollectionId] IS NOT NULL
+        OR G.[AccessAll] = 1
+        OR CG.[CollectionId] IS NOT NULL
+    )

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

@@ -0,0 +1,15 @@
+CREATE PROCEDURE [dbo].[Collection_ReadByIdUserId]
+    @Id UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+    SELECT TOP 1
+        *
+    FROM
+        [dbo].[UserCollectionDetails](@UserId)
+    WHERE
+        [Id] = @Id
+    ORDER BY
+        [ReadOnly] ASC
+END

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

@@ -5,38 +5,7 @@ BEGIN
     SET NOCOUNT ON
 
     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]
+        *
     FROM
-        [dbo].[CollectionView] C
-    INNER JOIN
-        [dbo].[OrganizationUser] OU ON C.[OrganizationId] = OU.[OrganizationId]
-    INNER JOIN
-        [dbo].[Organization] O ON O.[Id] = C.[OrganizationId]
-    LEFT JOIN
-        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[CollectionId] = C.[Id] AND CU.[OrganizationUserId] = [OU].[Id]
-    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.[CollectionId] = C.[Id] AND CG.[GroupId] = GU.[GroupId]
-    WHERE
-        OU.[UserId] = @UserId
-        AND OU.[Status] = 2 -- 2 = Confirmed
-        AND O.[Enabled] = 1
-        AND (
-            OU.[AccessAll] = 1
-            OR CU.[CollectionId] IS NOT NULL
-            OR G.[AccessAll] = 1
-            OR CG.[CollectionId] IS NOT NULL
-        )
+        [dbo].[UserCollectionDetails](@UserId)
 END

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

@@ -0,0 +1,17 @@
+CREATE PROCEDURE [dbo].[Collection_ReadWithGroupsByIdUserId]
+    @Id UNIQUEIDENTIFIER,
+    @UserId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    EXEC [dbo].[Collection_ReadByIdUserId] @Id, @UserId
+
+    SELECT
+        [GroupId] [Id],
+        [ReadOnly]
+    FROM
+        [dbo].[CollectionGroup]
+    WHERE
+        [CollectionId] = @Id
+END

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

@@ -0,0 +1,41 @@
+CREATE PROCEDURE [dbo].[Collection_UpdateUsers]
+    @Id UNIQUEIDENTIFIER,
+    @Users AS [dbo].[SelectionReadOnlyArray] READONLY
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    DECLARE @OrganizationId UNIQUEIDENTIFIER = (SELECT [OrganizationId] FROM [dbo].[Collection] WHERE [Id] = @Id)
+
+    ;WITH [AvailableUsersCTE] AS(
+        SELECT
+            Id
+        FROM
+            [dbo].[OrganizationUser]
+        WHERE
+            OrganizationId = @OrganizationId
+    )
+    MERGE
+        [dbo].[CollectionUser] AS [Target]
+    USING 
+        @Users AS [Source]
+    ON
+        [Target].[CollectionId] = @Id
+        AND [Target].[OrganizationUserId] = [Source].[Id]
+    WHEN NOT MATCHED BY TARGET
+    AND [Source].[Id] IN (SELECT [Id] FROM [AvailableUsersCTE]) THEN
+        INSERT VALUES
+        (
+            @Id,
+            [Source].[Id],
+            [Source].[ReadOnly]
+        )
+    WHEN MATCHED AND [Target].[ReadOnly] != [Source].[ReadOnly] THEN
+        UPDATE SET [Target].[ReadOnly] = [Source].[ReadOnly]
+    WHEN NOT MATCHED BY SOURCE
+    AND [Target].[CollectionId] = @Id THEN
+        DELETE
+    ;
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
+END