From 4e83f9c7793933b59add7bdc6eda4076b3c3ee31 Mon Sep 17 00:00:00 2001
From: Collin Barrett <collinbarrett@users.noreply.github.com>
Date: Sun, 12 Aug 2018 14:53:35 -0500
Subject: [PATCH] revert extracting Func<>s

despite trying many forms, the AsQueryable() (see [here](https://stackoverflow.com/a/51812063/2343739)) generates broken mysql code
---
 .../ListDetailsDtoMappingProfile.cs            | 18 ++++++++----------
 .../ListSummaryDtoMappingProfile.cs            | 10 ++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

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<Data.Entities.Snapshot, bool> isDiffSnapshot =
-            s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0;
-
-        private readonly Func<Data.Entities.Snapshot, bool> isSuccessfulSnapshot =
-            s => s.IsCompleted && s.HttpStatusCode == "200";
-
         public ListDetailsDtoMappingProfile() =>
             CreateMap<Data.Entities.FilterList, ListDetailsDto>()
                 .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<DateTime?>()
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<Data.Entities.Snapshot, bool> isDiffSnapshot =
-            s => s.AddedSnapshotRules.Count > 0 || s.RemovedSnapshotRules.Count > 0;
-
-        private readonly Func<Data.Entities.Snapshot, bool> isSuccessfulSnapshot =
-            s => s.IsCompleted && s.HttpStatusCode == "200";
-
         public ListSummaryDtoMappingProfile() =>
             CreateMap<Data.Entities.FilterList, ListSummaryDto>()
                 .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<DateTime?>()