add Startup.cs, re-work DI config

for #102

.gitignore

@@ -297,4 +297,5 @@ __pycache__/
 # FilterLists Custom Ignores
 gs/Private.gs
 src/FilterLists.Api/appsettings.Development.json
-src/FilterLists.Api/appsettings.Production.json
+src/FilterLists.Api/appsettings.Production.json
+src/FilterLists.DataLoad/appsettings.json

src/FilterLists.Api/FilterLists.Api.csproj

@@ -28,5 +28,10 @@
     <ProjectReference Include="..\FilterLists.Data\FilterLists.Data.csproj" />
     <ProjectReference Include="..\FilterLists.Services\FilterLists.Services.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 
 </Project>

src/FilterLists.Api/Startup.cs

@@ -21,7 +21,7 @@ public Startup(IHostingEnvironment env, ILoggerFactory loggerFactory)
                 .AddEnvironmentVariables();
             Configuration = builder.Build();
 
-            //TODO: replace below with serilog
+            //TODO: replace with serilog
             loggerFactory.AddConsole(Configuration.GetSection("Logging"));
             loggerFactory.AddDebug();
         }

src/FilterLists.DataLoad/DataLoad.cs

@@ -1,19 +0,0 @@
-using FilterLists.Services.Contracts;
-using FilterLists.Services.Implementations;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FilterLists.DataLoad
-{
-    //TODO: trigger on job or ideally via GitHub webhook when any .csv is updated
-    internal class DataLoad
-    {
-        private static void Main()
-        {
-            var serviceProvider = new ServiceCollection()
-                .AddLogging()
-                .AddSingleton<ITableService, TableService>()
-                .BuildServiceProvider();
-            serviceProvider.GetService<ITableService>().UpdateTables();
-        }
-    }
-}

src/FilterLists.DataLoad/DependencyInjection/Extensions/ConfigureServicesCollection.cs

@@ -0,0 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FilterLists.DataLoad.DependencyInjection.Extensions
+{
+    public static class ConfigureServicesCollection
+    {
+        public static void AddFilterListsDataLoad(this IServiceCollection services)
+        {
+        }
+    }
+}

src/FilterLists.DataLoad/FilterLists.DataLoad.csproj

@@ -5,8 +5,20 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="appsettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="10.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup>

src/FilterLists.DataLoad/Program.cs

@@ -0,0 +1,26 @@
+using FilterLists.Services.Contracts;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace FilterLists.DataLoad
+{
+    //TODO: trigger on job or ideally via GitHub webhook when any .csv is updated in master
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            IServiceCollection services = new ServiceCollection();
+            var startup = new Startup();
+            startup.ConfigureServices(services);
+            var serviceProvider = services.BuildServiceProvider();
+
+            //TODO: replace with serilog
+            var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<Program>();
+
+            logger.LogInformation("Updating Tables");
+            var tableService = serviceProvider.GetService<ITableService>();
+            tableService.UpdateTables();
+        }
+    }
+}

src/FilterLists.DataLoad/Startup.cs

@@ -0,0 +1,32 @@
+using System.IO;
+using FilterLists.Data.DependencyInjection.Extensions;
+using FilterLists.DataLoad.DependencyInjection.Extensions;
+using FilterLists.Services.DependencyInjection.Extensions;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace FilterLists.DataLoad
+{
+    public class Startup
+    {
+        public Startup()
+        {
+            var builder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory())
+                .AddJsonFile("appsettings.json", false, true);
+            Configuration = builder.Build();
+        }
+
+        private IConfigurationRoot Configuration { get; }
+
+        public void ConfigureServices(IServiceCollection services)
+        {
+            var loggerFactory = new LoggerFactory().AddConsole().AddDebug();
+            services.AddSingleton(loggerFactory);
+            services.AddLogging();
+            services.AddFilterListsRepositories(Configuration);
+            services.AddFilterListsServices();
+            services.AddFilterListsDataLoad();
+        }
+    }
+}

src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs

@@ -10,6 +10,7 @@ public static class ConfigureServicesCollection
         public static void AddFilterListsServices(this IServiceCollection services)
         {
             services.TryAddScoped<IListService, ListService>();
+            services.TryAddScoped<ITableService, TableService>();
         }
     }
 }

src/FilterLists.Services/Implementations/TableService.cs

@@ -9,11 +9,11 @@ namespace FilterLists.Services.Implementations
 {
     public class TableService : ITableService
     {
-        //private readonly IListRepository _listRepository;
+        private readonly IListRepository _listRepository;
 
-        public TableService(/*IListRepository listRepository*/)
+        public TableService(IListRepository listRepository)
         {
-            //_listRepository = listRepository;
+            _listRepository = listRepository;
         }
 
         /// <summary>