diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs b/services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs index b6a3ee34c..d7f653da7 100644 --- a/services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs +++ b/services/directory/src/FilterLists.Directory.Application/Queries/GetLicenses.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading; using System.Threading.Tasks; using AutoMapper; @@ -33,6 +34,7 @@ public async Task> Handle( CancellationToken cancellationToken) { return await _context.Licenses + .OrderBy(l => l.Id) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(cancellationToken); } @@ -42,7 +44,10 @@ public class LicenseViewModelProfile : Profile { public LicenseViewModelProfile() { - CreateMap(); + CreateMap() + .ForMember(l => l.FilterListIds, + o => o.MapFrom(l => + l.FilterLists.Select(fl => fl.Id).OrderBy(flid => flid))); } } @@ -50,8 +55,10 @@ public class LicenseViewModel { public int Id { get; private set; } public string Name { get; private set; } = null!; - public string? GitHubKey { get; private set; } public Uri? Url { get; private set; } + public bool PermitsModification { get; private set; } + public bool PermitsDistribution { get; private set; } + public bool PermitsCommercialUse { get; private set; } public IEnumerable? FilterListIds { get; private set; } } }