From 67fc31b6200e03259595ae65b50ff0f0cfd732df Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 31 Aug 2018 13:32:35 -0500 Subject: [PATCH] assume lists haven't been updated since being discontinued ref #351 --- .../MappingProfiles/ListDetailsDtoMappingProfile.cs | 7 ++++--- .../MappingProfiles/ListSummaryDtoMappingProfile.cs | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs index 716ce9199..be35ca633 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs @@ -25,14 +25,15 @@ public ListDetailsDtoMappingProfile() => : 0)) .ForMember(d => d.UpdatedDate, o => o.MapFrom(l => - l.Snapshots - .Count(s => s.WasSuccessful && s.Md5Checksum != null) >= 2 + l.DiscontinuedDate ?? + (l.Snapshots + .Count(s => s.WasSuccessful && s.Md5Checksum != null) >= 2 ? l.Snapshots .Where(s => s.WasSuccessful && s.Md5Checksum != null) .Select(s => s.CreatedDateUtc) .OrderByDescending(c => c) .FirstOrDefault() - : null)) + : null))) .ForMember(d => d.ViewUrl, o => o.MapFrom(l => l.Snapshots diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs index 648456576..facec3c2f 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListSummaryDtoMappingProfile.cs @@ -14,14 +14,15 @@ public ListSummaryDtoMappingProfile() => .ForMember(d => d.Tags, o => o.MapFrom(l => l.FilterListTags.Select(m => m.Tag))) .ForMember(d => d.UpdatedDate, o => o.MapFrom(l => - l.Snapshots - .Count(s => s.WasSuccessful && s.Md5Checksum != null) >= 2 + l.DiscontinuedDate ?? + (l.Snapshots + .Count(s => s.WasSuccessful && s.Md5Checksum != null) >= 2 ? l.Snapshots .Where(s => s.WasSuccessful && s.Md5Checksum != null) .Select(s => s.CreatedDateUtc) .OrderByDescending(c => c) .FirstOrDefault() - : null)) + : null))) .ForMember(d => d.ViewUrl, o => o.MapFrom(l => l.Snapshots