diff --git a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs index 12b92acf0..a7e0072d7 100644 --- a/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles/ListDetailsDtoMappingProfile.cs @@ -19,7 +19,8 @@ public ListDetailsDtoMappingProfile() => l.Snapshots.Where(s => s.WasSuccessful) .OrderByDescending(s => s.CreatedDateUtc) .FirstOrDefault() - .SnapshotRules.Count)) + .SnapshotRules + .Count)) .ForMember(d => d.UpdatedDate, c => c.MapFrom(l => l.Snapshots.Where(s => s.WasSuccessful) diff --git a/src/FilterLists.Services/Snapshot/Snapshot.cs b/src/FilterLists.Services/Snapshot/Snapshot.cs index 6340f5079..9f421e883 100644 --- a/src/FilterLists.Services/Snapshot/Snapshot.cs +++ b/src/FilterLists.Services/Snapshot/Snapshot.cs @@ -18,7 +18,7 @@ public class Snapshot { private const int BatchSize = 500; private readonly FilterListsDbContext dbContext; - private readonly FilterListViewUrlDto list; + private readonly string listViewUrl; private readonly Data.Entities.Snapshot snapEntity; private readonly TelemetryClient telemetryClient; private readonly string uaString; @@ -27,8 +27,8 @@ public class Snapshot public Snapshot(FilterListsDbContext dbContext, FilterListViewUrlDto list, string uaString) { this.dbContext = dbContext; - this.list = list; this.uaString = uaString; + listViewUrl = list.ViewUrl; snapEntity = new Data.Entities.Snapshot { FilterListId = list.Id @@ -39,7 +39,7 @@ public Snapshot(FilterListsDbContext dbContext, FilterListViewUrlDto list, strin public async Task TrySaveAsync() { await AddSnapEntity(); - if (!list.ViewUrl.IsValidHttpOrHttpsUrl()) + if (!listViewUrl.IsValidHttpOrHttpsUrl()) return; try { @@ -91,7 +91,7 @@ private async Task GetLines() using (var httpClient = new HttpClient()) { httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(uaString); - var response = await httpClient.GetAsync(list.ViewUrl, HttpCompletionOption.ResponseHeadersRead); + var response = await httpClient.GetAsync(listViewUrl, HttpCompletionOption.ResponseHeadersRead); snapEntity.HttpStatusCode = (uint)response.StatusCode; response.EnsureSuccessStatusCode(); lines = new HashSet(); diff --git a/src/FilterLists.Services/Snapshot/SnapshotBatch.cs b/src/FilterLists.Services/Snapshot/SnapshotBatch.cs index 2581932f1..f4b187237 100644 --- a/src/FilterLists.Services/Snapshot/SnapshotBatch.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotBatch.cs @@ -24,10 +24,10 @@ public SnapshotBatch(FilterListsDbContext dbContext, IEnumerable lines, public async Task SaveAsync() { var existingRules = dbContext.Rules.Join(lines, rule => rule.Raw, line => line, (rule, line) => rule); - var newRules = lines.Except(existingRules.Select(r => r.Raw)).Select(l => new Rule { Raw = l }).ToList(); + var newRules = lines.Except(existingRules.Select(r => r.Raw)).Select(l => new Rule {Raw = l}).ToList(); dbContext.Rules.AddRange(newRules); var rules = existingRules.Concat(newRules); - var snapshotRules = rules.Select(r => new SnapshotRule { Rule = r }); + var snapshotRules = rules.Select(r => new SnapshotRule {Rule = r}); snapEntity.SnapshotRules = snapshotRules.ToList(); await dbContext.SaveChangesAsync(); }