diff --git a/services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs b/services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs index d36bf5139..821a1acb0 100644 --- a/services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.cs +++ b/services/directory/src/FilterLists.Directory.Application/Queries/GetSyntaxes.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.Syntaxes + .OrderBy(s => s.Id) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(cancellationToken); } @@ -42,7 +44,13 @@ public class SyntaxViewModelProfile : Profile { public SyntaxViewModelProfile() { - CreateMap(); + CreateMap() + .ForMember(s => s.FilterListIds, + o => o.MapFrom(s => + s.FilterListSyntaxes.Select(sls => sls.FilterListId).OrderBy(flid => flid))) + .ForMember(s => s.SoftwareIds, + o => o.MapFrom(s => + s.SoftwareSyntaxes.Select(ss => ss.SoftwareId).OrderBy(sid => sid))); } }