Reworks the reordering groups sproc to include a RenumberSelfAssessmentStructure sub sproc

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Migrations/202508181154_CreateOrAlterMoveCompetenciesAndGroups.cs

@@ -13,6 +13,7 @@ public override void Down()
         {
             Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_MoveCompetencyGroupInSelfAssessment]");
             Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_MoveCompetencyInSelfAssessment]");
+            Execute.Sql("DROP PROCEDURE IF EXISTS [dbo].[usp_RenumberSelfAssessmentStructure]");
         }
     }
 }

DigitalLearningSolutions.Data.Migrations/Scripts/TD-483-uspMoveCompetencyGroupInSelfAssessmentCreateOrAlter_UP.sql

@@ -1,69 +1,114 @@
-CREATE OR ALTER PROCEDURE usp_MoveCompetencyGroupInSelfAssessment
-    @SelfAssessmentID INT,
-    @GroupID INT,
-    @Direction NVARCHAR(10)
+
+
+CREATE PROCEDURE usp_RenumberSelfAssessmentStructure
+    @SelfAssessmentID INT
 AS
 BEGIN
     SET NOCOUNT ON;
 
-    DECLARE @CurrentMinOrder INT, @CurrentMaxOrder INT;
+    /*
+        Step 1: Build an ordered list of groups
+        - Each group is ranked by its current Min(Ordering)
+        - Ungrouped competencies (NULL CompetencyGroupID) are treated as their own "pseudo group"
+    */
+    ;WITH GroupRanks AS (
+        SELECT 
+            CompetencyGroupID,
+            ROW_NUMBER() OVER (ORDER BY MIN(Ordering)) AS GroupRank
+        FROM SelfAssessmentStructure
+        WHERE SelfAssessmentID = @SelfAssessmentID
+        GROUP BY CompetencyGroupID
+    )
+    /*
+        Step 2: Renumber groups and competencies
+        - Groups get ranked (1,2,3…)
+        - Within each group, competencies are ordered by their current Ordering and renumbered (1,2,3…)
+    */
+    UPDATE sas
+    SET sas.Ordering = rn.NewOrdering
+    FROM SelfAssessmentStructure sas
+    INNER JOIN (
+        SELECT 
+            s.ID,
+            -- new group position * 1000 + row within group
+            -- gives room between groups and avoids clashes
+            (g.GroupRank * 1000) + 
+            ROW_NUMBER() OVER (PARTITION BY s.CompetencyGroupID, g.GroupRank ORDER BY s.Ordering, s.ID) AS NewOrdering
+        FROM SelfAssessmentStructure s
+        INNER JOIN GroupRanks g 
+            ON g.CompetencyGroupID = s.CompetencyGroupID
+        WHERE s.SelfAssessmentID = @SelfAssessmentID
+    ) rn ON sas.ID = rn.ID;
 
-    -- Get current group's ordering range
-    SELECT 
-        @CurrentMinOrder = MIN(Ordering),
-        @CurrentMaxOrder = MAX(Ordering)
-    FROM SelfAssessmentStructure
-    WHERE SelfAssessmentID = @SelfAssessmentID
-      AND CompetencyGroupID = @GroupID;
+END
 
-    IF @CurrentMinOrder IS NULL RETURN;
+GO
 
-    -- Find the adjacent group
-    DECLARE @OtherGroupID INT, @OtherMinOrder INT, @OtherMaxOrder INT;
+CREATE OR ALTER PROCEDURE usp_MoveCompetencyGroupInSelfAssessment
+    @SelfAssessmentID INT,
+    @GroupID INT,
+    @Direction NVARCHAR(10)
+AS
+BEGIN
+    SET NOCOUNT ON;
 
