diff --git a/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs b/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs index 17d365036..a3a211dd8 100644 --- a/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs +++ b/services/Directory/FilterLists.Directory.Application/Commands/CreateList.cs @@ -60,6 +60,7 @@ public async Task 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 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); diff --git a/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterList.cs b/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterList.cs index 1deec7dd4..54479a315 100644 --- a/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterList.cs +++ b/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterList.cs @@ -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 ViewUrls { get; private init; } = new HashSet(); 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 ViewUrls { get; private init; } = new HashSet(); public virtual IReadOnlyCollection Changes => (IReadOnlyCollection)_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)) diff --git a/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterListRecord.cs b/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterListRecord.cs index 069c87f03..0f9615e32 100644 --- a/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterListRecord.cs +++ b/services/Directory/FilterLists.Directory.Domain/Aggregates/FilterLists/FilterListRecord.cs @@ -6,6 +6,7 @@ public record FilterListRecord( string Name, string? Description, License License, + IReadOnlyCollection ViewUrls, Uri? HomeUrl, Uri? OnionUrl, Uri? PolicyUrl, @@ -14,8 +15,8 @@ public record FilterListRecord( Uri? ForumUrl, Uri? ChatUrl, string? EmailAddress, - Uri? DonateUrl, - IReadOnlyCollection 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 + ); } }