IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Anton Suhorukov 2023-06-09 14:28:49 +03:00
parent ba345c0f06
commit 1905566b90
15 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ASC.Core.Common/EF/Context/CoreDbContext.cs
View File

@ -43,6 +43,6 @@ public class CoreDbContext : DbContext
.AddDbQuota()
.AddDbTariff()
.AddDbTariffRow()
.AddDbTenant();
.AddDbTenant(true);
}
}

2
common/ASC.Core.Common/EF/Context/FirebaseDbContext.cs
View File

@ -39,6 +39,6 @@ public class FirebaseDbContext : DbContext
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddFireBaseUsers()
.AddDbTenant(true);
.AddDbTenant();
}
}

2
common/ASC.Core.Common/EF/Context/NotifyDbContext.cs
View File

@ -42,6 +42,6 @@ public class NotifyDbContext : DbContext
.From(modelBuilder, Database)
.AddNotifyInfo()
.AddNotifyQueue()
.AddDbTenant(true);
.AddDbTenant();
}
}

2
common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
View File

@ -40,6 +40,6 @@ public class TelegramDbContext : DbContext
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddTelegramUsers()
.AddDbTenant(true);
.AddDbTenant();
}
}

2
common/ASC.Core.Common/EF/Context/TenantDbContext.cs
View File

@ -40,7 +40,7 @@ public class TenantDbContext : DbContext
{
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddDbTenant(true)
.AddDbTenant()
.AddCoreSettings()
.AddDbTenantForbiden()
.AddTenantIpRestrictions()

4
common/ASC.Core.Common/EF/Context/UserDbContext.cs
View File

@ -48,7 +48,7 @@ public class UserDbContext : DbContext
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddSubscriptionMethod()
.AddUser()
.AddUser(true)
.AddAcl()
.AddUserSecurity()
.AddUserPhoto()
@ -56,6 +56,6 @@ public class UserDbContext : DbContext
.AddUserGroup()
.AddSubscription()
.AddUserDav()
.AddDbTenant(true);
.AddDbTenant();
}
}

4
common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
View File

@ -42,10 +42,10 @@ public class WebstudioDbContext : DbContext
{
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddWebstudioSettings()
.AddWebstudioSettings(true)
.AddWebstudioUserVisit()
.AddDbWebstudioIndex()
.AddDbTenant(true)
.AddDbTenant()
.AddDbFunction();
}
}

4
common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
View File

