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 Handle(Command request, CancellationToken cancellationTo return Unit.Value; } - private async Task> GetSegmentUrlsAsync( + private async Task> 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(); + new List(); } private ListArchive GetList( int listId, - IEnumerable segmentUrls, + IEnumerable segmentUrls, CancellationToken cancellationToken) { var segmentsAsync = GetSegmentsAsync(segmentUrls, cancellationToken); @@ -88,7 +88,7 @@ private ListArchive GetList( } private async IAsyncEnumerable GetSegmentsAsync( - IEnumerable segmentUrls, + IEnumerable 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? SyntaxIds { get; set; } public IEnumerable? Iso6391s { get; set; } public IEnumerable? TagIds { get; set; } - public IEnumerable? ViewUrls { get; set; } + public IEnumerable? 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? IncludesFilterListIds { get; set; } public IEnumerable? DependencyFilterListIds { get; set; } public IEnumerable? 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(); + CreateMap(); } } }