From 09c33f681913801666de342e1d45bd932c6320f9 Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Mon, 24 Sep 2018 20:28:13 -0500
Subject: [PATCH] api plumbing tweaks

---
 src/FilterLists.Api/V1/Controllers/ListsController.cs    | 2 +-
 src/FilterLists.Services/FilterList/FilterListService.cs | 9 +++++----
 .../FilterList/FilterListServiceExtensions.cs            | 4 ++--
 .../MappingProfiles/ListDetailsDtoMappingProfile.cs      | 2 +-
 .../MappingProfiles/ListIndexRecordMappingProfile.cs     | 2 +-
 .../FilterList/Models/{ListIndexRecord.cs => List.cs}    | 2 +-
 .../Models/{ListDetailsDto.cs => ListDetails.cs}         | 2 +-
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename src/FilterLists.Services/FilterList/Models/{ListIndexRecord.cs => List.cs} (95%)
 rename src/FilterLists.Services/FilterList/Models/{ListDetailsDto.cs => ListDetails.cs} (97%)

diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs
index 4acbaef32..c6bfe7667 100644
--- a/src/FilterLists.Api/V1/Controllers/ListsController.cs
+++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs
@@ -20,7 +20,7 @@ public async Task<IActionResult> Index() =>
             Json(await MemoryCache.GetOrCreate("ListsController_Index", entry =>
             {
                 entry.AbsoluteExpirationRelativeToNow = MemoryCacheExpirationDefault;
-                return filterListService.GetIndexAsync();
+                return filterListService.GetAllAsync();
             }));
 
         [HttpGet]
diff --git a/src/FilterLists.Services/FilterList/FilterListService.cs b/src/FilterLists.Services/FilterList/FilterListService.cs
index 73e6d8261..e3f450860 100644
--- a/src/FilterLists.Services/FilterList/FilterListService.cs
+++ b/src/FilterLists.Services/FilterList/FilterListService.cs
@@ -16,14 +16,15 @@ public FilterListService(FilterListsDbContext dbContext, IConfigurationProvider
         {
         }
 
-        public async Task<IEnumerable<ListIndexRecord>> GetIndexAsync() =>
+        public async Task<IEnumerable<List>> GetAllAsync() =>
             await DbContext.FilterLists
                            .OrderBy(l => l.Name)
-                           .ProjectTo<ListIndexRecord>(MapConfig)
+                           .ProjectTo<List>(MapConfig)
                            .ToListAsync();
 
-        public async Task<ListDetailsDto> GetDetailsAsync(uint id) =>
-            await DbContext.FilterLists.ProjectTo<ListDetailsDto>(MapConfig)
+        public async Task<ListDetails> GetDetailsAsync(uint id) =>
+            await DbContext.FilterLists
+                           .ProjectTo<ListDetails>(MapConfig)
                            .FirstOrDefaultAsync(x => x.Id == id)
                            .FilterParentListFromMaintainerAdditionalLists();
     }
diff --git a/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs b/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs
index 56a097c17..6315bf396 100644
--- a/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs
+++ b/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs
@@ -6,8 +6,8 @@ namespace FilterLists.Services.FilterList
 {
     public static class FilterListServiceExtensions
     {
-        public static async Task<ListDetailsDto> FilterParentListFromMaintainerAdditionalLists(
-            this Task<ListDetailsDto> listDetailsDtos)
+        public static async Task<ListDetails> FilterParentListFromMaintainerAdditionalLists(
+            this Task<ListDetails> listDetailsDtos)
         {
             foreach (var maintainer in listDetailsDtos.Result.Maintainers)
                 maintainer.AdditionalLists = maintainer
diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs
index 4bce442c9..2e875eccb 100644
--- a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs
+++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs
@@ -9,7 +9,7 @@ namespace FilterLists.Services.FilterList.MappingProfiles
     public class ListDetailsDtoMappingProfile : Profile
     {
         public ListDetailsDtoMappingProfile() =>
-            CreateMap<Data.Entities.FilterList, ListDetailsDto>()
+            CreateMap<Data.Entities.FilterList, ListDetails>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
                         (int)src.Id))
diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListIndexRecordMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListIndexRecordMappingProfile.cs
index 084dcc875..f1aee6be1 100644
--- a/src/FilterLists.Services/FilterList/MappingProfiles/ListIndexRecordMappingProfile.cs
+++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListIndexRecordMappingProfile.cs
@@ -10,7 +10,7 @@ namespace FilterLists.Services.FilterList.MappingProfiles
     public class ListIndexRecordMappingProfile : Profile
     {
         public ListIndexRecordMappingProfile() =>
-            CreateMap<Data.Entities.FilterList, ListIndexRecord>()
+            CreateMap<Data.Entities.FilterList, List>()
                 .ForMember(dest => dest.Id,
                     opt => opt.MapFrom(src =>
                         (int)src.Id))
diff --git a/src/FilterLists.Services/FilterList/Models/ListIndexRecord.cs b/src/FilterLists.Services/FilterList/Models/List.cs
similarity index 95%
rename from src/FilterLists.Services/FilterList/Models/ListIndexRecord.cs
rename to src/FilterLists.Services/FilterList/Models/List.cs
index 1f139d631..b186b0ee2 100644
--- a/src/FilterLists.Services/FilterList/Models/ListIndexRecord.cs
+++ b/src/FilterLists.Services/FilterList/Models/List.cs
@@ -5,7 +5,7 @@
 namespace FilterLists.Services.FilterList.Models
 {
     [UsedImplicitly]
-    public class ListIndexRecord
+    public class List
     {
         public int Id { get; set; }
         public List<int> LanguageIds { get; set; }
diff --git a/src/FilterLists.Services/FilterList/Models/ListDetailsDto.cs b/src/FilterLists.Services/FilterList/Models/ListDetails.cs
similarity index 97%
rename from src/FilterLists.Services/FilterList/Models/ListDetailsDto.cs
rename to src/FilterLists.Services/FilterList/Models/ListDetails.cs
index cdfca51bf..ae2943169 100644
--- a/src/FilterLists.Services/FilterList/Models/ListDetailsDto.cs
+++ b/src/FilterLists.Services/FilterList/Models/ListDetails.cs
@@ -5,7 +5,7 @@
 namespace FilterLists.Services.FilterList.Models
 {
     [UsedImplicitly]
-    public class ListDetailsDto
+    public class ListDetails
     {
         public int Id { get; set; }
         public string ChatUrl { get; set; }