[AC-1682] Modified data migration script to contain multiple transactions

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

@@ -4,9 +4,9 @@ AS
 BEGIN
     SET NOCOUNT ON
 
+    -- Step 1: AccessAll migration for Groups
     BEGIN TRY
         BEGIN TRANSACTION;
-        -- Step 1: AccessAll migration for Groups
             -- Create a temporary table to store the groups with AccessAll = 1
             SELECT [Id] AS [GroupId], [OrganizationId]
             INTO #TempGroup
@@ -39,11 +39,48 @@ BEGIN
             FROM [dbo].[Group] G
             INNER JOIN #TempGroup TG ON G.[Id] = TG.[GroupId]
 
+            -- Create a temporary table to store distinct OrganizationUserIds
+            SELECT DISTINCT GU.[OrganizationUserId]
+            INTO #TempOrganizationUsers
+            FROM [dbo].[GroupUser] GU
+                JOIN #TempGroup TG ON GU.[GroupId] = TG.[GroupId];
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step1OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempOrganizationUsers
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step1OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step1OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step1OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
             -- Drop the temporary table
             DROP TABLE #TempGroup;
+            DROP TABLE #TempOrganizationUsers;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
 
-        -- Step 2: AccessAll migration for users
+    -- Step 2: AccessAll migration for users
-            -- Step 1: Create a temporary table to store the OrganizationUsers with AccessAll = 1
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Create a temporary table to store the OrganizationUsers with AccessAll = 1
             SELECT [Id] AS [OrganizationUserId], [OrganizationId]
             INTO #TempOrgUser
             FROM [dbo].[OrganizationUser]
@@ -82,46 +119,176 @@ BEGIN
             FROM [dbo].[OrganizationUser] OU
             INNER JOIN #TempOrgUser T ON OU.[Id] = T.[OrganizationUserId]
 
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step2OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT DISTINCT [OrganizationUserId]
+            FROM #TempOrgUser
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step2OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step2OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step2OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
             -- Drop the temporary table
             DROP TABLE #TempOrgUser;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
 
-        -- Step 3: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission
+    -- Step 3: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT ou.[Id] AS [OrganizationUserId]
+            INTO #TempStep3
+            FROM [dbo].[OrganizationUser] ou
+            WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
+                ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'));
+
+            -- Update [dbo].[CollectionUser] with [Manage] = 1 using the temporary table
             UPDATE cu
             SET cu.[ReadOnly] = 0,
                 cu.[HidePasswords] = 0,
                 cu.[Manage] = 1
             FROM [dbo].[CollectionUser] cu
