From b58a5d9d9b8f603672bc46b324d7325812331540 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 27 Aug 2020 17:16:37 -0500 Subject: [PATCH] =?UTF-8?q?refactor(directory):=20=E2=99=BB=20rm=20unused?= =?UTF-8?q?=20seeding=20extension,=20temp=20disable=20seeding=20for=20brok?= =?UTF-8?q?en=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Persistence/SeedExtensions.cs | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs index b5d37718f..6417f04d9 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; +using FilterLists.Directory.Infrastructure.Persistence.Queries.Entities; using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence @@ -11,28 +12,21 @@ internal static class SeedExtensions public static void HasDataJsonFile(this EntityTypeBuilder entityTypeBuilder) { _ = entityTypeBuilder ?? throw new ArgumentNullException(nameof(entityTypeBuilder)); - var entities = GetEntities(); - entityTypeBuilder.HasData((IEnumerable)entities); - } - public static void HasDataJsonFile(this OwnedNavigationBuilder ownedNavigationBuilder) - { - _ = ownedNavigationBuilder ?? throw new ArgumentNullException(nameof(ownedNavigationBuilder)); - var entities = GetEntities(); - ownedNavigationBuilder.HasData((IEnumerable)entities); - } + // TODO: fix seeding FilterListViewUrl + if (typeof(TEntity).Name == nameof(FilterListViewUrl)) + return; - private static IEnumerable GetEntities() - { var path = Path.Combine("../../data", $"{typeof(TEntity).Name}.json"); - if (!File.Exists(path)) return new HashSet(); + if (!File.Exists(path)) return; var entitiesJson = File.ReadAllText(path); var entities = JsonSerializer.Deserialize>(entitiesJson, new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase }); - return entities; + + entityTypeBuilder.HasData((IEnumerable)entities); } } } \ No newline at end of file