rename FilterListService -> ListService

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<IActionResult> GetAll() =>
-            await Get(() => filterListService.GetAllAsync());
+            await Get(() => listService.GetAllAsync());
 
         [HttpGet]
         [Route("{id}")]
         public async Task<IActionResult> GetById(int id) =>
-            await Get(() => filterListService.GetDetailsAsync(id), id);
+            await Get(() => listService.GetDetailsAsync(id), id);
 
         [HttpGet("seed")]
         public async Task<IActionResult> Seed() =>

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<FilterListsDbContext>(o =>
                         o.UseMySql(config.GetConnectionString("FilterListsConnection"),
                             m => m.MigrationsAssembly("FilterLists.Api")));
-            services.TryAddScoped<FilterListService>();
+            services.TryAddScoped<ListService>();
             services.TryAddScoped<LanguageService>();
             services.TryAddScoped<SeedService>();
             services.TryAddScoped<SoftwareService>();

src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs

@@ -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<ListDetails> FilterParentListFromMaintainerAdditionalLists(
-            this Task<ListDetails> listDetailsDtos)
-        {
-            foreach (var maintainer in listDetailsDtos.Result.Maintainers)
-                maintainer.AdditionalLists = maintainer
-                                             .AdditionalLists.Where(additionalList =>
-                                                 additionalList.Id != listDetailsDtos.Result.Id)
-                                             .ToList();
-            return await listDetailsDtos;
-        }
-    }
-}

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<IEnumerable<List>> GetAllAsync() =>
+        public async Task<IEnumerable<Models.List>> GetAllAsync() =>
             await DbContext.FilterLists
                            .OrderBy(l => l.Name)
-                           .ProjectTo<List>(MapConfig)
+                           .ProjectTo<Models.List>(MapConfig)
                            .ToListAsync();
 
         public async Task<ListDetails> GetDetailsAsync(int id) =>

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<ListDetails> FilterParentListFromMaintainerAdditionalLists(
+            this Task<ListDetails> listDetailsDtos)
+        {
+            foreach (var maintainer in listDetailsDtos.Result.Maintainers)
+                maintainer.AdditionalLists = maintainer.AdditionalLists
+                                                       .Where(a => a.Id != listDetailsDtos.Result.Id)
+                                                       .ToList();
+            return await listDetailsDtos;
+        }
+    }
+}

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

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

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<Data.Entities.FilterList, List>()
+            CreateMap<Data.Entities.FilterList, Models.List>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
                         (int)src.Id))

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

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

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

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

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

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

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

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

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

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

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

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

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

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
     {

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;