diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs index 6c8ca4271..5b6e5eb5f 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs @@ -9,12 +9,6 @@ namespace FilterLists.Services.FilterList.MappingProfiles [UsedImplicitly] public class ListDetailsDtoMappingProfile : Profile { - private readonly Func isDiffSnapshot = - s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0; - - private readonly Func isSuccessfulSnapshot = - s => s.IsCompleted && s.HttpStatusCode == "200"; - public ListDetailsDtoMappingProfile() => CreateMap() .ForMember(d => d.AddedDate, c => c.MapFrom(l => l.CreatedDateUtc)) @@ -22,12 +16,16 @@ public ListDetailsDtoMappingProfile() => .ForMember(d => d.Maintainers, c => c.MapFrom(l => l.FilterListMaintainers.Select(m => m.Maintainer))) .ForMember(d => d.RuleCount, c => c.MapFrom(l => - l.Snapshots.Where(isSuccessfulSnapshot).SelectMany(sr => sr.AddedSnapshotRules).Count() - - l.Snapshots.Where(isSuccessfulSnapshot).SelectMany(sr => sr.RemovedSnapshotRules).Count())) + l.Snapshots.Where(s => s.IsCompleted && s.HttpStatusCode == "200") + .SelectMany(sr => sr.AddedSnapshotRules) + .Count() - + l.Snapshots.Where(s => s.IsCompleted && s.HttpStatusCode == "200") + .SelectMany(sr => sr.RemovedSnapshotRules) + .Count())) .ForMember(d => d.UpdatedDate, c => c.MapFrom(l => - l.Snapshots.Where(isSuccessfulSnapshot) - .Where(isDiffSnapshot) + l.Snapshots.Where(s => s.IsCompleted && s.HttpStatusCode == "200") + .Where(s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0) .OrderByDescending(s => s.CreatedDateUtc) .Select(s => s.CreatedDateUtc) .Cast() diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs index 4dbad8f46..fd4ffeec0 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs @@ -9,20 +9,14 @@ namespace FilterLists.Services.FilterList.MappingProfiles [UsedImplicitly] public class ListSummaryDtoMappingProfile : Profile { - private readonly Func isDiffSnapshot = - s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0; - - private readonly Func isSuccessfulSnapshot = - s => s.IsCompleted && s.HttpStatusCode == "200"; - public ListSummaryDtoMappingProfile() => CreateMap() .ForMember(d => d.AddedDate, c => c.MapFrom(l => l.CreatedDateUtc)) .ForMember(d => d.Languages, c => c.MapFrom(l => l.FilterListLanguages.Select(la => la.Language))) .ForMember(d => d.UpdatedDate, c => c.MapFrom(l => - l.Snapshots.Where(isSuccessfulSnapshot) - .Where(isDiffSnapshot) + l.Snapshots.Where(s => s.IsCompleted && s.HttpStatusCode == "200") + .Where(s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0) .OrderByDescending(s => s.CreatedDateUtc) .Select(s => s.CreatedDateUtc) .Cast()