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

remove unused method, move seed extensions

Browse source
This commit is contained in:
Collin M. Barrett 2018-01-22 09:23:45 -06:00
parent 76ec6a7857
commit d04fc2a4e7
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/FilterLists.Api/Startup.cs
View file

@ -1,5 +1,6 @@
using FilterLists.Api.DependencyInjection.Extensions;
using FilterLists.Data;
using FilterLists.Data.Seed.Extensions;
using FilterLists.Services.DependencyInjection.Extensions;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.HttpOverrides;

20
src/FilterLists.Data/FilterListsDbContextExtensions.cs → src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
View file

@ -4,23 +4,13 @@
using System.Linq;
using FilterLists.Data.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Newtonsoft.Json;
namespace FilterLists.Data
namespace FilterLists.Data.Seed.Extensions
{
public static class FilterListsDbContextExtensions
public static class SeedFilterListsDbContext
{
public static bool AllMigrationsApplied(this FilterListsDbContext dbContext)
{
var appliedMigrationIds = dbContext.GetService<IHistoryRepository>().GetAppliedMigrations()
.Select(m => m.MigrationId);
var allMigrationKeys = dbContext.GetService<IMigrationsAssembly>().Migrations.Select(m => m.Key);
return !allMigrationKeys.Except(appliedMigrationIds).Any();
}
//TODO: consider handling deleted entities on seed
//TODO: read entities from model and iterate over
public static void SeedOrUpdate(this FilterListsDbContext dbContext, string dataPath)
@ -46,7 +36,7 @@ private static void InsertOnDuplicateKeyUpdate<TEntityType>(this DbContext dbCon
var properties = GetPropertiesLessValueGeneratedTimestamps(entityType);
var values = CreateValues<TEntityType>(properties, dataPath);
if (values == "") return;
var columns = string.Join(", ", properties.Select(x => x.Name));
var columns = string.Join(", ", Enumerable.Select<IProperty, string>(properties, x => x.Name));
var updates = CreateUpdates(properties);
var rawSqlString = "INSERT INTO " + entityType.Relational().TableName + " (" + columns + ") VALUES " +
values + " ON DUPLICATE KEY UPDATE " + updates;
@ -62,7 +52,7 @@ private static List<IProperty> GetPropertiesLessValueGeneratedTimestamps(IEntity
private static string CreateValues<TEntityType>(IReadOnlyCollection<IProperty> properties, string dataPath)
{
return GetSeedRows<TEntityType>(dataPath).Select(row => CreateRowValues(properties, row)).Aggregate("",
return Enumerable.Select<TEntityType, string>(GetSeedRows<TEntityType>(dataPath), row => CreateRowValues(properties, row)).Aggregate("",
(current, rowValues) => current == "" ? rowValues : current + ", " + rowValues);
}
@ -84,7 +74,7 @@ private static string CreateRowValues<TEntityType>(IEnumerable<IProperty> proper
{
return (from property in properties
let value = row.GetType().GetProperty(property.Name).GetValue(row)
select FormatDataForMySql(property, value)).Aggregate("",
select FormatDataForMySql(property, value)).Aggregate<object, string>("",
(rowValues, value) => rowValues == "" ? "(" + value : rowValues + ", " + value) + ")";
}