From 16350fbea0481d48b0eec58e541d8ed570eaa1b5 Mon Sep 17 00:00:00 2001 From: collinbarrett Date: Wed, 26 Sep 2018 10:06:12 -0500 Subject: [PATCH] rename FilterListService -> ListService --- .../V1/Controllers/ListsController.cs | 12 +++++------ .../Extensions/ConfigureServicesCollection.cs | 3 ++- .../FilterList/FilterListServiceExtensions.cs | 20 ------------------- .../ListService.cs} | 12 +++++------ .../List/ListServiceExtensions.cs | 19 ++++++++++++++++++ .../ListDetailsDtoMappingProfile.cs | 4 ++-- .../ListMaintainerDtoMappingProfile.cs | 4 ++-- .../MappingProfiles/ListMappingProfile.cs | 5 ++--- .../ListSyntaxDtoMappingProfile.cs | 4 ++-- .../ListTagDtoMappingProfile.cs | 4 ++-- ...ntainerAdditionalListsDtoMappingProfile.cs | 5 ++--- ...yntaxSupportedSoftwareDtoMappingProfile.cs | 4 ++-- .../{FilterList => List}/Models/List.cs | 2 +- .../Models/ListDetails.cs | 2 +- .../Models/ListLanguagesDto.cs | 2 +- .../Models/ListLicenseDto.cs | 2 +- .../Models/ListMaintainerDto.cs | 2 +- .../Models/ListSyntaxDto.cs | 2 +- .../{FilterList => List}/Models/ListTagDto.cs | 2 +- .../Models/MaintainerAdditionalListsDto.cs | 2 +- .../Models/SyntaxSupportedSoftwareDto.cs | 2 +- .../{FilterList => List}/TagColors.cs | 2 +- src/FilterLists.Services/Service.cs | 6 +++--- 23 files changed, 60 insertions(+), 62 deletions(-) delete mode 100644 src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs rename src/FilterLists.Services/{FilterList/FilterListService.cs => List/ListService.cs} (67%) create mode 100644 src/FilterLists.Services/List/ListServiceExtensions.cs rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/ListDetailsDtoMappingProfile.cs (95%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/ListMaintainerDtoMappingProfile.cs (85%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/ListMappingProfile.cs (93%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/ListSyntaxDtoMappingProfile.cs (83%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/ListTagDtoMappingProfile.cs (79%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs (75%) rename src/FilterLists.Services/{FilterList => List}/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs (80%) rename src/FilterLists.Services/{FilterList => List}/Models/List.cs (92%) rename src/FilterLists.Services/{FilterList => List}/Models/ListDetails.cs (96%) rename src/FilterLists.Services/{FilterList => List}/Models/ListLanguagesDto.cs (79%) rename src/FilterLists.Services/{FilterList => List}/Models/ListLicenseDto.cs (79%) rename src/FilterLists.Services/{FilterList => List}/Models/ListMaintainerDto.cs (90%) rename src/FilterLists.Services/{FilterList => List}/Models/ListSyntaxDto.cs (86%) rename src/FilterLists.Services/{FilterList => List}/Models/ListTagDto.cs (82%) rename src/FilterLists.Services/{FilterList => List}/Models/MaintainerAdditionalListsDto.cs (79%) rename src/FilterLists.Services/{FilterList => List}/Models/SyntaxSupportedSoftwareDto.cs (82%) rename src/FilterLists.Services/{FilterList => List}/TagColors.cs (96%) diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs index 05237fe70..0fa41a990 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Api.V1.Interfaces; using FilterLists.Data.Entities; -using FilterLists.Services.FilterList; +using FilterLists.Services.List; using FilterLists.Services.Seed; using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; @@ -11,19 +11,19 @@ namespace FilterLists.Api.V1.Controllers { public class ListsController : BaseController, IGet, ISeed { - private readonly FilterListService filterListService; + private readonly ListService listService; - public ListsController(IMemoryCache memoryCache, SeedService seedService, FilterListService filterListService) : - base(memoryCache, seedService) => this.filterListService = filterListService; + public ListsController(IMemoryCache memoryCache, SeedService seedService, ListService listService) : + base(memoryCache, seedService) => this.listService = listService; [HttpGet] public async Task GetAll() => - await Get(() => filterListService.GetAllAsync()); + await Get(() => listService.GetAllAsync()); [HttpGet] [Route("{id}")] public async Task GetById(int id) => - await Get(() => filterListService.GetDetailsAsync(id), id); + await Get(() => listService.GetDetailsAsync(id), id); [HttpGet("seed")] public async Task Seed() => diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 61a4aac53..5e03d2a92 100644 --- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -2,6 +2,7 @@ using FilterLists.Data; using FilterLists.Services.FilterList; using FilterLists.Services.Language; +using FilterLists.Services.List; using FilterLists.Services.Seed; using FilterLists.Services.Snapshot; using FilterLists.Services.Software; @@ -22,7 +23,7 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I .AddDbContextPool(o => o.UseMySql(config.GetConnectionString("FilterListsConnection"), m => m.MigrationsAssembly("FilterLists.Api"))); - services.TryAddScoped(); + services.TryAddScoped(); services.TryAddScoped(); services.TryAddScoped(); services.TryAddScoped(); diff --git a/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs b/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs deleted file mode 100644 index 6315bf396..000000000 --- a/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Linq; -using System.Threading.Tasks; -using FilterLists.Services.FilterList.Models; - -namespace FilterLists.Services.FilterList -{ - public static class FilterListServiceExtensions - { - public static async Task FilterParentListFromMaintainerAdditionalLists( - this Task listDetailsDtos) - { - foreach (var maintainer in listDetailsDtos.Result.Maintainers) - maintainer.AdditionalLists = maintainer - .AdditionalLists.Where(additionalList => - additionalList.Id != listDetailsDtos.Result.Id) - .ToList(); - return await listDetailsDtos; - } - } -} \ No newline at end of file diff --git a/src/FilterLists.Services/FilterList/FilterListService.cs b/src/FilterLists.Services/List/ListService.cs similarity index 67% rename from src/FilterLists.Services/FilterList/FilterListService.cs rename to src/FilterLists.Services/List/ListService.cs index 2c1b8d6c1..7e986b919 100644 --- a/src/FilterLists.Services/FilterList/FilterListService.cs +++ b/src/FilterLists.Services/List/ListService.cs @@ -4,22 +4,22 @@ using AutoMapper; using AutoMapper.QueryableExtensions; using FilterLists.Data; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Services.FilterList +namespace FilterLists.Services.List { - public class FilterListService : Service + public class ListService : Service { - public FilterListService(FilterListsDbContext dbContext, IConfigurationProvider mapConfig) + public ListService(FilterListsDbContext dbContext, IConfigurationProvider mapConfig) : base(dbContext, mapConfig) { } - public async Task> GetAllAsync() => + public async Task> GetAllAsync() => await DbContext.FilterLists .OrderBy(l => l.Name) - .ProjectTo(MapConfig) + .ProjectTo(MapConfig) .ToListAsync(); public async Task GetDetailsAsync(int id) => diff --git a/src/FilterLists.Services/List/ListServiceExtensions.cs b/src/FilterLists.Services/List/ListServiceExtensions.cs new file mode 100644 index 000000000..415cd80e1 --- /dev/null +++ b/src/FilterLists.Services/List/ListServiceExtensions.cs @@ -0,0 +1,19 @@ +using System.Linq; +using System.Threading.Tasks; +using FilterLists.Services.List.Models; + +namespace FilterLists.Services.List +{ + public static class ListServiceExtensions + { + public static async Task FilterParentListFromMaintainerAdditionalLists( + this Task listDetailsDtos) + { + foreach (var maintainer in listDetailsDtos.Result.Maintainers) + maintainer.AdditionalLists = maintainer.AdditionalLists + .Where(a => a.Id != listDetailsDtos.Result.Id) + .ToList(); + return await listDetailsDtos; + } + } +} \ No newline at end of file diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/ListDetailsDtoMappingProfile.cs similarity index 95% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/ListDetailsDtoMappingProfile.cs index 2e875eccb..502e8f550 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/ListDetailsDtoMappingProfile.cs @@ -1,9 +1,9 @@ using System.Linq; using AutoMapper; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class ListDetailsDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListMaintainerDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/ListMaintainerDtoMappingProfile.cs similarity index 85% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListMaintainerDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/ListMaintainerDtoMappingProfile.cs index f90014515..c6e9e390c 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListMaintainerDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/ListMaintainerDtoMappingProfile.cs @@ -1,10 +1,10 @@ using System.Linq; using AutoMapper; using FilterLists.Data.Entities; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class ListMaintainerDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/ListMappingProfile.cs similarity index 93% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/ListMappingProfile.cs index 153073352..3ce9299df 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/ListMappingProfile.cs @@ -1,16 +1,15 @@ using System.Collections.Generic; using System.Linq; using AutoMapper; -using FilterLists.Services.FilterList.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class ListMappingProfile : Profile { public ListMappingProfile() => - CreateMap() + CreateMap() .ForMember(dest => dest.Id, opt => opt.MapFrom(src => (int)src.Id)) diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListSyntaxDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/ListSyntaxDtoMappingProfile.cs similarity index 83% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListSyntaxDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/ListSyntaxDtoMappingProfile.cs index fe4f7be25..dbf8e7657 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListSyntaxDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/ListSyntaxDtoMappingProfile.cs @@ -1,10 +1,10 @@ using System.Linq; using AutoMapper; using FilterLists.Data.Entities; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class ListSyntaxDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListTagDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/ListTagDtoMappingProfile.cs similarity index 79% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListTagDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/ListTagDtoMappingProfile.cs index d4ff92e9c..3f93b1005 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListTagDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/ListTagDtoMappingProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class ListTagDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs similarity index 75% rename from src/FilterLists.Services/FilterList/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs index 6e3bcd78b..80085873e 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/MaintainerAdditionalListsDtoMappingProfile.cs @@ -1,9 +1,8 @@ using AutoMapper; -using FilterLists.Data.Entities; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class MaintainerAdditionalListsDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs b/src/FilterLists.Services/List/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs similarity index 80% rename from src/FilterLists.Services/FilterList/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs rename to src/FilterLists.Services/List/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs index 5281f1636..dc8f34ffe 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs +++ b/src/FilterLists.Services/List/MappingProfiles/SyntaxSupportedSoftwareDtoMappingProfile.cs @@ -1,8 +1,8 @@ using AutoMapper; -using FilterLists.Services.FilterList.Models; +using FilterLists.Services.List.Models; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.MappingProfiles +namespace FilterLists.Services.List.MappingProfiles { [UsedImplicitly] public class SyntaxSupportedSoftwareDtoMappingProfile : Profile diff --git a/src/FilterLists.Services/FilterList/Models/List.cs b/src/FilterLists.Services/List/Models/List.cs similarity index 92% rename from src/FilterLists.Services/FilterList/Models/List.cs rename to src/FilterLists.Services/List/Models/List.cs index b186b0ee2..926a4bcd7 100644 --- a/src/FilterLists.Services/FilterList/Models/List.cs +++ b/src/FilterLists.Services/List/Models/List.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class List diff --git a/src/FilterLists.Services/FilterList/Models/ListDetails.cs b/src/FilterLists.Services/List/Models/ListDetails.cs similarity index 96% rename from src/FilterLists.Services/FilterList/Models/ListDetails.cs rename to src/FilterLists.Services/List/Models/ListDetails.cs index ae2943169..2b7a71134 100644 --- a/src/FilterLists.Services/FilterList/Models/ListDetails.cs +++ b/src/FilterLists.Services/List/Models/ListDetails.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListDetails diff --git a/src/FilterLists.Services/FilterList/Models/ListLanguagesDto.cs b/src/FilterLists.Services/List/Models/ListLanguagesDto.cs similarity index 79% rename from src/FilterLists.Services/FilterList/Models/ListLanguagesDto.cs rename to src/FilterLists.Services/List/Models/ListLanguagesDto.cs index 547cd3181..2b2e9b534 100644 --- a/src/FilterLists.Services/FilterList/Models/ListLanguagesDto.cs +++ b/src/FilterLists.Services/List/Models/ListLanguagesDto.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListLanguagesDto diff --git a/src/FilterLists.Services/FilterList/Models/ListLicenseDto.cs b/src/FilterLists.Services/List/Models/ListLicenseDto.cs similarity index 79% rename from src/FilterLists.Services/FilterList/Models/ListLicenseDto.cs rename to src/FilterLists.Services/List/Models/ListLicenseDto.cs index d051cba00..a57465310 100644 --- a/src/FilterLists.Services/FilterList/Models/ListLicenseDto.cs +++ b/src/FilterLists.Services/List/Models/ListLicenseDto.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListLicenseDto diff --git a/src/FilterLists.Services/FilterList/Models/ListMaintainerDto.cs b/src/FilterLists.Services/List/Models/ListMaintainerDto.cs similarity index 90% rename from src/FilterLists.Services/FilterList/Models/ListMaintainerDto.cs rename to src/FilterLists.Services/List/Models/ListMaintainerDto.cs index bcdc8f60d..c65f6a018 100644 --- a/src/FilterLists.Services/FilterList/Models/ListMaintainerDto.cs +++ b/src/FilterLists.Services/List/Models/ListMaintainerDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListMaintainerDto diff --git a/src/FilterLists.Services/FilterList/Models/ListSyntaxDto.cs b/src/FilterLists.Services/List/Models/ListSyntaxDto.cs similarity index 86% rename from src/FilterLists.Services/FilterList/Models/ListSyntaxDto.cs rename to src/FilterLists.Services/List/Models/ListSyntaxDto.cs index 9254b0cc6..5ebe7c939 100644 --- a/src/FilterLists.Services/FilterList/Models/ListSyntaxDto.cs +++ b/src/FilterLists.Services/List/Models/ListSyntaxDto.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListSyntaxDto diff --git a/src/FilterLists.Services/FilterList/Models/ListTagDto.cs b/src/FilterLists.Services/List/Models/ListTagDto.cs similarity index 82% rename from src/FilterLists.Services/FilterList/Models/ListTagDto.cs rename to src/FilterLists.Services/List/Models/ListTagDto.cs index f2f1843be..76e63f0ad 100644 --- a/src/FilterLists.Services/FilterList/Models/ListTagDto.cs +++ b/src/FilterLists.Services/List/Models/ListTagDto.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class ListTagDto diff --git a/src/FilterLists.Services/FilterList/Models/MaintainerAdditionalListsDto.cs b/src/FilterLists.Services/List/Models/MaintainerAdditionalListsDto.cs similarity index 79% rename from src/FilterLists.Services/FilterList/Models/MaintainerAdditionalListsDto.cs rename to src/FilterLists.Services/List/Models/MaintainerAdditionalListsDto.cs index 2815848ff..57d90d923 100644 --- a/src/FilterLists.Services/FilterList/Models/MaintainerAdditionalListsDto.cs +++ b/src/FilterLists.Services/List/Models/MaintainerAdditionalListsDto.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class MaintainerAdditionalListsDto diff --git a/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs b/src/FilterLists.Services/List/Models/SyntaxSupportedSoftwareDto.cs similarity index 82% rename from src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs rename to src/FilterLists.Services/List/Models/SyntaxSupportedSoftwareDto.cs index 76ec24749..9c0891383 100644 --- a/src/FilterLists.Services/FilterList/Models/SyntaxSupportedSoftwareDto.cs +++ b/src/FilterLists.Services/List/Models/SyntaxSupportedSoftwareDto.cs @@ -1,6 +1,6 @@ using JetBrains.Annotations; -namespace FilterLists.Services.FilterList.Models +namespace FilterLists.Services.List.Models { [UsedImplicitly] public class SyntaxSupportedSoftwareDto diff --git a/src/FilterLists.Services/FilterList/TagColors.cs b/src/FilterLists.Services/List/TagColors.cs similarity index 96% rename from src/FilterLists.Services/FilterList/TagColors.cs rename to src/FilterLists.Services/List/TagColors.cs index 1e6c5e8f3..b6b6a0ce2 100644 --- a/src/FilterLists.Services/FilterList/TagColors.cs +++ b/src/FilterLists.Services/List/TagColors.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; -namespace FilterLists.Services.FilterList +namespace FilterLists.Services.List { public static class TagColors { diff --git a/src/FilterLists.Services/Service.cs b/src/FilterLists.Services/Service.cs index a3d81f479..c08055eac 100644 --- a/src/FilterLists.Services/Service.cs +++ b/src/FilterLists.Services/Service.cs @@ -5,14 +5,14 @@ namespace FilterLists.Services { [UsedImplicitly] - public class Service + public abstract class Service { protected readonly FilterListsDbContext DbContext; protected readonly IConfigurationProvider MapConfig; - public Service(FilterListsDbContext dbContext) => DbContext = dbContext; + protected Service(FilterListsDbContext dbContext) => DbContext = dbContext; - public Service(FilterListsDbContext dbContext, IConfigurationProvider mapConfig) + protected Service(FilterListsDbContext dbContext, IConfigurationProvider mapConfig) { DbContext = dbContext; MapConfig = mapConfig;