From 50e1e2d982879c505143cd79bb6234922d331071 Mon Sep 17 00:00:00 2001 From: rockstardev Date: Thu, 28 May 2020 14:38:17 -0500 Subject: [PATCH] Standardizing DbSet properties, reducing whitespace --- .../Data/ApplicationDbContext.cs | 114 ++++-------------- 1 file changed, 25 insertions(+), 89 deletions(-) diff --git a/BTCPayServer.Data/Data/ApplicationDbContext.cs b/BTCPayServer.Data/Data/ApplicationDbContext.cs index 802ffae8e..5125e9c15 100644 --- a/BTCPayServer.Data/Data/ApplicationDbContext.cs +++ b/BTCPayServer.Data/Data/ApplicationDbContext.cs @@ -11,15 +11,15 @@ namespace BTCPayServer.Data { public ApplicationDbContext CreateDbContext(string[] args) { - + var builder = new DbContextOptionsBuilder(); - + builder.UseSqlite("Data Source=temp.db"); - + return new ApplicationDbContext(builder.Options, true); } } - + public class ApplicationDbContext : IdentityDbContext { private readonly bool _designTime; @@ -37,90 +37,26 @@ namespace BTCPayServer.Data public DbSet PlannedTransactions { get; set; } public DbSet PayjoinLocks { get; set; } - - public DbSet Apps - { - get; set; - } - - public DbSet InvoiceEvents - { - get; set; - } - + public DbSet Apps { get; set; } + public DbSet InvoiceEvents { get; set; } public DbSet OffchainTransactions { get; set; } - - public DbSet HistoricalAddressInvoices - { - get; set; - } - - public DbSet PendingInvoices - { - get; set; - } - public DbSet RefundAddresses - { - get; set; - } - - public DbSet Payments - { - get; set; - } - - public DbSet PaymentRequests - { - get; set; - } - + public DbSet HistoricalAddressInvoices { get; set; } + public DbSet PendingInvoices { get; set; } + public DbSet RefundAddresses { get; set; } + public DbSet Payments { get; set; } + public DbSet PaymentRequests { get; set; } public DbSet Wallets { get; set; } public DbSet WalletTransactions { get; set; } + public DbSet Stores { get; set; } + public DbSet UserStore { get; set; } + public DbSet AddressInvoices { get; set; } + public DbSet Settings { get; set; } + public DbSet PairingCodes { get; set; } + public DbSet PairedSINData { get; set; } + public DbSet ApiKeys { get; set; } + public DbSet Files { get; set; } + public DbSet U2FDevices { get; set; } - public DbSet Stores - { - get; set; - } - - public DbSet UserStore - { - get; set; - } - - public DbSet AddressInvoices - { - get; set; - } - - public DbSet Settings - { - get; set; - } - - - public DbSet PairingCodes - { - get; set; - } - - public DbSet PairedSINData - { - get; set; - } - - public DbSet ApiKeys - { - get; set; - } - - public DbSet Files - { - get; set; - } - - - public DbSet U2FDevices { get; set; } - protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { var isConfigured = optionsBuilder.Options.Extensions.OfType().Any(); @@ -164,12 +100,12 @@ namespace BTCPayServer.Data .HasOne(o => o.StoreData) .WithMany(i => i.APIKeys) .HasForeignKey(i => i.StoreId).OnDelete(DeleteBehavior.Cascade); - + builder.Entity() .HasOne(o => o.User) .WithMany(i => i.APIKeys) .HasForeignKey(i => i.UserId).OnDelete(DeleteBehavior.Cascade); - + builder.Entity() .HasIndex(o => o.StoreId); @@ -240,8 +176,8 @@ namespace BTCPayServer.Data o.UniqueId #pragma warning restore CS0618 }); - - + + builder.Entity() .HasOne(o => o.StoreData) .WithMany(i => i.PaymentRequests) @@ -264,7 +200,7 @@ namespace BTCPayServer.Data builder.Entity() .HasOne(o => o.WalletData) .WithMany(w => w.WalletTransactions).OnDelete(DeleteBehavior.Cascade); - + if (Database.IsSqlite() && !_designTime) { // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations