From b567696e2eee46e121762e6026106c11fc68a430 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 2 Nov 2021 14:36:32 -0500
Subject: [PATCH] =?UTF-8?q?refactor(dir):=20=E2=99=BB=20create=20inner=20t?=
 =?UTF-8?q?ype=20vm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Commands/ArchiveList.cs                        |  8 ++++----
 .../Models/ListDetailsVm.cs                        | 14 +++++++-------
 .../Queries/GetListDetails.cs                      |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs b/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs
index dfe21f8bd..eb39f83af 100644
--- a/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs
+++ b/services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs
@@ -68,19 +68,19 @@ public async Task<Unit> Handle(Command request, CancellationToken cancellationTo
                 return Unit.Value;
             }
 
-            private async Task<IEnumerable<ListDetailsViewUrlVm>> GetSegmentUrlsAsync(
+            private async Task<IEnumerable<ListDetailsVm.ViewUrlVm>> GetSegmentUrlsAsync(
                 int listId,
                 CancellationToken cancellationToken)
             {
                 var listDetails = await _directory.GetListDetailsAsync(listId, cancellationToken);
                 return listDetails.ViewUrls?
                            .GroupBy(u => u.SegmentNumber, (_, ue) => ue.OrderBy(u => u.Primariness).First()) ??
-                       new List<ListDetailsViewUrlVm>();
+                       new List<ListDetailsVm.ViewUrlVm>();
             }
 
             private ListArchive GetList(
                 int listId,
-                IEnumerable<ListDetailsViewUrlVm> segmentUrls,
+                IEnumerable<ListDetailsVm.ViewUrlVm> segmentUrls,
                 CancellationToken cancellationToken)
             {
                 var segmentsAsync = GetSegmentsAsync(segmentUrls, cancellationToken);
@@ -88,7 +88,7 @@ private ListArchive GetList(
             }
 
             private async IAsyncEnumerable<ListArchiveSegment> GetSegmentsAsync(
-                IEnumerable<ListDetailsViewUrlVm> segmentUrls,
+                IEnumerable<ListDetailsVm.ViewUrlVm> segmentUrls,
                 [EnumeratorCancellation] CancellationToken cancellationToken)
             {
                 foreach (var segment in segmentUrls)
diff --git a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
index 2a2b5d2e1..50fbf127a 100644
--- a/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
+++ b/services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
@@ -12,7 +12,7 @@ public class ListDetailsVm
         public IEnumerable<int>? SyntaxIds { get; set; }
         public IEnumerable<string>? Iso6391s { get; set; }
         public IEnumerable<int>? TagIds { get; set; }
-        public IEnumerable<ListDetailsViewUrlVm>? ViewUrls { get; set; }
+        public IEnumerable<ViewUrlVm>? ViewUrls { get; set; }
         public Uri? HomeUrl { get; set; }
         public Uri? OnionUrl { get; set; }
         public Uri? PolicyUrl { get; set; }
@@ -29,12 +29,12 @@ public class ListDetailsVm
         public IEnumerable<int>? IncludesFilterListIds { get; set; }
         public IEnumerable<int>? DependencyFilterListIds { get; set; }
         public IEnumerable<int>? DependentFilterListIds { get; set; }
-    }
 
-    public class ListDetailsViewUrlVm
-    {
-        public short SegmentNumber { get; set; }
-        public short Primariness { get; set; }
-        public Uri Url { get; set; } = null!;
+        public class ViewUrlVm
+        {
+            public short SegmentNumber { get; set; }
+            public short Primariness { get; set; }
+            public Uri Url { get; set; } = null!;
+        }
     }
 }
diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
index 90828555b..79870f246 100644
--- a/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
+++ b/services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
@@ -90,7 +90,7 @@ public ListDetailsVmProfile()
                             fl.DependentFilterLists.Select(dfl => dfl.DependentFilterListId).OrderBy(flid => flid)
                                 .AsEnumerable()));
 
-                CreateMap<FilterListViewUrl, ListDetailsViewUrlVm>();
+                CreateMap<FilterListViewUrl, ListDetailsVm.ViewUrlVm>();
             }
         }
     }