Refactor OrganizationUserRepository and update stored procedures

- Renamed stored procedure from OrganizationUser_UpdateManyConfirmByIds to OrganizationUser_UpdateManySetStatusKey to better reflect its functionality.
- Updated OrganizationUserRepository to use the new stored procedure for confirming user statuses.
- Introduced a new stored procedure OrganizationUser_ReadByOrganizationIdStatus to replace the previous OrganizationUser_ReadManyByOrganizationIdStatus, enhancing clarity and consistency in naming.
- Adjusted related SQL migration scripts to align with the new procedure names and parameters.

Author: JaredScar

src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs

@@ -721,15 +721,17 @@ public async Task<ICollection<Guid>> ConfirmManyOrganizationUsersAsync(
         await using var connection = new SqlConnection(ConnectionString);
 
         var confirmedIds = await connection.QueryAsync<Guid>(
-            $"[{Schema}].[OrganizationUser_UpdateManyConfirmByIds]",
+            $"[{Schema}].[OrganizationUser_UpdateManySetStatusKey]",
             new
             {
-                UsersToConfirmJson = JsonSerializer.Serialize(usersToConfirm.Select(u => new
+                UsersJson = JsonSerializer.Serialize(usersToConfirm.Select(u => new
                 {
                     Id = u.OrganizationUserId,
                     u.UserId,
                     u.Key,
                 })),
+                NewStatus = (short)OrganizationUserStatusType.Confirmed,
+                RequiredCurrentStatus = (short)OrganizationUserStatusType.Accepted,
                 RevisionDate = DateTime.UtcNow
             },
             commandType: CommandType.StoredProcedure);
@@ -771,7 +773,7 @@ public async Task<ICollection<OrganizationUser>> GetManyByOrganizationIdWithStat
         using (var connection = new SqlConnection(ConnectionString))
         {
             var results = await connection.QueryAsync<OrganizationUser>(
-                "[dbo].[OrganizationUser_ReadManyByOrganizationIdStatus]",
+                "[dbo].[OrganizationUser_ReadByOrganizationIdStatus]",
                 new { OrganizationId = organizationId, Status = (short)status },
                 commandType: CommandType.StoredProcedure);
 

…nUser_ReadManyByOrganizationIdStatus.sql …ationUser_ReadByOrganizationIdStatus.sqlsrc/Sql/dbo/Stored Procedures/OrganizationUser_ReadManyByOrganizationIdStatus.sql renamed to src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByOrganizationIdStatus.sql src/Sql/dbo/Stored Procedures/OrganizationUser_ReadManyByOrganizationIdStatus.sql renamed to src/Sql/dbo/Stored Procedures/OrganizationUser_ReadByOrganizationIdStatus.sql

@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_ReadManyByOrganizationIdStatus]
+CREATE PROCEDURE [dbo].[OrganizationUser_ReadByOrganizationIdStatus]
     @OrganizationId UNIQUEIDENTIFIER,
     @Status         TINYINT
 AS

…anizationUser_UpdateManyConfirmByIds.sql …anizationUser_UpdateManySetStatusKey.sqlsrc/Sql/dbo/Stored Procedures/OrganizationUser_UpdateManyConfirmByIds.sql renamed to src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateManySetStatusKey.sql src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateManyConfirmByIds.sql renamed to src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateManySetStatusKey.sql

@@ -1,46 +1,48 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_UpdateManyConfirmByIds]
-    @UsersToConfirmJson NVARCHAR(MAX),
-    @RevisionDate       DATETIME2(7)
+CREATE PROCEDURE [dbo].[OrganizationUser_UpdateManySetStatusKey]
+    @UsersJson             NVARCHAR(MAX),
+    @NewStatus             TINYINT,
+    @RequiredCurrentStatus TINYINT,
+    @RevisionDate          DATETIME2(7)
 AS
 BEGIN
     SET NOCOUNT ON
 
-    DECLARE @UsersToConfirm AS TABLE (
+    DECLARE @UsersToUpdate AS TABLE (
         [Id]     UNIQUEIDENTIFIER NOT NULL,
         [UserId] UNIQUEIDENTIFIER NOT NULL,
         [Key]    NVARCHAR(MAX)    NULL
     )
 
-    INSERT INTO @UsersToConfirm
+    INSERT INTO @UsersToUpdate
     SELECT
         [Id],
         [UserId],
         [Key]
-    FROM OPENJSON(@UsersToConfirmJson)
+    FROM OPENJSON(@UsersJson)
     WITH (
         [Id]     UNIQUEIDENTIFIER '$.Id',
         [UserId] UNIQUEIDENTIFIER '$.UserId',
         [Key]    NVARCHAR(MAX)    '$.Key'
     )
 
-    DECLARE @ConfirmedIds [dbo].[GuidIdArray]
+    DECLARE @UpdatedIds [dbo].[GuidIdArray]
 
     UPDATE OU
     SET
-        OU.[Status]       = 2, -- Confirmed
-        OU.[Key]          = UTC.[Key],
+        OU.[Status]       = @NewStatus,
+        OU.[Key]          = U.[Key],
         OU.[RevisionDate] = @RevisionDate
     OUTPUT
-        INSERTED.[Id] INTO @ConfirmedIds
+        INSERTED.[Id] INTO @UpdatedIds
     FROM
         [dbo].[OrganizationUser] OU
     INNER JOIN
-        @UsersToConfirm UTC ON UTC.[Id] = OU.[Id]
+        @UsersToUpdate U ON U.[Id] = OU.[Id]
     WHERE
-        OU.[Status] = 1 -- Only update rows that are still Accepted
+        OU.[Status] = @RequiredCurrentStatus
 
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserIds] @ConfirmedIds
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserIds] @UpdatedIds
 
     -- Return the IDs that were actually updated so the caller can track idempotency
-    SELECT [Id] FROM @ConfirmedIds
+    SELECT [Id] FROM @UpdatedIds
 END

util/Migrator/DbScripts/2026-04-23_00_UpdateOrganizationUser_ReadByOrganizationId_AddStatusParam.sql

@@ -1,4 +1,4 @@
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_ReadManyByOrganizationIdStatus]
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_ReadByOrganizationIdStatus]
     @OrganizationId UNIQUEIDENTIFIER,
     @Status         TINYINT
 AS

