[PM-10365] Drop OrganizationUser AccessAll (#4701)

* Remove OrganizationUser.AccessAll * Final database migrations
2025-06-30 23:52:50 -05:00 · 2024-09-24 16:26:35 +10:00
parent 02fee8c1e9
commit f7bc5dfb2e
23 changed files with 8918 additions and 127 deletions
--- a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@ -105,10 +105,7 @@ public class DatabaseContext : DbContext
        var eOrganizationDomain = builder.Entity<OrganizationDomain>();
        var aWebAuthnCredential = builder.Entity<WebAuthnCredential>();

-        // Shadow property configurations
-        builder.Entity<OrganizationUser>()
-            .Property<bool>("AccessAll")
-            .HasDefaultValue(false);
+        // Shadow property configurations go here

        eCipher.Property(c => c.Id).ValueGeneratedNever();
        eCollection.Property(c => c.Id).ValueGeneratedNever();
--- a/Procedures/OrganizationUser_Create.sql
+++ b/Procedures/OrganizationUser_Create.sql
@ -6,7 +6,6 @@
    @Key VARCHAR(MAX),
    @Status SMALLINT,
    @Type TINYINT,
-    @AccessAll BIT = 0,
    @ExternalId NVARCHAR(300),
    @CreationDate DATETIME2(7),
    @RevisionDate DATETIME2(7),
@ -26,7 +25,6 @@ BEGIN
        [Key],
        [Status],
        [Type],
-        [AccessAll],
        [ExternalId],
        [CreationDate],
        [RevisionDate],
@ -43,7 +41,6 @@ BEGIN
        @Key,
        @Status,
        @Type,
-        @AccessAll,
        @ExternalId,
        @CreationDate,
        @RevisionDate,
--- a/Procedures/OrganizationUser_CreateMany.sql
+++ b/Procedures/OrganizationUser_CreateMany.sql
@ -13,7 +13,6 @@ BEGIN
        [Key],
        [Status],
        [Type],
-        [AccessAll],
        [ExternalId],
        [CreationDate],
        [RevisionDate],
@ -29,7 +28,6 @@ BEGIN
        OUI.[Key],
        OUI.[Status],
        OUI.[Type],
-        0,  -- AccessAll will be removed shortly
        OUI.[ExternalId],
        OUI.[CreationDate],
        OUI.[RevisionDate],
--- a/Procedures/OrganizationUser_CreateMany2.sql
+++ b/Procedures/OrganizationUser_CreateMany2.sql
@ -1,42 +0,0 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_CreateMany2]
-    @OrganizationUsersInput [dbo].[OrganizationUserType2] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    INSERT INTO [dbo].[OrganizationUser]
-        (
-        [Id],
-        [OrganizationId],
-        [UserId],
-        [Email],
-        [Key],
-        [Status],
-        [Type],
-        [AccessAll],
-        [ExternalId],
-        [CreationDate],
-        [RevisionDate],
-        [Permissions],
-        [ResetPasswordKey],
-        [AccessSecretsManager]
-        )
-    SELECT
-        OU.[Id],
-        OU.[OrganizationId],
-        OU.[UserId],
-        OU.[Email],
-        OU.[Key],
-        OU.[Status],
-        OU.[Type],
-        OU.[AccessAll],
-        OU.[ExternalId],
-        OU.[CreationDate],
-        OU.[RevisionDate],
-        OU.[Permissions],
-        OU.[ResetPasswordKey],
-        OU.[AccessSecretsManager]
-    FROM
-        @OrganizationUsersInput OU
-END
-GO
--- a/Procedures/OrganizationUser_CreateWithCollections.sql
+++ b/Procedures/OrganizationUser_CreateWithCollections.sql
@ -6,7 +6,6 @@ CREATE PROCEDURE [dbo].[OrganizationUser_CreateWithCollections]
    @Key VARCHAR(MAX),
    @Status SMALLINT,
    @Type TINYINT,
-    @AccessAll BIT = 0,
    @ExternalId NVARCHAR(300),
    @CreationDate DATETIME2(7),
    @RevisionDate DATETIME2(7),
@ -18,7 +17,7 @@ AS
 BEGIN
    SET NOCOUNT ON

