Merge pull request #171 from VolvoxCommunity/refactor-context-factory

Refactor context factory

Author: BillChirico

src/Volvox.Helios.Web/ConfigurationHelper.cs

@@ -0,0 +1,20 @@
+using System;
+using System.IO;
+using Microsoft.Extensions.Configuration;
+
+namespace Volvox.Helios.Web
+{
+    public static class ConfigurationHelper
+    {
+        public static IConfiguration GetDefaultConfiguration()
+        {
+            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
+            return new ConfigurationBuilder()
+                .SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("./appsettings.json", optional: false, reloadOnChange: true)
+                .AddJsonFile($"./appsettings.{environment}.json", optional: true, reloadOnChange: true)
+                .AddJsonFile("./modulemetadata.json")
+                .AddUserSecrets<Startup>().Build();
+        }
+    }
+}

src/Volvox.Helios.Web/Program.cs

@@ -17,7 +17,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
             return WebHost.CreateDefaultBuilder(args)
                 .UseApplicationInsights()
                 .UseStartup<Startup>()
-                .ConfigureAppConfiguration(c => c.AddJsonFile("./modulemetadata.json"))
+                .UseConfiguration(ConfigurationHelper.GetDefaultConfiguration())
                 .ConfigureLogging((hostingContext, logging) =>
                 {
                     logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging"));

src/Volvox.Helios.Service/VolvoxHeliosContextFactory.cs src/Volvox.Helios.Web/VolvoxHeliosContextFactory.cs

@@ -1,16 +1,20 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+using Volvox.Helios.Service;
 
-namespace Volvox.Helios.Service
+namespace Volvox.Helios.Web
 {
     public class VolvoxHeliosContextFactory : IDesignTimeDbContextFactory<VolvoxHeliosContext>
     {
         public VolvoxHeliosContext CreateDbContext(string[] args)
         {
+            var configuration = ConfigurationHelper.GetDefaultConfiguration();
+
             var optionsBuilder = new DbContextOptionsBuilder<VolvoxHeliosContext>();
-            optionsBuilder.UseSqlServer(
-                "Server=(localdb)\\mssqllocaldb;Database=VolvoxHelios;Trusted_Connection=True;");
 
+            optionsBuilder.UseSqlServer(configuration.GetConnectionString("VolvoxHeliosDatabase"), options=>
+            options.MigrationsAssembly("Volvox.Helios.Service"));
             return new VolvoxHeliosContext(optionsBuilder.Options);
         }
     }