util/Migrator/DbScripts/2026-04-24_00_AddOrganizationUserConfirmByIds.sql

@@ -1,47 +1,49 @@
-CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_UpdateManyConfirmByIds]
-    @UsersToConfirmJson NVARCHAR(MAX),
-    @RevisionDate       DATETIME2(7)
+CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_UpdateManySetStatusKey]
+    @UsersJson             NVARCHAR(MAX),
+    @NewStatus             TINYINT,
+    @RequiredCurrentStatus TINYINT,
+    @RevisionDate          DATETIME2(7)
 AS
 BEGIN
     SET NOCOUNT ON
 
-    DECLARE @UsersToConfirm AS TABLE (
+    DECLARE @UsersToUpdate AS TABLE (
         [Id]     UNIQUEIDENTIFIER NOT NULL,
         [UserId] UNIQUEIDENTIFIER NOT NULL,
         [Key]    NVARCHAR(MAX)    NULL
     )
 
-    INSERT INTO @UsersToConfirm
+    INSERT INTO @UsersToUpdate
     SELECT
         [Id],
         [UserId],
         [Key]
-    FROM OPENJSON(@UsersToConfirmJson)
+    FROM OPENJSON(@UsersJson)
     WITH (
         [Id]     UNIQUEIDENTIFIER '$.Id',
         [UserId] UNIQUEIDENTIFIER '$.UserId',
         [Key]    NVARCHAR(MAX)    '$.Key'
     )
 
-    DECLARE @ConfirmedIds [dbo].[GuidIdArray]
+    DECLARE @UpdatedIds [dbo].[GuidIdArray]
 
     UPDATE OU
     SET
-        OU.[Status]       = 2, -- Confirmed
-        OU.[Key]          = UTC.[Key],
+        OU.[Status]       = @NewStatus,
+        OU.[Key]          = U.[Key],
         OU.[RevisionDate] = @RevisionDate
     OUTPUT
-        INSERTED.[Id] INTO @ConfirmedIds
+        INSERTED.[Id] INTO @UpdatedIds
     FROM
         [dbo].[OrganizationUser] OU
     INNER JOIN
-        @UsersToConfirm UTC ON UTC.[Id] = OU.[Id]
+        @UsersToUpdate U ON U.[Id] = OU.[Id]
     WHERE
-        OU.[Status] = 1 -- Only update rows that are still Accepted
+        OU.[Status] = @RequiredCurrentStatus
 
-    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserIds] @ConfirmedIds
+    EXEC [dbo].[User_BumpAccountRevisionDateByOrganizationUserIds] @UpdatedIds
 
     -- Return the IDs that were actually updated so the caller can track idempotency
-    SELECT [Id] FROM @ConfirmedIds
+    SELECT [Id] FROM @UpdatedIds
 END
 GO