[AC-1646] Rename LimitCollectionCdOwnerAdmin column

src/Api/Models/Request/Organizations/OrganizationCollectionManagementUpdateRequestModel.cs

@@ -8,7 +8,7 @@ public class OrganizationCollectionManagementUpdateRequestModel
 
     public virtual Organization ToOrganization(Organization existingOrganization)
     {
-        existingOrganization.LimitCollectionCdOwnerAdmin = LimitCreateDeleteOwnerAdmin;
+        existingOrganization.LimitCollectionCreationDeletion = LimitCreateDeleteOwnerAdmin;
         return existingOrganization;
     }
 }

src/Api/Models/Response/Organizations/OrganizationResponseModel.cs

@@ -58,7 +58,7 @@ public OrganizationResponseModel(Organization organization, string obj = "organi
         SmServiceAccounts = organization.SmServiceAccounts;
         MaxAutoscaleSmSeats = organization.MaxAutoscaleSmSeats;
         MaxAutoscaleSmServiceAccounts = organization.MaxAutoscaleSmServiceAccounts;
-        LimitCollectionCdOwnerAdmin = organization.LimitCollectionCdOwnerAdmin;
+        LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
     }
 
     public Guid Id { get; set; }
@@ -98,7 +98,7 @@ public OrganizationResponseModel(Organization organization, string obj = "organi
     public int? SmServiceAccounts { get; set; }
     public int? MaxAutoscaleSmSeats { get; set; }
     public int? MaxAutoscaleSmServiceAccounts { get; set; }
-    public bool LimitCollectionCdOwnerAdmin { get; set; }
+    public bool LimitCollectionCreationDeletion { get; set; }
 }
 
 public class OrganizationSubscriptionResponseModel : OrganizationResponseModel

src/Api/Models/Response/ProfileOrganizationResponseModel.cs

@@ -60,7 +60,7 @@ public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails orga
         FamilySponsorshipToDelete = organization.FamilySponsorshipToDelete;
         FamilySponsorshipValidUntil = organization.FamilySponsorshipValidUntil;
         AccessSecretsManager = organization.AccessSecretsManager;
-        LimitCollectionCdOwnerAdmin = organization.LimitCollectionCdOwnerAdmin;
+        LimitCollectionCreationDeletion = organization.LimitCollectionCreationDeletion;
 
         if (organization.SsoConfig != null)
         {
@@ -114,5 +114,5 @@ public ProfileOrganizationResponseModel(OrganizationUserOrganizationDetails orga
     public DateTime? FamilySponsorshipValidUntil { get; set; }
     public bool? FamilySponsorshipToDelete { get; set; }
     public bool AccessSecretsManager { get; set; }
-    public bool LimitCollectionCdOwnerAdmin { get; set; }
+    public bool LimitCollectionCreationDeletion { get; set; }
 }

src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs

@@ -71,7 +71,7 @@ private async Task CanCreateAsync(AuthorizationHandlerContext context, Collectio
         CurrentContextOrganization org)
     {
         // If false, all organization members are allowed to create collections
-        if (!org.LimitCollectionCdOwnerAdmin)
+        if (!org.LimitCollectionCreationDeletion)
         {
             context.Succeed(requirement);
             return;
@@ -104,7 +104,7 @@ await _currentContext.ProviderUserForOrgAsync(org.Id))
         }
 
         // The limit collection management setting is enabled and we are not an Admin (above condition), fail
-        if (org.LimitCollectionCdOwnerAdmin)
+        if (org.LimitCollectionCreationDeletion)
         {
             context.Fail();
             return;

src/Core/Context/CurrentContext.cs

@@ -356,7 +356,7 @@ public async Task<bool> ViewAssignedCollections(Guid orgId)
         var org = GetOrganization(orgId);
         if (org != null)
         {
-            canCreateNewCollections = !org.LimitCollectionCdOwnerAdmin || org.Permissions.CreateNewCollections;
+            canCreateNewCollections = !org.LimitCollectionCreationDeletion || org.Permissions.CreateNewCollections;
         }
         return await EditAssignedCollections(orgId)
                || await DeleteAssignedCollections(orgId)

src/Core/Context/CurrentContextOrganization.cs

@@ -15,12 +15,12 @@ public CurrentContextOrganization(OrganizationUserOrganizationDetails orgUser)
         Type = orgUser.Type;
         Permissions = CoreHelpers.LoadClassFromJsonData<Permissions>(orgUser.Permissions);
         AccessSecretsManager = orgUser.AccessSecretsManager && orgUser.UseSecretsManager;
-        LimitCollectionCdOwnerAdmin = orgUser.LimitCollectionCdOwnerAdmin;
+        LimitCollectionCreationDeletion = orgUser.LimitCollectionCreationDeletion;
     }
 
     public Guid Id { get; set; }
     public OrganizationUserType Type { get; set; }
     public Permissions Permissions { get; set; } = new();
     public bool AccessSecretsManager { get; set; }
-    public bool LimitCollectionCdOwnerAdmin { get; set; }
+    public bool LimitCollectionCreationDeletion { get; set; }
 }

