From f6c61e0d711a81f3118d254637b88a0befa15f74 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 24 Oct 2017 17:57:21 -0500
Subject: [PATCH] make presentation layer not directly depend on DAL

---
 .../Extensions/ConfigureServicesCollection.cs |  8 +------
 src/FilterLists.Api/FilterLists.Api.csproj    |  1 -
 src/FilterLists.Api/Startup.cs                |  4 +---
 .../Extensions/ConfigureServicesCollection.cs | 22 -------------------
 .../Extensions/ConfigureServicesCollection.cs | 14 ++++++++++--
 5 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs

diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 2a8d3dd78..8137993e2 100644
--- a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 
 namespace FilterLists.Api.DependencyInjection.Extensions
 {
@@ -7,12 +6,7 @@ public static class ConfigureServicesCollection
     {
         public static void AddFilterListsApi(this IServiceCollection services)
         {
-            services.AddMvc()
-                .AddJsonOptions(options =>
-                {
-                    //TODO: determine why null values still get returned
-                    options.SerializerSettings.NullValueHandling = NullValueHandling.Ignore;
-                });
+            services.AddMvc();
         }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj
index 7405a98a1..0ec67ea25 100644
--- a/src/FilterLists.Api/FilterLists.Api.csproj
+++ b/src/FilterLists.Api/FilterLists.Api.csproj
@@ -26,7 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FilterLists.Data\FilterLists.Data.csproj" />
     <ProjectReference Include="..\FilterLists.Services\FilterLists.Services.csproj" />
   </ItemGroup>
 
diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs
index 3fb7868c1..6eddcc93e 100644
--- a/src/FilterLists.Api/Startup.cs
+++ b/src/FilterLists.Api/Startup.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using FilterLists.Api.DependencyInjection.Extensions;
-using FilterLists.Data.DependencyInjection.Extensions;
 using FilterLists.Services.DependencyInjection.Extensions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.HttpOverrides;
@@ -22,8 +21,7 @@ public Startup(IConfiguration configuration)
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddFilterListsRepositories(Configuration);
-            services.AddFilterListsServices();
+            services.AddFilterListsServices(Configuration);
             services.AddFilterListsApi();
             services.AddSwaggerGen(c =>
             {
diff --git a/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
deleted file mode 100644
index 5b28b1d5e..000000000
--- a/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using FilterLists.Data.Contexts;
-using FilterLists.Data.Repositories.Contracts;
-using FilterLists.Data.Repositories.Implementations;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-
-namespace FilterLists.Data.DependencyInjection.Extensions
-{
-    public static class ConfigureServicesCollection
-    {
-        public static void AddFilterListsRepositories(this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddSingleton(c => configuration);
-            services.AddEntityFrameworkMySql().AddDbContext<FilterListsDbContext>(options =>
-                options.UseMySql(configuration.GetConnectionString("FilterListsConnection")));
-            services.TryAddScoped<IListRepository, ListRepository>();
-            services.TryAddScoped<ITableCsvRepository, TableCsvRepository>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index b54fe1702..5b8755968 100644
--- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -1,5 +1,10 @@
-using FilterLists.Services.Contracts;
+using FilterLists.Data.Contexts;
+using FilterLists.Data.Repositories.Contracts;
+using FilterLists.Data.Repositories.Implementations;
+using FilterLists.Services.Contracts;
 using FilterLists.Services.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -7,8 +12,13 @@ namespace FilterLists.Services.DependencyInjection.Extensions
 {
     public static class ConfigureServicesCollection
     {
-        public static void AddFilterListsServices(this IServiceCollection services)
+        public static void AddFilterListsServices(this IServiceCollection services, IConfiguration configuration)
         {
+            services.AddSingleton(c => configuration);
+            services.AddEntityFrameworkMySql().AddDbContext<FilterListsDbContext>(options =>
+                options.UseMySql(configuration.GetConnectionString("FilterListsConnection")));
+            services.TryAddScoped<IListRepository, ListRepository>();
+            services.TryAddScoped<ITableCsvRepository, TableCsvRepository>();
             services.TryAddScoped<IListService, ListService>();
             services.TryAddScoped<ITableService, TableService>();
         }