-            INNER JOIN [dbo].[OrganizationUser] ou
+            INNER JOIN #TempStep3 temp ON cu.[OrganizationUserId] = temp.[OrganizationUserId];
-                ON cu.[OrganizationUserId] = ou.[Id]
-            WHERE ou.[OrganizationId] = @OrganizationId
-              AND (ou.[Type] = 3
-               OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
 
-        -- Step 4: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
-            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
+            DECLARE @Step3OrganizationUserId UNIQUEIDENTIFIER
-            SELECT cg.[CollectionId], ou.[Id], 0, 0, 1
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempStep3
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step3OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step3OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step3OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep3;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 4: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT cg.[CollectionId], ou.[Id] AS [OrganizationUserId]
+            INTO #TempStep4
             FROM [dbo].[CollectionGroup] cg
-            INNER JOIN [dbo].[GroupUser] gu
+                INNER JOIN [dbo].[GroupUser] gu ON cg.GroupId = gu.GroupId
-                ON cg.GroupId = gu.GroupId
+                INNER JOIN [dbo].[OrganizationUser] ou ON gu.OrganizationUserId = ou.[Id]
-            INNER JOIN [dbo].[OrganizationUser] ou
+            WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
-                ON gu.OrganizationUserId = ou.[Id]
+              AND NOT EXISTS (
-            WHERE ou.[OrganizationId] = @OrganizationId
+                SELECT 1 FROM [dbo].[CollectionUser] cu
-                AND (ou.[Type] = 3
+                WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
-                    OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
+                );
-                AND NOT EXISTS (
-                    SELECT 1 FROM [dbo].[CollectionUser] cu
-                    WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
-                )
 
-        -- Step 5: Set all Managers to Users
+            -- Insert rows into [dbo].[CollectionUser] using the temporary table
-            UPDATE [dbo].[OrganizationUser]
+            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
-            SET [Type] = 2  -- User
+            SELECT [CollectionId], [OrganizationUserId], 0, 0, 1
-            WHERE [OrganizationId] = @OrganizationId
+            FROM #TempStep4;
-              AND [Type] = 3; -- Manager
 
-        -- Step 6: Bump the account revision dates for all users in the organization
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
+            DECLARE @Step4OrganizationUserId UNIQUEIDENTIFIER
 
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT DISTINCT [OrganizationUserId]
+            FROM #TempStep4
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step4OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step4OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step4OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep4;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 5: Set all Managers to Users
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT [Id] AS [OrganizationUserId]
+            INTO #TempStep5
+            FROM [dbo].[OrganizationUser]
+            WHERE [Type] = 3; -- Manager
+
+            -- Update [dbo].[OrganizationUser] based on the temporary table
+            UPDATE ou
+            SET ou.[Type] = 2 -- User
+            FROM [dbo].[OrganizationUser] ou
+            INNER JOIN #TempStep5 temp ON ou.[Id] = temp.[OrganizationUserId];
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step5OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempStep5
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step5OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step5OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step5OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep5;
         COMMIT TRANSACTION;
     END TRY
     BEGIN CATCH

util/Migrator/DbScripts/2024-01-10_00_Organization_EnableCollectionEnhancements.sql

@@ -1,132 +0,0 @@
-CREATE OR ALTER PROCEDURE [dbo].[Organization_EnableCollectionEnhancements]
-    @OrganizationId UNIQUEIDENTIFIER
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    BEGIN TRY
-        BEGIN TRANSACTION;
-        -- Step 1: AccessAll migration for Groups
-            -- Create a temporary table to store the groups with AccessAll = 1
-            SELECT [Id] AS [GroupId], [OrganizationId]
-            INTO #TempGroup
-            FROM [dbo].[Group]
-            WHERE [AccessAll] = 1
-              AND [OrganizationId] = @OrganizationId;
-
-            -- Update existing rows in [dbo].[CollectionGroup]
-            UPDATE CG
-            SET
-                CG.[ReadOnly] = 0,
-                CG.[HidePasswords] = 0,
-                CG.[Manage] = 0
-            FROM [dbo].[CollectionGroup] CG
-            INNER JOIN [dbo].[Collection] C ON CG.[CollectionId] = C.[Id]
-            INNER JOIN #TempGroup TG ON CG.[GroupId] = TG.[GroupId]
-            WHERE C.[OrganizationId] = TG.[OrganizationId];
-
-            -- Insert new rows into [dbo].[CollectionGroup]
-            INSERT INTO [dbo].[CollectionGroup] ([CollectionId], [GroupId], [ReadOnly], [HidePasswords], [Manage])
-            SELECT C.[Id], TG.[GroupId], 0, 0, 0
-            FROM [dbo].[Collection] C
-            INNER JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId]
-            LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = TG.[GroupId]
-            WHERE CG.[CollectionId] IS NULL;
-
-            -- Update Group to clear AccessAll flag
-            UPDATE G
-            SET [AccessAll] = 0
-            FROM [dbo].[Group] G
-            INNER JOIN #TempGroup TG ON G.[Id] = TG.[GroupId]
-
-            -- Drop the temporary table
-            DROP TABLE #TempGroup;
-
-        -- Step 2: AccessAll migration for users
-            -- Step 1: Create a temporary table to store the OrganizationUsers with AccessAll = 1
-            SELECT [Id] AS [OrganizationUserId], [OrganizationId]
-            INTO #TempOrgUser
-            FROM [dbo].[OrganizationUser]
-            WHERE [AccessAll] = 1
-              AND [OrganizationId] = @OrganizationId;
-
-            -- Update existing rows in [dbo].[CollectionUser]
-            UPDATE target
-            SET
-                target.[ReadOnly] = 0,
-                target.[HidePasswords] = 0,
-                target.[Manage] = 0
-                FROM [dbo].[CollectionUser] AS target
-                INNER JOIN (
-                    SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
-                    FROM [dbo].[Collection] C
-                    INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId]
-                ) AS source
-            ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId];
-
-            -- Insert new rows into [dbo].[CollectionUser]
-            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
-            SELECT source.[CollectionId], source.[OrganizationUserId], 0, 0, 0
-            FROM (
-                     SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
-                     FROM [dbo].[Collection] C
-                         INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId]
-                 ) AS source
-            LEFT JOIN [dbo].[CollectionUser] AS target
-                ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId]
-            WHERE target.[CollectionId] IS NULL;
-
-            -- Update OrganizationUser to clear AccessAll flag
-            UPDATE OU
-            SET [AccessAll] = 0
-            FROM [dbo].[OrganizationUser] OU
-            INNER JOIN #TempOrgUser T ON OU.[Id] = T.[OrganizationUserId]
-
-            -- Drop the temporary table
-            DROP TABLE #TempOrgUser;
-
-        -- Step 3: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission
-            UPDATE cu
-            SET cu.[ReadOnly] = 0,
-                cu.[HidePasswords] = 0,
-                cu.[Manage] = 1
-            FROM [dbo].[CollectionUser] cu
-            INNER JOIN [dbo].[OrganizationUser] ou
-                ON cu.[OrganizationUserId] = ou.[Id]
-            WHERE ou.[OrganizationId] = @OrganizationId
-              AND (ou.[Type] = 3
-               OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
-
-        -- Step 4: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access
-            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
-            SELECT cg.[CollectionId], ou.[Id], 0, 0, 1
-            FROM [dbo].[CollectionGroup] cg
-            INNER JOIN [dbo].[GroupUser] gu
-                ON cg.GroupId = gu.GroupId
-            INNER JOIN [dbo].[OrganizationUser] ou
-                ON gu.OrganizationUserId = ou.[Id]
-            WHERE ou.[OrganizationId] = @OrganizationId
-                AND (ou.[Type] = 3
-                    OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
-                AND NOT EXISTS (
-                    SELECT 1 FROM [dbo].[CollectionUser] cu
-                    WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
-                )
-
-        -- Step 5: Set all Managers to Users
-            UPDATE [dbo].[OrganizationUser]
-            SET [Type] = 2  -- User
-            WHERE [OrganizationId] = @OrganizationId
-              AND [Type] = 3; -- Manager
-
-        -- Step 6: Bump the account revision dates for all users in the organization
-        EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationId] @OrganizationId
-
-        COMMIT TRANSACTION;
-    END TRY
-    BEGIN CATCH
-        ROLLBACK TRANSACTION;
-        THROW;
-    END CATCH;
-END
-GO

util/Migrator/DbScripts/2024-01-11_00_Organization_EnableCollectionEnhancements.sql

@@ -0,0 +1,299 @@
+CREATE OR ALTER PROCEDURE [dbo].[Organization_EnableCollectionEnhancements]
+    @OrganizationId UNIQUEIDENTIFIER
+AS
+BEGIN
+    SET NOCOUNT ON
+
+    -- Step 1: AccessAll migration for Groups
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Create a temporary table to store the groups with AccessAll = 1
+            SELECT [Id] AS [GroupId], [OrganizationId]
+            INTO #TempGroup
+            FROM [dbo].[Group]
+            WHERE [AccessAll] = 1
+              AND [OrganizationId] = @OrganizationId;
+
+            -- Update existing rows in [dbo].[CollectionGroup]
+            UPDATE CG
+            SET
+                CG.[ReadOnly] = 0,
+                CG.[HidePasswords] = 0,
+                CG.[Manage] = 0
+            FROM [dbo].[CollectionGroup] CG
+            INNER JOIN [dbo].[Collection] C ON CG.[CollectionId] = C.[Id]
+            INNER JOIN #TempGroup TG ON CG.[GroupId] = TG.[GroupId]
+            WHERE C.[OrganizationId] = TG.[OrganizationId];
+
+            -- Insert new rows into [dbo].[CollectionGroup]
+            INSERT INTO [dbo].[CollectionGroup] ([CollectionId], [GroupId], [ReadOnly], [HidePasswords], [Manage])
+            SELECT C.[Id], TG.[GroupId], 0, 0, 0
+            FROM [dbo].[Collection] C
+            INNER JOIN #TempGroup TG ON C.[OrganizationId] = TG.[OrganizationId]
+            LEFT JOIN [dbo].[CollectionGroup] CG ON CG.[CollectionId] = C.[Id] AND CG.[GroupId] = TG.[GroupId]
+            WHERE CG.[CollectionId] IS NULL;
+
+            -- Update Group to clear AccessAll flag
+            UPDATE G
+            SET [AccessAll] = 0
+            FROM [dbo].[Group] G
+            INNER JOIN #TempGroup TG ON G.[Id] = TG.[GroupId]
+
+            -- Create a temporary table to store distinct OrganizationUserIds
+            SELECT DISTINCT GU.[OrganizationUserId]
+            INTO #TempOrganizationUsers
+            FROM [dbo].[GroupUser] GU
+                JOIN #TempGroup TG ON GU.[GroupId] = TG.[GroupId];
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step1OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempOrganizationUsers
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step1OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step1OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step1OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempGroup;
+            DROP TABLE #TempOrganizationUsers;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 2: AccessAll migration for users
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Create a temporary table to store the OrganizationUsers with AccessAll = 1
+            SELECT [Id] AS [OrganizationUserId], [OrganizationId]
+            INTO #TempOrgUser
+            FROM [dbo].[OrganizationUser]
+            WHERE [AccessAll] = 1
+              AND [OrganizationId] = @OrganizationId;
+
+            -- Update existing rows in [dbo].[CollectionUser]
+            UPDATE target
+            SET
+                target.[ReadOnly] = 0,
+                target.[HidePasswords] = 0,
+                target.[Manage] = 0
+                FROM [dbo].[CollectionUser] AS target
+                INNER JOIN (
+                    SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
+                    FROM [dbo].[Collection] C
+                    INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId]
+                ) AS source
+            ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId];
+
+            -- Insert new rows into [dbo].[CollectionUser]
+            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
+            SELECT source.[CollectionId], source.[OrganizationUserId], 0, 0, 0
+            FROM (
+                     SELECT C.[Id] AS [CollectionId], T.[OrganizationUserId]
+                     FROM [dbo].[Collection] C
+                         INNER JOIN #TempOrgUser T ON C.[OrganizationId] = T.[OrganizationId]
+                 ) AS source
+            LEFT JOIN [dbo].[CollectionUser] AS target
+                ON target.[CollectionId] = source.[CollectionId] AND target.[OrganizationUserId] = source.[OrganizationUserId]
+            WHERE target.[CollectionId] IS NULL;
+
+            -- Update OrganizationUser to clear AccessAll flag
+            UPDATE OU
+            SET [AccessAll] = 0
+            FROM [dbo].[OrganizationUser] OU
+            INNER JOIN #TempOrgUser T ON OU.[Id] = T.[OrganizationUserId]
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step2OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT DISTINCT [OrganizationUserId]
+            FROM #TempOrgUser
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step2OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step2OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step2OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempOrgUser;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 3: Update [dbo].[CollectionUser] with [Manage] = 1 for all users with Manager role or 'EditAssignedCollections' permission
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT ou.[Id] AS [OrganizationUserId]
+            INTO #TempStep3
+            FROM [dbo].[OrganizationUser] ou
+            WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND
+                ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'));
+
+            -- Update [dbo].[CollectionUser] with [Manage] = 1 using the temporary table
+            UPDATE cu
+            SET cu.[ReadOnly] = 0,
+                cu.[HidePasswords] = 0,
+                cu.[Manage] = 1
+            FROM [dbo].[CollectionUser] cu
+            INNER JOIN #TempStep3 temp ON cu.[OrganizationUserId] = temp.[OrganizationUserId];
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step3OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempStep3
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step3OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step3OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step3OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep3;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 4: Insert rows to [dbo].[CollectionUser] for Managers and users with 'EditAssignedCollections' permission assigned to groups with collection access
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT cg.[CollectionId], ou.[Id] AS [OrganizationUserId]
+            INTO #TempStep4
+            FROM [dbo].[CollectionGroup] cg
+                INNER JOIN [dbo].[GroupUser] gu ON cg.GroupId = gu.GroupId
+                INNER JOIN [dbo].[OrganizationUser] ou ON gu.OrganizationUserId = ou.[Id]
+            WHERE (ou.[Type] = 3 OR (ou.[Permissions] IS NOT NULL AND ISJSON(ou.[Permissions]) > 0 AND JSON_VALUE(ou.[Permissions], '$.editAssignedCollections') = 'true'))
+              AND NOT EXISTS (
+                SELECT 1 FROM [dbo].[CollectionUser] cu
+                WHERE cu.[CollectionId] = cg.[CollectionId] AND cu.[OrganizationUserId] = ou.[Id]
+                );
+
+            -- Insert rows into [dbo].[CollectionUser] using the temporary table
+            INSERT INTO [dbo].[CollectionUser] ([CollectionId], [OrganizationUserId], [ReadOnly], [HidePasswords], [Manage])
+            SELECT [CollectionId], [OrganizationUserId], 0, 0, 1
+            FROM #TempStep4;
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step4OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT DISTINCT [OrganizationUserId]
+            FROM #TempStep4
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step4OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step4OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step4OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep4;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+
+    -- Step 5: Set all Managers to Users
+    BEGIN TRY
+        BEGIN TRANSACTION;
+            -- Store the results in a temporary table
+            SELECT [Id] AS [OrganizationUserId]
+            INTO #TempStep5
+            FROM [dbo].[OrganizationUser]
+            WHERE [Type] = 3; -- Manager
+
+            -- Update [dbo].[OrganizationUser] based on the temporary table
+            UPDATE ou
+            SET ou.[Type] = 2 -- User
+            FROM [dbo].[OrganizationUser] ou
+            INNER JOIN #TempStep5 temp ON ou.[Id] = temp.[OrganizationUserId];
+
+            -- Execute User_BumpAccountRevisionDateByOrganizationUserId for each unique OrganizationUserId
+            DECLARE @Step5OrganizationUserId UNIQUEIDENTIFIER
+
+            DECLARE UniqueOrgUserIdCursor CURSOR FOR
+            SELECT [OrganizationUserId]
+            FROM #TempStep5
+
+            OPEN UniqueOrgUserIdCursor
+            FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step5OrganizationUserId
+
+            WHILE (@@FETCH_STATUS = 0)
+            BEGIN
+                -- Execute the stored procedure for the current OrganizationUserId
+                EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserId] @Step5OrganizationUserId
+
+                -- Fetch the next row
+                FETCH NEXT FROM UniqueOrgUserIdCursor INTO @Step5OrganizationUserId
+            END
+
+            CLOSE UniqueOrgUserIdCursor
+            DEALLOCATE UniqueOrgUserIdCursor;
+
+            -- Drop the temporary table
+            DROP TABLE #TempStep5;
+        COMMIT TRANSACTION;
+    END TRY
+    BEGIN CATCH
+        ROLLBACK TRANSACTION;
+        THROW;
+    END CATCH;
+END
+GO