diff --git a/src/FilterLists.Services/FilterList/FilterListService.cs b/src/FilterLists.Services/FilterList/FilterListService.cs index 3fbe72df7..93b4c7f15 100644 --- a/src/FilterLists.Services/FilterList/FilterListService.cs +++ b/src/FilterLists.Services/FilterList/FilterListService.cs @@ -15,9 +15,9 @@ public FilterListService(FilterListsDbContext dbContext, IConfigurationProvider { } - public async Task> GetAllAsync() => + public async Task> GetAllAsync() => await DbContext.FilterLists - .ProjectTo(MapConfig) + .ProjectTo(MapConfig) .ToListAsync(); public async Task GetDetailsAsync(int id) => diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs similarity index 76% rename from src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs rename to src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs index 153073352..16ed13838 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/FilterListDtoMappingProfile.cs @@ -7,19 +7,24 @@ namespace FilterLists.Services.FilterList.MappingProfiles { [UsedImplicitly] - public class ListMappingProfile : Profile + public class FilterListDtoMappingProfile : Profile { - public ListMappingProfile() => - CreateMap() + public FilterListDtoMappingProfile() => + CreateMap() .ForMember(dest => dest.Id, opt => opt.MapFrom(src => (int)src.Id)) .ForMember(dest => dest.LanguageIds, opt => opt.MapFrom(src => - src.FilterListLanguages.Select(ll => (int)ll.LanguageId))) + src.FilterListLanguages + .Select(ll => (int)ll.LanguageId))) + .ForMember(dest => dest.LicenseId, + opt => opt.MapFrom(src => + (int)src.LicenseId)) .ForMember(dest => dest.MaintainerIds, opt => opt.MapFrom(src => - src.FilterListMaintainers.Select(ll => (int)ll.MaintainerId))) + src.FilterListMaintainers + .Select(ll => (int)ll.MaintainerId))) .ForMember(dest => dest.RuleCount, opt => opt.MapFrom(src => src.Snapshots @@ -31,7 +36,8 @@ public ListMappingProfile() => (int)src.SyntaxId)) .ForMember(dest => dest.TagIds, opt => opt.MapFrom(src => - src.FilterListTags.Select(lt => (int)lt.TagId))) + src.FilterListTags + .Select(lt => (int)lt.TagId))) .ForMember(dest => dest.UpdatedDate, opt => opt.MapFrom(src => src.Snapshots diff --git a/src/FilterLists.Services/FilterList/Models/FilterListDto.cs b/src/FilterLists.Services/FilterList/Models/FilterListDto.cs new file mode 100644 index 000000000..bdb5e080b --- /dev/null +++ b/src/FilterLists.Services/FilterList/Models/FilterListDto.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using JetBrains.Annotations; + +namespace FilterLists.Services.FilterList.Models +{ + [UsedImplicitly] + public class FilterListDto + { + public int Id { get; set; } + public string ChatUrl { get; set; } + public string Description { get; set; } + public string DescriptionSourceUrl { get; set; } + public DateTime? DiscontinuedDate { get; set; } + public string DonateUrl { get; set; } + public string EmailAddress { get; set; } + public string ForumUrl { get; set; } + public string HomeUrl { get; set; } + public string IssuesUrl { get; set; } + public List LanguageIds { get; set; } + public int? LicenseId { get; set; } + public List MaintainerIds { get; set; } + public string Name { get; set; } + public string PolicyUrl { get; set; } + public DateTime? PublishedDate { get; set; } + public int? RuleCount { get; set; } + public string SubmissionUrl { get; set; } + public int? SyntaxId { get; set; } + public List TagIds { get; set; } + public DateTime? UpdatedDate { get; set; } + public string ViewUrl { get; set; } + public List ViewUrlMirrors { get; set; } + } +} \ No newline at end of file diff --git a/src/FilterLists.Services/FilterList/Models/List.cs b/src/FilterLists.Services/FilterList/Models/List.cs deleted file mode 100644 index b186b0ee2..000000000 --- a/src/FilterLists.Services/FilterList/Models/List.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace FilterLists.Services.FilterList.Models -{ - [UsedImplicitly] - public class List - { - public int Id { get; set; } - public List LanguageIds { get; set; } - public List MaintainerIds { get; set; } - public string Name { get; set; } - public int? RuleCount { get; set; } - public int? SyntaxId { get; set; } - public List TagIds { get; set; } - public DateTime? UpdatedDate { get; set; } - public string ViewUrl { get; set; } - public List ViewUrlMirrors { get; set; } - } -} \ No newline at end of file