src/Core/Entities/Organization.cs

@@ -81,7 +81,7 @@ public class Organization : ITableObject<Guid>, ISubscriber, IStorable, IStorabl
     /// <summary>
     /// Refers to the ability for an organization to limit collection creation and deletion to owners and admins only
     /// </summary>
-    public bool LimitCollectionCdOwnerAdmin { get; set; }
+    public bool LimitCollectionCreationDeletion { get; set; }
 
     public void SetNewId()
     {

src/Core/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs

@@ -48,5 +48,5 @@ public class OrganizationUserOrganizationDetails
     public bool UsePasswordManager { get; set; }
     public int? SmSeats { get; set; }
     public int? SmServiceAccounts { get; set; }
-    public bool LimitCollectionCdOwnerAdmin { get; set; }
+    public bool LimitCollectionCreationDeletion { get; set; }
 }

src/Core/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -142,7 +142,7 @@ public Organization ToOrganization()
             RevisionDate = RevisionDate,
             MaxAutoscaleSeats = MaxAutoscaleSeats,
             OwnersNotifiedOfAutoscaling = OwnersNotifiedOfAutoscaling,
-            LimitCollectionCdOwnerAdmin = LimitCollectionCdOwnerAdmin,
+            LimitCollectionCreationDeletion = LimitCollectionCreationDeletion,
         };
     }
 }

src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs

@@ -107,7 +107,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         eGroup.Property(c => c.Id).ValueGeneratedNever();
         eInstallation.Property(c => c.Id).ValueGeneratedNever();
         eOrganization.Property(c => c.Id).ValueGeneratedNever();
-        eOrganization.Property(c => c.LimitCollectionCdOwnerAdmin)
+        eOrganization.Property(c => c.LimitCollectionCreationDeletion)
             .ValueGeneratedNever()
             .HasDefaultValue(true);
         eOrganizationSponsorship.Property(c => c.Id).ValueGeneratedNever();

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

@@ -51,7 +51,7 @@
     @MaxAutoscaleSmSeats INT= null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-    @LimitCollectionCdOwnerAdmin BIT = 0
+    @LimitCollectionCreationDeletion BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -110,7 +110,7 @@ BEGIN
         [MaxAutoscaleSmSeats],
         [MaxAutoscaleSmServiceAccounts],
         [SecretsManagerBeta],
-        [LimitCollectionCdOwnerAdmin]
+        [LimitCollectionCreationDeletion]
     )
     VALUES
     (
@@ -166,6 +166,6 @@ BEGIN
         @MaxAutoscaleSmSeats,
         @MaxAutoscaleSmServiceAccounts,
         @SecretsManagerBeta,
-        @LimitCollectionCdOwnerAdmin
+        @LimitCollectionCreationDeletion
     )
-END
+END

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

@@ -51,7 +51,7 @@
     @MaxAutoscaleSmSeats INT = null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-    @LimitCollectionCdOwnerAdmin BIT = 1
+    @LimitCollectionCreationDeletion BIT = 1
 AS
 BEGIN
     SET NOCOUNT ON
@@ -110,7 +110,7 @@ BEGIN
         [MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats,
         [MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
         [SecretsManagerBeta] = @SecretsManagerBeta,
-        [LimitCollectionCdOwnerAdmin] = @LimitCollectionCdOwnerAdmin
+        [LimitCollectionCreationDeletion] = @LimitCollectionCreationDeletion
     WHERE
         [Id] = @Id
 END

src/Sql/dbo/Tables/Organization.sql

@@ -51,7 +51,7 @@
     [MaxAutoscaleSmSeats]           INT              NULL,
     [MaxAutoscaleSmServiceAccounts] INT              NULL,
     [SecretsManagerBeta]            BIT              NOT NULL CONSTRAINT [DF_Organization_SecretsManagerBeta] DEFAULT (0),
-    [LimitCollectionCdOwnerAdmin]   BIT              NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCdOwnerAdmin] DEFAULT (1),
+    [LimitCollectionCreationDeletion]   BIT              NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCreationDeletion] DEFAULT (1),
     CONSTRAINT [PK_Organization] PRIMARY KEY CLUSTERED ([Id] ASC)
 );
 

