prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rollforward previous work on AddOrUpdateRules()

Browse source
This commit is contained in:
Collin M. Barrett 2018-01-30 05:09:34 -06:00
parent 3bb86cfb82
commit bb986e853f
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/FilterLists.Services/Services/ScrapeService.cs
View file

@ -6,6 +6,7 @@
using AutoMapper.QueryableExtensions;
using FilterLists.Data;
using FilterLists.Data.Entities;
using FilterLists.Data.Entities.Junctions;
using Microsoft.EntityFrameworkCore;
namespace FilterLists.Services.Services
@ -65,37 +66,37 @@ private static async Task<string> GetHttpResponseMessageContent(string url)
return null;
}
//TODO: finish and validate
private void AddOrUpdateRules(Snapshot snapshot)
{
// add new Rules
var preExistingSnapshotRules = dbContext.Rules.Where(x => snapshot.RawRules.Contains(x.Raw));
var newSnapshotRulesRaw = snapshot.RawRules.Except(preExistingSnapshotRules.Select(x => x.Raw));
var newSnapshotRules =
newSnapshotRulesRaw.Select(newSnapshotRuleRaw => new Rule {Raw = newSnapshotRuleRaw});
var newSnapshotRules = newSnapshotRulesRaw.Select(newSnapshotRuleRaw => new Rule {Raw = newSnapshotRuleRaw});
dbContext.Rules.AddRange(newSnapshotRules);
// remove deleted FilterListRules
var preExistingFilterListRules =
dbContext.FilterListRules.Where(x => x.FilterListId == snapshot.FilterListId);
var deletedFilterListRules =
preExistingFilterListRules.Where(x => !preExistingSnapshotRules.Select(y => y.Id).Contains(x.RuleId));
var preExistingFilterListRules = dbContext.FilterListRules.Where(x => x.FilterListId == snapshot.FilterListId);
var deletedFilterListRules = preExistingFilterListRules.Where(x => !preExistingSnapshotRules.Select(y => y.Id).Contains(x.RuleId));
dbContext.FilterListRules.RemoveRange(deletedFilterListRules);
// add new FilterListRules
// add new (or previously missing junction) FilterListRules
var preExistingSnapshotFilterListRules = preExistingSnapshotRules.Select(newSnapshotRule =>
new FilterListRule {FilterListId = snapshot.FilterListId, Rule = newSnapshotRule});
dbContext.FilterListRules.AddRange(preExistingSnapshotFilterListRules);
var newFilterListRules = newSnapshotRules.Select(newSnapshotRule =>
new FilterListRule {FilterListId = snapshot.FilterListId, Rule = newSnapshotRule});
dbContext.FilterListRules.AddRange(newFilterListRules);
// update UpdatedDateUtc
if (newSnapshotRulesRaw.Any() || deletedFilterListRules.Any())
{
var list = dbContext.FilterLists.FindAsync(snapshot.FilterListId).Result;
var list = dbContext.FilterLists.Find(snapshot.FilterListId);
if (preExistingSnapshotFilterListRules.Any() || newFilterListRules.Any() || deletedFilterListRules.Any())
list.UpdatedDateUtc = DateTime.UtcNow;
dbContext.FilterLists.Update(list);
}
//TODO: update FilterList.ScrapedDateUtc
// update ScrapedDateUtc
list.ScrapedDateUtc = DateTime.UtcNow;
dbContext.FilterLists.Update(list);
dbContext.SaveChangesAsync();
dbContext.SaveChanges();
}
private class FilterListViewUrlDto