-    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+    EXEC [dbo].[OrganizationUser_Create] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager

    ;WITH [AvailableCollectionsCTE] AS(
        SELECT
--- a/Procedures/OrganizationUser_Update.sql
+++ b/Procedures/OrganizationUser_Update.sql
@ -6,7 +6,6 @@
    @Key VARCHAR(MAX),
    @Status SMALLINT,
    @Type TINYINT,
-    @AccessAll BIT = 0,
    @ExternalId NVARCHAR(300),
    @CreationDate DATETIME2(7),
    @RevisionDate DATETIME2(7),
@ -26,7 +25,6 @@ BEGIN
        [Key] = @Key,
        [Status] = @Status,
        [Type] = @Type,
-        [AccessAll] = @AccessAll,
        [ExternalId] = @ExternalId,
        [CreationDate] = @CreationDate,
        [RevisionDate] = @RevisionDate,
--- a/Procedures/OrganizationUser_UpdateMany.sql
+++ b/Procedures/OrganizationUser_UpdateMany.sql
@ -63,7 +63,6 @@ BEGIN
        [Key] = OUI.[Key],
        [Status] = OUI.[Status],
        [Type] = OUI.[Type],
-        [AccessAll] = 0, -- AccessAll will be removed shortly
        [ExternalId] = OUI.[ExternalId],
        [CreationDate] = OUI.[CreationDate],
        [RevisionDate] = OUI.[RevisionDate],
--- a/Procedures/OrganizationUser_UpdateMany2.sql
+++ b/Procedures/OrganizationUser_UpdateMany2.sql
@ -1,34 +0,0 @@
-CREATE PROCEDURE [dbo].[OrganizationUser_UpdateMany2]
-    @OrganizationUsersInput [dbo].[OrganizationUserType2] READONLY
-AS
-BEGIN
-    SET NOCOUNT ON
-
-    UPDATE
-        OU
-    SET
-        [OrganizationId] = OUI.[OrganizationId],
-        [UserId] = OUI.[UserId],
-        [Email] = OUI.[Email],
-        [Key] = OUI.[Key],
-        [Status] = OUI.[Status],
-        [Type] = OUI.[Type],
-        [AccessAll] = OUI.[AccessAll],
-        [ExternalId] = OUI.[ExternalId],
-        [CreationDate] = OUI.[CreationDate],
-        [RevisionDate] = OUI.[RevisionDate],
-        [Permissions] = OUI.[Permissions],
-        [ResetPasswordKey] = OUI.[ResetPasswordKey],
-        [AccessSecretsManager] = OUI.[AccessSecretsManager]
-    FROM
-        [dbo].[OrganizationUser] OU
-    INNER JOIN
-        @OrganizationUsersInput OUI ON OU.Id = OUI.Id
-
-    EXEC [dbo].[User_BumpManyAccountRevisionDates]
-    (
-        SELECT UserId
-        FROM @OrganizationUsersInput
-    )
-END
-GO
--- a/Procedures/OrganizationUser_UpdateWithCollections.sql
+++ b/Procedures/OrganizationUser_UpdateWithCollections.sql
@ -6,7 +6,6 @@
    @Key VARCHAR(MAX),
    @Status SMALLINT,
    @Type TINYINT,
-    @AccessAll BIT = 0,
    @ExternalId NVARCHAR(300),
    @CreationDate DATETIME2(7),
    @RevisionDate DATETIME2(7),
@ -18,7 +17,7 @@ AS
 BEGIN
    SET NOCOUNT ON

-    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @AccessAll, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
+    EXEC [dbo].[OrganizationUser_Update] @Id, @OrganizationId, @UserId, @Email, @Key, @Status, @Type, @ExternalId, @CreationDate, @RevisionDate, @Permissions, @ResetPasswordKey, @AccessSecretsManager
    -- Update
    UPDATE
        [Target]
--- a/src/Sql/dbo/Tables/OrganizationUser.sql
+++ b/src/Sql/dbo/Tables/OrganizationUser.sql
@ -7,7 +7,6 @@
    [ResetPasswordKey]              VARCHAR (MAX)       NULL,
    [Status]                        SMALLINT            NOT NULL,
    [Type]                          TINYINT             NOT NULL,
-    [AccessAll]                     BIT                 NOT NULL,
    [ExternalId]                    NVARCHAR (300)      NULL,
    [CreationDate]                  DATETIME2 (7)       NOT NULL,
    [RevisionDate]                  DATETIME2 (7)       NOT NULL,
@ -20,9 +19,8 @@


 GO
-CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatus]
-    ON [dbo].[OrganizationUser]([UserId] ASC, [OrganizationId] ASC, [Status] ASC)
-    INCLUDE ([AccessAll]);
+CREATE NONCLUSTERED INDEX [IX_OrganizationUser_UserIdOrganizationIdStatusV2]
+    ON [dbo].[OrganizationUser]([UserId] ASC, [OrganizationId] ASC, [Status] ASC);


 GO
--- a/Types/OrganizationUserType2.sql
+++ b/Types/OrganizationUserType2.sql
@ -1,16 +0,0 @@
-CREATE TYPE [dbo].[OrganizationUserType2] AS TABLE(
-    [Id] UNIQUEIDENTIFIER,
-    [OrganizationId] UNIQUEIDENTIFIER,
-    [UserId] UNIQUEIDENTIFIER,
-    [Email] NVARCHAR(256),
-    [Key] VARCHAR(MAX),
-    [Status] SMALLINT,
-    [Type] TINYINT,
-    [AccessAll] BIT,
-    [ExternalId] NVARCHAR(300),
-    [CreationDate] DATETIME2(7),
-    [RevisionDate] DATETIME2(7),
-    [Permissions] NVARCHAR(MAX),
-    [ResetPasswordKey] VARCHAR(MAX),
-    [AccessSecretsManager] BIT
-)