diff --git a/.gitignore b/.gitignore index 293d8bf72..d15f410b0 100644 --- a/.gitignore +++ b/.gitignore @@ -289,6 +289,6 @@ __pycache__/ # FilterLists Custom Ignores gs/Private.gs -api/FilterLists.Api/appsettings.Development.json -api/FilterLists.Api/appsettings.Production.json +api/src/FilterLists.Api/appsettings.Development.json +api/src/FilterLists.Api/appsettings.Production.json api/FilterLists.Api/api.filterlists \ No newline at end of file diff --git a/api/FilterLists.sln b/api/FilterLists.sln index e7a64288c..c3ad3f517 100644 --- a/api/FilterLists.sln +++ b/api/FilterLists.sln @@ -7,18 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Api", "src\Filt EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data", "src\FilterLists.Data\FilterLists.Data.csproj", "{944ADE8F-18E3-4DB8-9098-6A55E026EAC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Models", "src\FilterLists.Models\FilterLists.Models.csproj", "{EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Contracts", "src\FilterLists.Data.Contracts\FilterLists.Data.Contracts.csproj", "{07A5064E-1CB9-4990-84F8-25A9A89B1D45}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services", "src\FilterLists.Services\FilterLists.Services.csproj", "{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Tests", "test\FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{39072BBE-268D-408D-878F-1416F9C400A2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Tests", "test\FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Contracts", "src\FilterLists.Services.Contracts\FilterLists.Services.Contracts.csproj", "{C001DB46-2DE7-40C1-B0F8-75E831C09E6C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7590A2B-621D-47EA-B026-315793F0FE50}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AD4EEF3-8372-4AE9-8B1C-25359EC87435}" @@ -37,14 +31,6 @@ Global {944ADE8F-18E3-4DB8-9098-6A55E026EAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {944ADE8F-18E3-4DB8-9098-6A55E026EAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU {944ADE8F-18E3-4DB8-9098-6A55E026EAC1}.Release|Any CPU.Build.0 = Release|Any CPU - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975}.Release|Any CPU.Build.0 = Release|Any CPU - {07A5064E-1CB9-4990-84F8-25A9A89B1D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07A5064E-1CB9-4990-84F8-25A9A89B1D45}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07A5064E-1CB9-4990-84F8-25A9A89B1D45}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07A5064E-1CB9-4990-84F8-25A9A89B1D45}.Release|Any CPU.Build.0 = Release|Any CPU {9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -57,10 +43,6 @@ Global {AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU {AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Release|Any CPU.Build.0 = Release|Any CPU - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -68,11 +50,8 @@ Global GlobalSection(NestedProjects) = preSolution {57E4CE18-41F3-48F6-B142-12947FFBA86C} = {E7590A2B-621D-47EA-B026-315793F0FE50} {944ADE8F-18E3-4DB8-9098-6A55E026EAC1} = {E7590A2B-621D-47EA-B026-315793F0FE50} - {EBEF0C2E-2631-4AEF-ACAF-F5AE5A568975} = {E7590A2B-621D-47EA-B026-315793F0FE50} - {07A5064E-1CB9-4990-84F8-25A9A89B1D45} = {E7590A2B-621D-47EA-B026-315793F0FE50} {9F296ECF-97C9-47E6-A794-5AD900ECFE6C} = {E7590A2B-621D-47EA-B026-315793F0FE50} {39072BBE-268D-408D-878F-1416F9C400A2} = {2AD4EEF3-8372-4AE9-8B1C-25359EC87435} {AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC} = {2AD4EEF3-8372-4AE9-8B1C-25359EC87435} - {C001DB46-2DE7-40C1-B0F8-75E831C09E6C} = {E7590A2B-621D-47EA-B026-315793F0FE50} EndGlobalSection EndGlobal diff --git a/api/src/FilterLists.Api/Controllers/ListsController.cs b/api/src/FilterLists.Api/Controllers/ListsController.cs index 8b353a063..e807bd64b 100644 --- a/api/src/FilterLists.Api/Controllers/ListsController.cs +++ b/api/src/FilterLists.Api/Controllers/ListsController.cs @@ -15,7 +15,6 @@ public ListsController(IListService listService) _listService = listService; } - // GET lists [HttpGet] public IActionResult Get() { diff --git a/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 749a4f785..492829966 100644 --- a/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -5,7 +5,7 @@ namespace FilterLists.Api.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection RegisterFilterListsApi(this IServiceCollection services) + public static IServiceCollection AddFilterListsApi(this IServiceCollection services) { services.AddMvc() .AddJsonOptions(options => diff --git a/api/src/FilterLists.Api/FilterLists.Api.csproj b/api/src/FilterLists.Api/FilterLists.Api.csproj index ca5919255..987954ede 100644 --- a/api/src/FilterLists.Api/FilterLists.Api.csproj +++ b/api/src/FilterLists.Api/FilterLists.Api.csproj @@ -25,7 +25,6 @@ - diff --git a/api/src/FilterLists.Api/Startup.cs b/api/src/FilterLists.Api/Startup.cs index 17e3fb090..d515928b5 100644 --- a/api/src/FilterLists.Api/Startup.cs +++ b/api/src/FilterLists.Api/Startup.cs @@ -25,9 +25,9 @@ public Startup(IHostingEnvironment env) public void ConfigureServices(IServiceCollection services) { - services.RegisterFilterListsRepositories(Configuration); - services.RegisterFilterListsServices(); - services.RegisterFilterListsApi(); + services.AddFilterListsRepositories(Configuration); + services.AddFilterListsServices(); + services.AddFilterListsApi(); } public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) diff --git a/api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj b/api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj index 5784fbcc0..79ef7ef6f 100644 --- a/api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj +++ b/api/src/FilterLists.Data.Contracts/FilterLists.Data.Contracts.csproj @@ -8,4 +8,9 @@ + + + + + \ No newline at end of file diff --git a/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs b/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs index c0d21215b..2920217d9 100644 --- a/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs +++ b/api/src/FilterLists.Data/Contexts/FilterListsDbContext.cs @@ -1,5 +1,4 @@ -using FilterLists.Data.Contracts.Contexts; -using FilterLists.Models; +using FilterLists.Data.Models; using Microsoft.EntityFrameworkCore; namespace FilterLists.Data.Contexts diff --git a/api/src/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs b/api/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs similarity index 54% rename from api/src/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs rename to api/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs index a686a85ba..5cc919006 100644 --- a/api/src/FilterLists.Data.Contracts/Contexts/IFilterListsDbContext.cs +++ b/api/src/FilterLists.Data/Contexts/IFilterListsDbContext.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Contracts.Contexts +namespace FilterLists.Data.Contexts { public interface IFilterListsDbContext { diff --git a/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs index b3513d65b..49fada430 100644 --- a/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/src/FilterLists.Data/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -1,6 +1,6 @@ using FilterLists.Data.Contexts; -using FilterLists.Data.Contracts.Repositories; -using FilterLists.Data.Repositories; +using FilterLists.Data.Repositories.Contracts; +using FilterLists.Data.Repositories.Implementations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +11,7 @@ namespace FilterLists.Data.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection RegisterFilterListsRepositories(this IServiceCollection services, + public static IServiceCollection AddFilterListsRepositories(this IServiceCollection services, IConfiguration configuration) { services.AddSingleton(c => configuration); diff --git a/api/src/FilterLists.Data/FilterLists.Data.csproj b/api/src/FilterLists.Data/FilterLists.Data.csproj index 26baf0919..0b1ade9c7 100644 --- a/api/src/FilterLists.Data/FilterLists.Data.csproj +++ b/api/src/FilterLists.Data/FilterLists.Data.csproj @@ -9,13 +9,14 @@ - - - - - + + + ..\..\..\..\..\.nuget\packages\system.runtime\4.3.0\ref\netstandard1.5\System.Runtime.dll + + + \ No newline at end of file diff --git a/api/src/FilterLists.Models/BaseEntity.cs b/api/src/FilterLists.Data/Models/BaseEntity.cs similarity index 96% rename from api/src/FilterLists.Models/BaseEntity.cs rename to api/src/FilterLists.Data/Models/BaseEntity.cs index 5ff1da0be..23d2c1c4c 100644 --- a/api/src/FilterLists.Models/BaseEntity.cs +++ b/api/src/FilterLists.Data/Models/BaseEntity.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace FilterLists.Models +namespace FilterLists.Data.Models { public abstract class BaseEntity { diff --git a/api/src/FilterLists.Models/List.cs b/api/src/FilterLists.Data/Models/List.cs similarity index 96% rename from api/src/FilterLists.Models/List.cs rename to api/src/FilterLists.Data/Models/List.cs index 6ccb97955..059c74fbd 100644 --- a/api/src/FilterLists.Models/List.cs +++ b/api/src/FilterLists.Data/Models/List.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace FilterLists.Models +namespace FilterLists.Data.Models { public class List : BaseEntity { diff --git a/api/src/FilterLists.Data.Contracts/Repositories/IListRepository.cs b/api/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs similarity index 60% rename from api/src/FilterLists.Data.Contracts/Repositories/IListRepository.cs rename to api/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs index 8461e6ee9..95f39442a 100644 --- a/api/src/FilterLists.Data.Contracts/Repositories/IListRepository.cs +++ b/api/src/FilterLists.Data/Repositories/Contracts/IListRepository.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using FilterLists.Models; +using FilterLists.Data.Models; -namespace FilterLists.Data.Contracts.Repositories +namespace FilterLists.Data.Repositories.Contracts { public interface IListRepository { diff --git a/api/src/FilterLists.Data/Repositories/ListRepository.cs b/api/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs similarity index 78% rename from api/src/FilterLists.Data/Repositories/ListRepository.cs rename to api/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs index c6e277259..2f9f5bba5 100644 --- a/api/src/FilterLists.Data/Repositories/ListRepository.cs +++ b/api/src/FilterLists.Data/Repositories/Implementations/ListRepository.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; using FilterLists.Data.Contexts; -using FilterLists.Data.Contracts.Repositories; -using FilterLists.Models; +using FilterLists.Data.Models; +using FilterLists.Data.Repositories.Contracts; -namespace FilterLists.Data.Repositories +namespace FilterLists.Data.Repositories.Implementations { public class ListRepository : IListRepository { diff --git a/api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj b/api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj index 5784fbcc0..3e17cdb0e 100644 --- a/api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj +++ b/api/src/FilterLists.Services.Contracts/FilterLists.Services.Contracts.csproj @@ -4,8 +4,4 @@ netcoreapp1.1 - - - - \ No newline at end of file diff --git a/api/src/FilterLists.Services.Contracts/IListService.cs b/api/src/FilterLists.Services/Contracts/IListService.cs similarity index 84% rename from api/src/FilterLists.Services.Contracts/IListService.cs rename to api/src/FilterLists.Services/Contracts/IListService.cs index 4aa375cd6..4001a47db 100644 --- a/api/src/FilterLists.Services.Contracts/IListService.cs +++ b/api/src/FilterLists.Services/Contracts/IListService.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using FilterLists.Models; +using FilterLists.Data.Models; namespace FilterLists.Services.Contracts { diff --git a/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 35a31d5fa..86a1dd271 100644 --- a/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/api/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -1,4 +1,5 @@ using FilterLists.Services.Contracts; +using FilterLists.Services.Implementations; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -6,7 +7,7 @@ namespace FilterLists.Services.DependencyInjection.Extensions { public static class ConfigureServicesCollection { - public static IServiceCollection RegisterFilterListsServices(this IServiceCollection services) + public static IServiceCollection AddFilterListsServices(this IServiceCollection services) { services.TryAddScoped(); return services; diff --git a/api/src/FilterLists.Services/FilterLists.Services.csproj b/api/src/FilterLists.Services/FilterLists.Services.csproj index ec2285ff8..87038301a 100644 --- a/api/src/FilterLists.Services/FilterLists.Services.csproj +++ b/api/src/FilterLists.Services/FilterLists.Services.csproj @@ -9,9 +9,7 @@ - - - + \ No newline at end of file diff --git a/api/src/FilterLists.Services/ListService.cs b/api/src/FilterLists.Services/Implementations/ListService.cs similarity index 77% rename from api/src/FilterLists.Services/ListService.cs rename to api/src/FilterLists.Services/Implementations/ListService.cs index 360ca3cdc..455a275e3 100644 --- a/api/src/FilterLists.Services/ListService.cs +++ b/api/src/FilterLists.Services/Implementations/ListService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using FilterLists.Data.Contracts.Repositories; -using FilterLists.Models; +using FilterLists.Data.Models; +using FilterLists.Data.Repositories.Contracts; using FilterLists.Services.Contracts; -namespace FilterLists.Services +namespace FilterLists.Services.Implementations { public class ListService : IListService {