src/Sql/dbo/Views/OrganizationUserOrganizationDetailsView.sql

@@ -45,7 +45,7 @@ SELECT
     O.[UsePasswordManager],
     O.[SmSeats],
     O.[SmServiceAccounts],
-    O.[LimitCollectionCdOwnerAdmin]
+    O.[LimitCollectionCreationDeletion]
 FROM
     [dbo].[OrganizationUser] OU
 LEFT JOIN

test/Api.Test/Vault/AuthorizationHandlers/CollectionAuthorizationHandlerTests.cs

@@ -69,7 +69,7 @@ public async Task CanCreateAsync_Success(
 
         organization.Type = userType;
         organization.Permissions.CreateNewCollections = createNewCollection;
-        organization.LimitCollectionCdOwnerAdmin = limitCollectionCreateDelete;
+        organization.LimitCollectionCreationDeletion = limitCollectionCreateDelete;
 
         var context = new AuthorizationHandlerContext(
             new[] { CollectionOperations.Create },
@@ -104,7 +104,7 @@ public async Task CanDeleteAsync_Success(
 
         organization.Type = userType;
         organization.Permissions.DeleteAnyCollection = deleteAnyCollection;
-        organization.LimitCollectionCdOwnerAdmin = limitCollectionCreateDelete;
+        organization.LimitCollectionCreationDeletion = limitCollectionCreateDelete;
 
         var context = new AuthorizationHandlerContext(
             new[] { CollectionOperations.Delete },

util/Migrator/DbScripts/2023-07-31_00_LimitCollectionCreateDelete.sql → util/Migrator/DbScripts/2023-09-26_00_LimitCollectionCreationDeletion.sql

@@ -1,19 +1,19 @@
---Add column 'LimitCollectionCdOwnerAdmin' to 'Organization' table
-IF COL_LENGTH('[dbo].[Organization]', 'LimitCollectionCdOwnerAdmin') IS NULL
+--Add column 'LimitCollectionCreationDeletion' to 'Organization' table
+IF COL_LENGTH('[dbo].[Organization]', 'LimitCollectionCreationDeletion') IS NULL
 BEGIN
     ALTER TABLE
         [dbo].[Organization]
     ADD
-        [LimitCollectionCdOwnerAdmin] BIT NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCdOwnerAdmin] DEFAULT (1)
+        [LimitCollectionCreationDeletion] BIT NOT NULL CONSTRAINT [DF_Organization_LimitCollectionCreationDeletion] DEFAULT (1)
 END
 GO
 
 
 /**
   ORGANIZATION STORED PROCEDURES
  */
- 
---Alter `Organization_Create` sproc to include `LimitCollectionCdOwnerAdmin` column and default value
+
+--Alter `Organization_Create` sproc to include `LimitCollectionCreationDeletion` column and default value
 CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
     @Id UNIQUEIDENTIFIER OUTPUT,
     @Identifier NVARCHAR(50),
@@ -67,7 +67,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
     @MaxAutoscaleSmSeats INT= null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-    @LimitCollectionCdOwnerAdmin BIT = 0
+    @LimitCollectionCreationDeletion BIT = 0
 AS
 BEGIN
     SET NOCOUNT ON
@@ -126,7 +126,7 @@ BEGIN
         [MaxAutoscaleSmSeats],
         [MaxAutoscaleSmServiceAccounts],
         [SecretsManagerBeta],
-        [LimitCollectionCdOwnerAdmin]
+        [LimitCollectionCreationDeletion]
     )
     VALUES
         (
@@ -182,12 +182,12 @@ BEGIN
             @MaxAutoscaleSmSeats,
             @MaxAutoscaleSmServiceAccounts,
             @SecretsManagerBeta,
-            @LimitCollectionCdOwnerAdmin
+            @LimitCollectionCreationDeletion
         )
 END
 GO
 
---Alter `Organization_Update` sproc to include `LimitCollectionCdOwnerAdmin` column 
+--Alter `Organization_Update` sproc to include `LimitCollectionCreationDeletion` column
 CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
     @Id UNIQUEIDENTIFIER,
     @Identifier NVARCHAR(50),
@@ -241,7 +241,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
     @MaxAutoscaleSmSeats INT = null,
     @MaxAutoscaleSmServiceAccounts INT = null,
     @SecretsManagerBeta BIT = 0,
-    @LimitCollectionCdOwnerAdmin BIT = 1
+    @LimitCollectionCreationDeletion BIT = 1
 AS
 BEGIN
     SET NOCOUNT ON
@@ -300,7 +300,7 @@ BEGIN
         [MaxAutoscaleSmSeats] = @MaxAutoscaleSmSeats,
         [MaxAutoscaleSmServiceAccounts] = @MaxAutoscaleSmServiceAccounts,
         [SecretsManagerBeta] = @SecretsManagerBeta,
-        [LimitCollectionCdOwnerAdmin] = @LimitCollectionCdOwnerAdmin
+        [LimitCollectionCreationDeletion] = @LimitCollectionCreationDeletion
     WHERE
             [Id] = @Id
 END
@@ -310,8 +310,8 @@ GO
 /**
   ORGANIZATION VIEWS
  */
- 
---Add 'LimitCollectionCdOwnerAdmin` to OrganizationUserOrganizationDetailsView
+
+--Add 'LimitCollectionCreationDeletion` to OrganizationUserOrganizationDetailsView
 CREATE OR ALTER VIEW [dbo].[OrganizationUserOrganizationDetailsView]
 AS
 SELECT
@@ -359,7 +359,7 @@ SELECT
     O.[UsePasswordManager],
     O.[SmSeats],
     O.[SmServiceAccounts],
-    O.[LimitCollectionCdOwnerAdmin]
+    O.[LimitCollectionCreationDeletion]
 FROM
     [dbo].[OrganizationUser] OU
         LEFT JOIN
@@ -386,7 +386,7 @@ GO
 /**
   PROVIDER VIEWS - not directly modified, but access Organization table
  */
- 
+
 --Manually refresh ProviderOrganizationOrganizationDetailsView
 IF OBJECT_ID('[dbo].[ProviderOrganizationOrganizationDetailsView]') IS NOT NULL
     BEGIN
@@ -399,4 +399,4 @@ IF OBJECT_ID('[dbo].[ProviderUserProviderOrganizationDetailsView]') IS NOT NULL
     BEGIN
         EXECUTE sp_refreshsqlmodule N'[dbo].[ProviderUserProviderOrganizationDetailsView]';
     END
-GO
+GO

util/MySqlMigrations/Migrations/20230807181649_LimitCollectionCreateDelete.cs

@@ -11,7 +11,7 @@ public partial class LimitCollectionCreateDelete : Migration
     protected override void Up(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.AddColumn<bool>(
-            name: "LimitCollectionCdOwnerAdmin",
+            name: "LimitCollectionCreationDeletion",
             table: "Organization",
             type: "tinyint(1)",
             nullable: false,
@@ -22,7 +22,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
     protected override void Down(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.DropColumn(
-            name: "LimitCollectionCdOwnerAdmin",
+            name: "LimitCollectionCreationDeletion",
             table: "Organization");
     }
 }

util/MySqlMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -570,7 +570,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("varchar(100)");
 
-                    b.Property<bool>("LimitCollectionCdOwnerAdmin")
+                    b.Property<bool>("LimitCollectionCreationDeletion")
                         .HasColumnType("tinyint(1)")
                         .HasDefaultValue(true);
 

util/PostgresMigrations/Migrations/20230807181653_LimitCollectionCreateDelete.cs

@@ -11,7 +11,7 @@ public partial class LimitCollectionCreateDelete : Migration
     protected override void Up(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.AddColumn<bool>(
-            name: "LimitCollectionCdOwnerAdmin",
+            name: "LimitCollectionCreationDeletion",
             table: "Organization",
             type: "boolean",
             nullable: false,
@@ -22,7 +22,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
     protected override void Down(MigrationBuilder migrationBuilder)
     {
         migrationBuilder.DropColumn(
-            name: "LimitCollectionCdOwnerAdmin",
+            name: "LimitCollectionCreationDeletion",
             table: "Organization");
     }
 }

util/PostgresMigrations/Migrations/DatabaseContextModelSnapshot.cs

@@ -580,7 +580,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
-                    b.Property<bool>("LimitCollectionCdOwnerAdmin")
+                    b.Property<bool>("LimitCollectionCreationDeletion")
                         .HasColumnType("boolean")
                         .HasDefaultValue(true);