diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs index aec1532d6..937933b68 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLanguages.cs @@ -15,10 +15,7 @@ public async Task> ExecuteAsync(CancellationToken ct) .Select(l => new Response( l.Id, l.Iso6391, - l.Name, - l.FilterListLanguages - .OrderBy(fl => fl.FilterListId) - .Select(fl => fl.FilterListId) + l.Name )) .TagWith(nameof(GetLanguages)) .ToListAsync(ct); @@ -28,6 +25,5 @@ public async Task> ExecuteAsync(CancellationToken ct) /// The identifier. /// The unique ISO 639-1 code. /// The unique ISO name. - /// The identifiers of the FilterLists targeted by this Language. - public sealed record Response(short Id, string Iso6391, string Name, IEnumerable FilterListIds); + public sealed record Response(short Id, string Iso6391, string Name); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs index 2252d03cc..a9ed959b6 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetLicenses.cs @@ -18,10 +18,7 @@ public async Task> ExecuteAsync(CancellationToken ct) l.Url, l.PermitsModification, l.PermitsDistribution, - l.PermitsCommercialUse, - l.FilterLists - .OrderBy(f => f.Id) - .Select(f => f.Id) + l.PermitsCommercialUse )) .TagWith(nameof(GetLicenses)) .ToListAsync(ct); @@ -34,13 +31,11 @@ public async Task> ExecuteAsync(CancellationToken ct) /// If the License permits modification. /// If the License permits distribution. /// If the License permits commercial use. - /// The identifiers of the FilterLists released under this License. public sealed record Response( int Id, string Name, Uri? Url, bool PermitsModification, bool PermitsDistribution, - bool PermitsCommercialUse, - IEnumerable FilterListIds); + bool PermitsCommercialUse); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs index b90178c02..8137bef0a 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetMaintainers.cs @@ -17,10 +17,7 @@ public async Task> ExecuteAsync(CancellationToken ct) m.Name, m.Url, m.EmailAddress, - m.TwitterHandle, - m.FilterListMaintainers - .OrderBy(fm => fm.FilterListId) - .Select(fm => fm.FilterListId) + m.TwitterHandle )) .TagWith(nameof(GetMaintainers)) .ToListAsync(ct); @@ -32,12 +29,10 @@ public async Task> ExecuteAsync(CancellationToken ct) /// The URL of the home page. /// The email address. /// The Twitter handle. - /// The identifiers of the FilterLists maintained by this Maintainer. public sealed record Response( int Id, string Name, Uri? Url, string? EmailAddress, - string? TwitterHandle, - IEnumerable FilterListIds); + string? TwitterHandle); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs index daefa2f0c..9d43e9e7d 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetSyntaxes.cs @@ -17,13 +17,7 @@ public async Task> ExecuteAsync(CancellationToken ct) s.Id, s.Name, s.Description, - s.Url, - s.FilterListSyntaxes - .OrderBy(fs => fs.FilterListId) - .Select(fs => fs.FilterListId), - s.SoftwareSyntaxes - .OrderBy(ss => ss.SoftwareId) - .Select(ss => ss.SoftwareId) + s.Url )) .TagWith(nameof(GetSyntaxes)) .ToListAsync(ct); @@ -34,13 +28,9 @@ public async Task> ExecuteAsync(CancellationToken ct) /// The unique name. /// The description. /// The URL of the home page. - /// The identifiers of the FilterLists implementing this Syntax. - /// The identifiers of the Software that supports this Syntax. public sealed record Response( short Id, string Name, string? Description, - Uri? Url, - IEnumerable FilterListIds, - IEnumerable SoftwareIds); + Uri? Url); } \ No newline at end of file diff --git a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs index 4b163f1d2..b66193a3e 100644 --- a/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs +++ b/services/Directory/FilterLists.Directory.Application/Queries/GetTags.cs @@ -16,10 +16,7 @@ public async Task> ExecuteAsync(CancellationToken ct) ( t.Id, t.Name, - t.Description, - t.FilterListTags - .OrderBy(flt => flt.FilterListId) - .Select(flt => flt.FilterListId) + t.Description )) .TagWith(nameof(GetTags)) .ToListAsync(ct); @@ -29,6 +26,5 @@ public async Task> ExecuteAsync(CancellationToken ct) /// The identifier. /// The unique name. /// The description. - /// The identifiers of the FilterLists to which this Tag is applied. - public sealed record Response(int Id, string Name, string? Description, IEnumerable FilterListIds); + public sealed record Response(int Id, string Name, string? Description); } \ No newline at end of file diff --git a/web/src/interfaces/Language.ts b/web/src/interfaces/Language.ts index 1f02265f2..e5ef4972c 100644 --- a/web/src/interfaces/Language.ts +++ b/web/src/interfaces/Language.ts @@ -2,5 +2,4 @@ export interface Language { id: number; iso6391: string; name: string; - filterListIds: number[]; } diff --git a/web/src/interfaces/License.ts b/web/src/interfaces/License.ts index 0335c8e4b..22e392155 100644 --- a/web/src/interfaces/License.ts +++ b/web/src/interfaces/License.ts @@ -5,5 +5,4 @@ export interface License { permitsModification: boolean; permitsDistribution: boolean; permitsCommercialUse: boolean; - filterListIds: number[]; } diff --git a/web/src/interfaces/Maintainer.ts b/web/src/interfaces/Maintainer.ts index d98163588..bc8e3be04 100644 --- a/web/src/interfaces/Maintainer.ts +++ b/web/src/interfaces/Maintainer.ts @@ -4,5 +4,4 @@ export interface Maintainer { url?: string; emailAddress?: string; twitterHandle?: string; - filterListIds: number[]; } diff --git a/web/src/interfaces/Syntax.ts b/web/src/interfaces/Syntax.ts index 0709b8188..9b409bfea 100644 --- a/web/src/interfaces/Syntax.ts +++ b/web/src/interfaces/Syntax.ts @@ -3,6 +3,4 @@ export interface Syntax { name: string; description?: string; url?: string; - filterListIds: number[]; - softwareIds: number[]; } diff --git a/web/src/interfaces/Tag.ts b/web/src/interfaces/Tag.ts index 3c2c4a6a6..068c32671 100644 --- a/web/src/interfaces/Tag.ts +++ b/web/src/interfaces/Tag.ts @@ -2,5 +2,4 @@ export interface Tag { id: number; name: string; description?: string; - filterListIds: number[]; }