sproc updates for user account revision bumps

src/Sql/Sql.sqlproj

@@ -214,5 +214,7 @@
     <Build Include="dbo\Stored Procedures\User_ReadByPremium.sql" />
     <Build Include="dbo\Stored Procedures\CipherDetails_ReadById.sql" />
     <Build Include="dbo\Stored Procedures\Cipher_DeleteByUserId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCollectionId.sql" />
+    <Build Include="dbo\Stored Procedures\User_BumpAccountRevisionDateByCipherId.sql" />
   </ItemGroup>
 </Project>

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

@@ -47,7 +47,7 @@ BEGIN
 
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -52,7 +52,7 @@ BEGIN
 
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -42,7 +42,7 @@ BEGIN
 
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -28,7 +28,7 @@ BEGIN
     IF @OrganizationId IS NOT NULL
     BEGIN
         EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -30,7 +30,7 @@ BEGIN
         BEGIN
             EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
         END
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -34,5 +34,4 @@ BEGIN
         [Id] IN (SELECT * FROM [IdsToMoveCTE])
 
     EXEC [dbo].[User_BumpAccountRevisionDate] @UserId
-    -- TODO: What if some that were updated were organization ciphers? Then bump by org ids.
 END

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

@@ -30,7 +30,7 @@ BEGIN
 
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -27,7 +27,7 @@ BEGIN
     IF @OrganizationId IS NOT NULL
     BEGIN
         EXEC [dbo].[Organization_UpdateStorage] @OrganizationId
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
     END
     ELSE IF @UserId IS NOT NULL
     BEGIN

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

@@ -84,7 +84,7 @@ BEGIN
         EXEC [dbo].[User_UpdateStorage] @UserId
     END
 
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+    EXEC [dbo].[User_BumpAccountRevisionDateByCipherId] @Id, @OrganizationId
 
     SELECT 0 -- 0 = Success
 END

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

@@ -19,6 +19,6 @@ BEGIN
     DECLARE @OrganizationId UNIQUEIDENTIFIER = (SELECT TOP 1 [OrganizationId] FROM [dbo].[Cipher] WHERE [Id] = @CipherId)
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId
     END
 END

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

@@ -15,6 +15,6 @@ BEGIN
     DECLARE @OrganizationId UNIQUEIDENTIFIER = (SELECT TOP 1 [OrganizationId] FROM [dbo].[Cipher] WHERE [Id] = @CipherId)
     IF @OrganizationId IS NOT NULL
     BEGIN
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+        EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @CollectionId, @OrganizationId
     END
 END

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

@@ -24,4 +24,6 @@ BEGIN
         @CreationDate,
         @RevisionDate
     )
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
 END

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

@@ -33,4 +33,6 @@ BEGIN
         @Groups
     WHERE
         [Id] IN (SELECT [Id] FROM [AvailableGroupsCTE])
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
 END

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

@@ -4,6 +4,12 @@ AS
 BEGIN
     SET NOCOUNT ON
 
+    DECLARE @OrganizationId UNIQUEIDENTIFIER = (SELECT TOP 1 [OrganizationId] FROM [dbo].[Collection] WHERE [Id] = @Id)
+    IF @OrganizationId IS NOT NULL
+    BEGIN
+        EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
+    END
+
     DELETE
     FROM
         [dbo].[CollectionGroup]

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

@@ -17,4 +17,6 @@ BEGIN
         [RevisionDate] = @RevisionDate
     WHERE
         [Id] = @Id
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
 END

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

@@ -41,5 +41,5 @@ BEGIN
         DELETE
     ;
 
-    -- TODO: Update user revision date times that this affects
+    EXEC [dbo].[User_BumpAccountRevisionDateByCollectionId] @Id, @OrganizationId
 END

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

@@ -42,5 +42,5 @@ BEGIN
         DELETE
     ;
 
-    -- TODO: Bump account revision date for all @OrganizationUserIds
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrgId
 END

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

@@ -35,4 +35,6 @@ BEGIN
         @Collections
     WHERE
         [Id] IN (SELECT [Id] FROM [AvailableCollectionsCTE])
+
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
 END

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

@@ -4,6 +4,12 @@ AS
 BEGIN
     SET NOCOUNT ON
 
+    DECLARE @OrganizationId UNIQUEIDENTIFIER = (SELECT TOP 1 [OrganizationId] FROM [dbo].[Group] WHERE [Id] = @Id)
+    IF @OrganizationId IS NOT NULL
+    BEGIN
+        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+    END
+
     DELETE
     FROM
         [dbo].[Group]

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

@@ -43,5 +43,5 @@ BEGIN
         DELETE
     ;
 
-    -- TODO: Update user revision date times that this affects
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
 END

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

@@ -3,6 +3,8 @@
 AS
 BEGIN
     SET NOCOUNT ON
+    
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Id
 
     DELETE
     FROM

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

@@ -0,0 +1,39 @@
+CREATE PROCEDURE [dbo].[User_BumpAccountRevisionDateByCipherId]
+    @CipherId UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        U
+    SET
+        U.[AccountRevisionDate] = GETUTCDATE()
+    FROM
+        [dbo].[User] U
+    LEFT JOIN
+        [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
+    LEFT JOIN
+        [dbo].[CollectionCipher] CC ON CC.[CipherId] = @CipherId
+    LEFT JOIN
+        [dbo].[CollectionUser] CU ON OU.[AccessAll] = 0 AND CU.[OrganizationUserId] = OU.[Id] AND CU.[CollectionId] = CC.[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] = CC.[CollectionId]
+    WHERE
+        OU.[Status] = 2 -- 2 = Confirmed
+        AND (
+            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/User_BumpAccountRevisionDateByCollectionId.sql

@@ -0,0 +1,37 @@
+CREATE PROCEDURE [dbo].[User_BumpAccountRevisionDateByCollectionId]
+    @CollectionId UNIQUEIDENTIFIER,
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    UPDATE
+        U
+    SET
+        U.[AccountRevisionDate] = GETUTCDATE()
+    FROM
+        [dbo].[User] U
+    LEFT JOIN
+        [dbo].[OrganizationUser] OU ON OU.[UserId] = U.[Id]
+    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
+        OU.[Status] = 2 -- 2 = Confirmed
+        AND (
+            CU.[CollectionId] IS NOT NULL
+            OR CG.[CollectionId] IS NOT NULL
+            OR (
+                OU.[OrganizationId] = @OrganizationId
+                AND (
+                    OU.[AccessAll] = 1
+                    OR G.[AccessAll] = 1
+                )
+            )
+        )
+END

util/Setup/Setup.csproj

@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="DbScripts\2017-11-24_00_UpdateProcs.sql" />
     <EmbeddedResource Include="DbScripts\2017-11-13_00_IndexTuning.sql" />
     <EmbeddedResource Include="DbScripts\2017-11-06_00_FamilyPlanAdjustments.sql" />
     <EmbeddedResource Include="DbScripts\2017-10-25_00_OrgUserUpdates.sql" />