@ -43,9 +43,9 @@ public class DbWebstudioSettings : BaseEntity
public static class WebstudioSettingsExtension
{
public static ModelBuilderWrapper AddWebstudioSettings(this ModelBuilderWrapper modelBuilder, bool ignoreMigration = false)
public static ModelBuilderWrapper AddWebstudioSettings(this ModelBuilderWrapper modelBuilder, bool useInMigration = false)
{
if (ignoreMigration)
if (!useInMigration)
{
modelBuilder.Entity<DbWebstudioSettings>().ToTable(t => t.ExcludeFromMigrations());
}

4
common/ASC.Core.Common/EF/Model/Tenant/DbTenant.cs
View File

@ -77,9 +77,9 @@ public class DbTenant : IMapFrom<Tenant>
public static class DbTenantExtension
{
public static ModelBuilderWrapper AddDbTenant(this ModelBuilderWrapper modelBuilder, bool ignoreMigration = false)
public static ModelBuilderWrapper AddDbTenant(this ModelBuilderWrapper modelBuilder, bool useInMigration = false)
{
if (ignoreMigration)
if (!useInMigration)
{
modelBuilder.Entity<DbTenant>().ToTable(t => t.ExcludeFromMigrations());
}

4
common/ASC.Core.Common/EF/Model/User/User.cs
View File

@ -64,9 +64,9 @@ public class User : BaseEntity, IMapFrom<UserInfo>
public static class DbUserExtension
{
public static ModelBuilderWrapper AddUser(this ModelBuilderWrapper modelBuilder, bool ignoreMigration = false)
public static ModelBuilderWrapper AddUser(this ModelBuilderWrapper modelBuilder, bool useInMigration = false)
{
if (ignoreMigration)
if (!useInMigration)
{
modelBuilder.Entity<User>().ToTable(t => t.ExcludeFromMigrations());
}

16
common/ASC.Core.Common/Messaging/MessagesContext.cs
View File

@ -33,11 +33,11 @@ public class MessagesContext : DbContext
public DbSet<DbWebstudioSettings> WebstudioSettings { get; set; }
public DbSet<DbTenant> Tenants { get; set; }
public DbSet<User> Users { get; set; }
public MessagesContext(DbContextOptions<MessagesContext> options) : base(options)
{
}
public MessagesContext(DbContextOptions<MessagesContext> options) : base(options)
{
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
@ -45,9 +45,9 @@ public class MessagesContext : DbContext
.From(modelBuilder, Database)
.AddAuditEvent()
.AddLoginEvents()
.AddUser(true)
.AddWebstudioSettings(true)
.AddDbTenant(true)
.AddUser()
.AddWebstudioSettings()
.AddDbTenant()
.AddDbFunction();
}
}

8
common/ASC.Data.Backup.Core/EF/Context/BackupsContext.cs
View File

@ -30,17 +30,17 @@ public class BackupsContext : DbContext
{
public DbSet<BackupRecord> Backups { get; set; }
public DbSet<BackupSchedule> Schedules { get; set; }
public DbSet<DbTenant> Tenants { get; set; }
public DbSet<DbTenant> Tenants { get; set; }
public BackupsContext(DbContextOptions<BackupsContext> options) : base(options)
{
}
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
ModelBuilderWrapper
.From(modelBuilder, Database)
.AddDbTenant(true)
.AddDbTenant()
.AddBackupSchedule()
.AddBackupRecord();
}

8
common/ASC.Feed/EF/Context/FeedDbContext.cs
View File

@ -32,8 +32,8 @@ public class FeedDbContext : DbContext
public DbSet<FeedAggregate> FeedAggregates { get; set; }
public DbSet<FeedUsers> FeedUsers { get; set; }
public DbSet<FeedReaded> FeedReaded { get; set; }
public FeedDbContext(DbContextOptions<FeedDbContext> options) : base(options) { }
public FeedDbContext(DbContextOptions<FeedDbContext> options) : base(options) { }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
@ -42,7 +42,7 @@ public class FeedDbContext : DbContext
.AddFeedUsers()
.AddFeedReaded()
.AddFeedAggregate()
.AddFeedLast()
.AddDbTenant(true);
.AddFeedLast()
.AddDbTenant();
}
}

12
common/ASC.Webhooks.Core/EF/Context/WebhooksDbContext.cs
View File

@ -29,18 +29,18 @@ namespace ASC.Webhooks.Core.EF.Context;
public class WebhooksDbContext : DbContext
{
public DbSet<WebhooksConfig> WebhooksConfigs { get; set; }
public DbSet<WebhooksLog> WebhooksLogs { get; set; }
public DbSet<WebhooksLog> WebhooksLogs { get; set; }
public DbSet<DbWebhook> Webhooks { get; set; }
public WebhooksDbContext(DbContextOptions<WebhooksDbContext> options) : base(options) { }
public WebhooksDbContext(DbContextOptions<WebhooksDbContext> options) : base(options) { }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
ModelBuilderWrapper
.From(modelBuilder, Database)
.From(modelBuilder, Database)
.AddDbWebhooks()
.AddWebhooksConfig()
.AddWebhooksLog()
.AddDbTenant(true);
.AddWebhooksLog()
.AddDbTenant();
}
}

2
products/ASC.Files/Core/Core/EF/FilesDbContext.cs
View File

@ -61,7 +61,7 @@ public class FilesDbContext : DbContext
.AddDbDbFilesThirdpartyApp()
.AddDbFilesLink()
.AddDbFilesProperties()
.AddDbTenant(true)
.AddDbTenant()
.AddFilesConverts();
}
}