Merge pull request #40 from bobbahbrown/v1.3.9

Version 1.3.9 - Add Logging for Ban Parsing
bobbah · Aug 20, 2021 · 39a2199 · 39a2199
2 parents 89b54cf + 3d86a0a
commit 39a2199
Show file tree

Hide file tree

Showing 39 changed files with 1,893 additions and 282 deletions.
diff --git a/CentCom.API/CentCom.API.csproj b/CentCom.API/CentCom.API.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.3.8.1</Version>
+    <Version>1.3.9</Version>
+    <UserSecretsId>1f5f48fa-862f-4472-ba34-2c5a26035e88</UserSecretsId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -16,13 +17,13 @@
   <ItemGroup>
     <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
     <PackageReference Include="Enums.NET" Version="4.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Npgsql" Version="5.0.7" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CentCom.Common/CentCom.Common.csproj b/CentCom.Common/CentCom.Common.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.3.8.1</Version>
+    <Version>1.3.9</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="EFCore.NamingConventions" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.9" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Npgsql" Version="5.0.7" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.7" />

diff --git a/CentCom.Common/Data/DatabaseContext.cs b/CentCom.Common/Data/DatabaseContext.cs
@@ -15,6 +15,7 @@ public abstract class DatabaseContext : DbContext
         public DbSet<BanSource> BanSources { get; set; }
         public DbSet<JobBan> JobBans { get; set; }
         public DbSet<FlatBansVersion> FlatBansVersion { get; set; }
+        public DbSet<CheckHistory> CheckHistory { get; set; }
 
         public DatabaseContext(IConfiguration configuration)
         {
@@ -67,6 +68,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 entity.Property(e => e.Version).IsRequired();
                 entity.HasIndex(e => new { e.Name, e.Version }).IsUnique();
             });
+
+            modelBuilder.Entity<CheckHistory>(entity =>
+            {
+                entity.HasKey(e => e.Id);
+                entity.Property(e => e.Id).UseIdentityAlwaysColumn();
+                entity.Property(e => e.Parser).IsRequired();
+                entity.HasIndex(e => new {e.Parser, e.Started});
+            });
         }
 
         public async Task<bool> Migrate(CancellationToken cancellationToken)

diff --git a/CentCom.Common/Data/DesignTime/MariaDbContextFactory.cs b/CentCom.Common/Data/DesignTime/MariaDbContextFactory.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+
+namespace CentCom.Common.Data.DesignTime
+{
+    public class MariaDbContextFactory : IDesignTimeDbContextFactory<MariaDbContext>
+    {
+        public MariaDbContext CreateDbContext(string[] args)
+        {
+            var conf = new Dictionary<string, string>
+            {
+                { "dbConfig:connectionString", "Host=127.0.0.1;Database=centcom_design;Username=centcom_parser;Password=spoof" },
+                { "dbConfig:dbType", "MariaDb" },
+                { "dbConfig:efcoreBuild", "any-value" }
+            };
+            IConfiguration spoofedConfig = new ConfigurationBuilder().AddInMemoryCollection(conf).Build();
+            return new MariaDbContext(spoofedConfig);
+        }
+    }
+}
diff --git a/CentCom.Common/Data/DesignTime/MySqlDbContextFactory.cs b/CentCom.Common/Data/DesignTime/MySqlDbContextFactory.cs
@@ -11,7 +11,8 @@ public MySqlDbContext CreateDbContext(string[] args)
             var conf = new Dictionary<string, string>
             {
                 { "dbConfig:connectionString", "Host=127.0.0.1;Database=centcom_design;Username=centcom_parser;Password=spoof" },
-                { "dbConfig:dbType", "Postgres" }
+                { "dbConfig:dbType", "MySql" },
+                { "dbConfig:efcoreBuild", "any-value" }
             };
             IConfiguration spoofedConfig = new ConfigurationBuilder().AddInMemoryCollection(conf).Build();
             return new MySqlDbContext(spoofedConfig);

diff --git a/CentCom.Common/Data/MariaDbContext.cs b/CentCom.Common/Data/MariaDbContext.cs
@@ -0,0 +1,21 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+
+namespace CentCom.Common.Data
+{
+    public class MariaDbContext : DatabaseContext
+    {
+        public MariaDbContext(IConfiguration configuration) : base(configuration)
+        {
+        }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder options)
+        {
+            var connStr = Configuration.GetSection("dbConfig")["connectionString"];
+            var efcoreBuild =
+                Configuration.GetSection("dbConfig")["efcoreBuild"] != null; // Used for building migrations
+            options.UseMySql(connStr,
+                efcoreBuild ? MariaDbServerVersion.LatestSupportedServerVersion : ServerVersion.AutoDetect(connStr));
+        }
+    }
+}
diff --git a/CentCom.Common/Data/MySqlDbContext.cs b/CentCom.Common/Data/MySqlDbContext.cs
@@ -12,12 +12,10 @@ public MySqlDbContext(IConfiguration configuration) : base(configuration)
         protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
             var connStr = Configuration.GetSection("dbConfig")["connectionString"];
-            options.UseMySql(connStr, ServerVersion.AutoDetect(connStr));
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
+            var efcoreBuild =
+                Configuration.GetSection("dbConfig")["efcoreBuild"] != null; // Used for building migrations
+            options.UseMySql(connStr,
+                efcoreBuild ? MySqlServerVersion.LatestSupportedServerVersion : ServerVersion.AutoDetect(connStr));
         }
     }
 }
diff --git a/CentCom.Common/Migrations/MariaDb/20210819220930_AddCheckHistory.Designer.cs b/CentCom.Common/Migrations/MariaDb/20210819220930_AddCheckHistory.Designer.cs