setting-management revisit db prefix

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityDbContextModelBuilderExtensions.cs

@@ -10,7 +10,7 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
     {
         public static void ConfigureIdentity(
             [NotNull] this ModelBuilder builder,
-            Action<IdentityModelBuilderConfigurationOptions> optionsAction = null)
+            [CanBeNull] Action<IdentityModelBuilderConfigurationOptions> optionsAction = null)
         {
             Check.NotNull(builder, nameof(builder));
 

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementConsts.cs

@@ -1,11 +0,0 @@
-namespace Volo.Abp.SettingManagement
-{
-    public static class AbpSettingManagementConsts
-    {
-        public const string DefaultDbTablePrefix = "Abp";
-
-        public const string DefaultDbSchema = null;
-
-        public const string ConnectionStringName = "AbpSettingManagement";
-    }
-}

modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/AbpSettingManagementDbProperties.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.Data;
+
+namespace Volo.Abp.SettingManagement
+{
+    public static class AbpSettingManagementDbProperties
+    {
+        public static string DbTablePrefix { get; } = AbpCommonDbProperties.DbTablePrefix;
+
+        public static string DbSchema { get; } = AbpCommonDbProperties.DbSchema;
+
+        public const string ConnectionStringName = "AbpSettingManagement";
+    }
+}

modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/ISettingManagementDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.SettingManagement.EntityFrameworkCore
 {
-    [ConnectionStringName(AbpSettingManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpSettingManagementDbProperties.ConnectionStringName)]
     public interface ISettingManagementDbContext : IEfCoreDbContext
     {
         DbSet<Setting> Settings { get; set; }

modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContext.cs

@@ -4,13 +4,9 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.SettingManagement.EntityFrameworkCore
 {
-    [ConnectionStringName(AbpSettingManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpSettingManagementDbProperties.ConnectionStringName)]
     public class SettingManagementDbContext : AbpDbContext<SettingManagementDbContext>, ISettingManagementDbContext
     {
-        public static string TablePrefix { get; set; } = AbpSettingManagementConsts.DefaultDbTablePrefix;
-
-        public static string Schema { get; set; } = AbpSettingManagementConsts.DefaultDbSchema;
-
         public DbSet<Setting> Settings { get; set; }
 
         public SettingManagementDbContext(DbContextOptions<SettingManagementDbContext> options)
@@ -23,7 +19,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigureSettingManagement(TablePrefix, Schema);
+            builder.ConfigureSettingManagement();
         }
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/SettingManagementDbContextModelBuilderExtensions.cs

@@ -1,26 +1,42 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
 
 namespace Volo.Abp.SettingManagement.EntityFrameworkCore
 {
+    public class SettingManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions
+    {
+        public SettingManagementModelBuilderConfigurationOptions(
+            [NotNull] string tablePrefix,
+            [CanBeNull] string schema)
+            : base(
+                tablePrefix,
+                schema)
+        {
+
+        }
+    }
+
     public static class SettingManagementDbContextModelBuilderExtensions
     {
         //TODO: Instead of getting parameters, get a action of SettingManagementModelBuilderConfigurationOptions like other modules
         public static void ConfigureSettingManagement(
             [NotNull] this ModelBuilder builder,
-            [CanBeNull] string tablePrefix = AbpSettingManagementConsts.DefaultDbTablePrefix,
-            [CanBeNull] string schema = AbpSettingManagementConsts.DefaultDbSchema)
+            [CanBeNull] Action<SettingManagementModelBuilderConfigurationOptions> optionsAction = null)
         {
             Check.NotNull(builder, nameof(builder));
 
-            if (tablePrefix == null)
-            {
-                tablePrefix = "";
-            }
+            var options = new SettingManagementModelBuilderConfigurationOptions(
+                AbpSettingManagementDbProperties.DbTablePrefix,
+                AbpSettingManagementDbProperties.DbSchema
+            );
+
+            optionsAction?.Invoke(options);
 
             builder.Entity<Setting>(b =>
             {
-                b.ToTable(tablePrefix + "Settings", schema);
+                b.ToTable(options.TablePrefix + "Settings", options.Schema);
 
                 b.Property(x => x.Name).HasMaxLength(SettingConsts.MaxNameLength).IsRequired();
                 b.Property(x => x.Value).HasMaxLength(SettingConsts.MaxValueLength).IsRequired();

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/ISettingManagementMongoDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.SettingManagement.MongoDB
 {
-    [ConnectionStringName(AbpSettingManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpSettingManagementDbProperties.ConnectionStringName)]
     public interface ISettingManagementMongoDbContext : IAbpMongoDbContext
     {
         IMongoCollection<Setting> Settings { get; }

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoDbContext.cs

@@ -4,21 +4,16 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.SettingManagement.MongoDB
 {
-    [ConnectionStringName(AbpSettingManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpSettingManagementDbProperties.ConnectionStringName)]
     public class SettingManagementMongoDbContext : AbpMongoDbContext, ISettingManagementMongoDbContext
     {
-        public static string CollectionPrefix { get; set; } = AbpSettingManagementConsts.DefaultDbTablePrefix;
-
         public IMongoCollection<Setting> Settings => Collection<Setting>();
 
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigureSettingManagement(options =>
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
+            modelBuilder.ConfigureSettingManagement();
         }
     }
 }

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoDbContextExtensions.cs

@@ -7,11 +7,13 @@ namespace Volo.Abp.SettingManagement.MongoDB
     {
         public static void ConfigureSettingManagement(
             this IMongoModelBuilder builder,
-            Action<MongoModelBuilderConfigurationOptions> optionsAction = null)
+            Action<SettingManagementMongoModelBuilderConfigurationOptions> optionsAction = null)
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new SettingManagementMongoModelBuilderConfigurationOptions();
+            var options = new SettingManagementMongoModelBuilderConfigurationOptions(
+                AbpSettingManagementDbProperties.DbTablePrefix
+            );
 
             optionsAction?.Invoke(options);
 

modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/SettingManagementMongoModelBuilderConfigurationOptions.cs

@@ -5,7 +5,8 @@ namespace Volo.Abp.SettingManagement.MongoDB
 {
     public class SettingManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions
     {
-        public SettingManagementMongoModelBuilderConfigurationOptions([NotNull] string tablePrefix = AbpSettingManagementConsts.DefaultDbTablePrefix)
+        public SettingManagementMongoModelBuilderConfigurationOptions(
+            [NotNull] string tablePrefix = "")
             : base(tablePrefix)
         {
         }