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 2

refactor(dir): ♻ re-order ViewUrls prop for consistency

Browse source
This commit is contained in:
Collin M. Barrett 2021-11-22 16:30:30 -06:00
parent b718fdde8b
commit 1bed7cd864
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs
View file

@ -60,6 +60,7 @@ public async Task<Response> Handle(Command request, CancellationToken cancellati
request.Name,
request.Description,
license,
request.ViewUrls.Select(u => (u.SegmentNumber, u.Primariness, u.Url)),
request.HomeUrl,
request.OnionUrl,
request.PolicyUrl,
@ -69,7 +70,6 @@ public async Task<Response> Handle(Command request, CancellationToken cancellati
request.ChatUrl,
request.EmailAddress,
request.DonateUrl,
request.ViewUrls.Select(u => (u.SegmentNumber, u.Primariness, u.Url)),
request.CreateReason);
_commandContext.FilterLists.Add(filterList);

4
services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterList.cs
View file

@ -12,6 +12,7 @@ protected FilterList() { }
public string Name { get; private init; } = null!;
public string? Description { get; private init; }
public virtual License License { get; private init; } = null!;
public virtual IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; private init; } = new HashSet<FilterListViewUrl>();
public Uri? HomeUrl { get; private init; }
public Uri? OnionUrl { get; private init; }
public Uri? PolicyUrl { get; private init; }
@ -21,13 +22,13 @@ protected FilterList() { }
public Uri? ChatUrl { get; private init; }
public string? EmailAddress { get; private init; }
public Uri? DonateUrl { get; private init; }
public virtual IReadOnlyCollection<FilterListViewUrl> ViewUrls { get; private init; } = new HashSet<FilterListViewUrl>();
public virtual IReadOnlyCollection<FilterListChange> Changes => (IReadOnlyCollection<FilterListChange>)_changes;
public static FilterList Create(
string name,
string? description,
License license,
IEnumerable<(short SegmentNumber, short Primariness, Uri Url)> viewUrls,
Uri? homeUrl,
Uri? onionUrl,
Uri? policyUrl,
@ -37,7 +38,6 @@ public static FilterList Create(
Uri? chatUrl,
string? emailAddress,
Uri? donateUrl,
IEnumerable<(short SegmentNumber, short Primariness, Uri Url)> viewUrls,
string? createReason)
{
var urls = viewUrls.Select(u => FilterListViewUrl.Create(u.SegmentNumber, u.Primariness, u.Url))

10
services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterListRecord.cs
View file

@ -6,6 +6,7 @@ public record FilterListRecord(
string Name,
string? Description,
License License,
IReadOnlyCollection<FilterListViewUrl> ViewUrls,
Uri? HomeUrl,
Uri? OnionUrl,
Uri? PolicyUrl,
@ -14,8 +15,8 @@ public record FilterListRecord(
Uri? ForumUrl,
Uri? ChatUrl,
string? EmailAddress,
Uri? DonateUrl,
IReadOnlyCollection<FilterListViewUrl> ViewUrls)
Uri? DonateUrl
)
{
public static FilterListRecord FromFilterList(FilterList filterList)
{
@ -23,6 +24,7 @@ public static FilterListRecord FromFilterList(FilterList filterList)
filterList.Name,
filterList.Description,
filterList.License,
filterList.ViewUrls,
filterList.HomeUrl,
filterList.OnionUrl,
filterList.PolicyUrl,
@ -31,7 +33,7 @@ public static FilterListRecord FromFilterList(FilterList filterList)
filterList.ForumUrl,
filterList.ChatUrl,
filterList.EmailAddress,
filterList.DonateUrl,
filterList.ViewUrls);
filterList.DonateUrl
);
}
}