-    ;WITH GroupOrders AS (
-        SELECT CompetencyGroupID,
-               MIN(Ordering) AS MinOrder,
-               MAX(Ordering) AS MaxOrder
+    -- Build current group ranks
+    ;WITH GroupRanks AS (
+        SELECT 
+            CompetencyGroupID,
+            ROW_NUMBER() OVER (ORDER BY MIN(Ordering)) AS GroupRank
         FROM SelfAssessmentStructure
         WHERE SelfAssessmentID = @SelfAssessmentID
-          AND CompetencyGroupID IS NOT NULL
         GROUP BY CompetencyGroupID
     )
-    SELECT TOP 1
-        @OtherGroupID = CompetencyGroupID,
-        @OtherMinOrder = MinOrder,
-        @OtherMaxOrder = MaxOrder
-    FROM GroupOrders
-    WHERE CompetencyGroupID <> @GroupID
-      AND (
-            (@Direction = 'up'   AND MinOrder < @CurrentMinOrder) OR
-            (@Direction = 'down' AND MinOrder > @CurrentMinOrder)
-          )
-    ORDER BY 
-        CASE WHEN @Direction = 'up'   THEN MinOrder END DESC,
-        CASE WHEN @Direction = 'down' THEN MinOrder END ASC;
+    SELECT * INTO #GroupRanks FROM GroupRanks;
+
+    DECLARE @CurrentRank INT;
+    SELECT @CurrentRank = GroupRank FROM #GroupRanks WHERE CompetencyGroupID = @GroupID;
+
+    IF @CurrentRank IS NULL
+    BEGIN
+        DROP TABLE #GroupRanks;
+        RETURN; -- group not found
+    END
+
+    DECLARE @SwapGroupID INT, @SwapRank INT;
 
-    IF @OtherGroupID IS NULL RETURN; -- already at top/bottom
+    IF @Direction = 'up'
+    BEGIN
+        SELECT TOP 1 @SwapGroupID = CompetencyGroupID, @SwapRank = GroupRank
+        FROM #GroupRanks
+        WHERE GroupRank < @CurrentRank
+        ORDER BY GroupRank DESC;
+    END
+    ELSE IF @Direction = 'down'
+    BEGIN
+        SELECT TOP 1 @SwapGroupID = CompetencyGroupID, @SwapRank = GroupRank
+        FROM #GroupRanks
+        WHERE GroupRank > @CurrentRank
+        ORDER BY GroupRank ASC;
+    END
 
-    -- Now swap by shifting order values
-    DECLARE @TempOffset INT = 10000;
+    IF @SwapGroupID IS NULL
+    BEGIN
+        DROP TABLE #GroupRanks;
+        RETURN; -- already at top/bottom
+    END
 
-    -- Move current group temporarily out of the way
-    UPDATE SelfAssessmentStructure
-    SET Ordering = Ordering + @TempOffset
-    WHERE SelfAssessmentID = @SelfAssessmentID
-      AND CompetencyGroupID = @GroupID;
+    /*
+        Step 1: Temporarily bump the current group's Ordering so it sorts last
+        (this avoids collisions before renumbering).
+    */
+    UPDATE sas
+    SET Ordering = Ordering + 100000
+    FROM SelfAssessmentStructure sas
+    WHERE SelfAssessmentID = @SelfAssessmentID AND CompetencyGroupID = @GroupID;
 
-    -- Move other group into current group's slot
-    UPDATE SelfAssessmentStructure
-    SET Ordering = Ordering - (@OtherMinOrder - @CurrentMinOrder)
-    WHERE SelfAssessmentID = @SelfAssessmentID
-      AND CompetencyGroupID = @OtherGroupID;
+    /*
+        Step 2: Call the renumbering procedure to rebuild a clean sequence.
+    */
+    EXEC usp_RenumberSelfAssessmentStructure @SelfAssessmentID;
 
-    -- Move current group (now offset) into other group's slot
-    UPDATE SelfAssessmentStructure
-    SET Ordering = Ordering - @TempOffset + (@OtherMinOrder - @CurrentMinOrder)
-    WHERE SelfAssessmentID = @SelfAssessmentID
-      AND CompetencyGroupID = @GroupID;
+    DROP TABLE #GroupRanks;
 END
+GO