prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(dir): ♻ create inner type vm

Browse source
This commit is contained in:
Collin M. Barrett 2021-11-02 14:36:32 -05:00
parent 2583507c5e
commit b567696e2e
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/Archival/FilterLists.Archival.Application/Commands/ArchiveList.cs
View file

@ -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)

14
services/Directory/FilterLists.Directory.Api.Contracts/Models/ListDetailsVm.cs
View file

@ -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!;
}
}
}

2
services/Directory/FilterLists.Directory.Application/Queries/GetListDetails.cs
View file

@ -90,7 +90,7 @@ public ListDetailsVmProfile()
fl.DependentFilterLists.Select(dfl => dfl.DependentFilterListId).OrderBy(flid => flid)
.AsEnumerable()));
CreateMap<FilterListViewUrl, ListDetailsViewUrlVm>();
CreateMap<FilterListViewUrl, ListDetailsVm.ViewUrlVm>();
}
}
}