From 380c8d98f46ad011e60e865dbb5260788eb9cba9 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 25 Aug 2020 06:39:08 -0500 Subject: [PATCH] =?UTF-8?q?feat(directory):=20=E2=9C=A8=20add=20explicit?= =?UTF-8?q?=20Id=20props=20to=20primary=20query=20entities?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Persistence/Queries/Entities/FilterList.cs | 15 +-------------- .../Persistence/Queries/Entities/License.cs | 15 +-------------- .../Persistence/Queries/Entities/Maintainer.cs | 15 +-------------- .../Persistence/Queries/Entities/Software.cs | 15 +-------------- .../Persistence/Queries/Entities/Syntax.cs | 15 +-------------- .../Persistence/Queries/Entities/Tag.cs | 18 ++---------------- 6 files changed, 7 insertions(+), 86 deletions(-) diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs index 90383e4e4..02fa28b72 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class FilterList { + public int Id { get; private set; } public string Name { get; private set; } = null!; public string? Description { get; private set; } public License? License { get; private set; } @@ -33,16 +32,4 @@ public class FilterList public IReadOnlyCollection DependencyFilterLists { get; private set; } = new HashSet(); public IReadOnlyCollection DependentFilterLists { get; private set; } = new HashSet(); } - - internal class FilterListTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string filterListId = "Id"; - builder.Property(filterListId); - builder.HasKey(filterListId); - } - } } \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs index 1fe2ba015..ac743c606 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs @@ -1,29 +1,16 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class License { + public int Id { get; private set; } public string Name { get; private set; } = null!; public string? GitHubKey { get; private set; } public Uri? Url { get; private set; } public IReadOnlyCollection FilterLists { get; private set; } = new HashSet(); } - - internal class LicenseTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string licenseId = "Id"; - builder.Property(licenseId); - builder.HasKey(licenseId); - } - } } \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs index 1e32318c6..d75cb3f1e 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs @@ -1,30 +1,17 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class Maintainer { + public int Id { get; private set; } public string Name { get; private set; } = null!; public Uri? Url { get; private set; } public string? EmailAddress { get; private set; } public string? TwitterHandle { get; private set; } public IReadOnlyCollection FilterListMaintainers { get; private set; } = new HashSet(); } - - internal class MaintainerTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string maintainerId = "Id"; - builder.Property(maintainerId); - builder.HasKey(maintainerId); - } - } } \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs index e58039569..022a485a7 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class Software { + public int Id { get; private set; } public string Name { get; private set; } = null!; public string? Description { get; private set; } public Uri? HomeUrl { get; private set; } @@ -16,16 +15,4 @@ public class Software public bool SupportsAbpUrlScheme { get; private set; } public IReadOnlyCollection SoftwareSyntaxes { get; private set; } = new HashSet(); } - - internal class SoftwareTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string softwareId = "Id"; - builder.Property(softwareId); - builder.HasKey(softwareId); - } - } } \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs index fbbcd65ca..5ba15f57b 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs @@ -1,30 +1,17 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class Syntax { + public int Id { get; private set; } public string Name { get; private set; } = null!; public string? Description { get; private set; } public Uri? Url { get; private set; } public IReadOnlyCollection FilterListSyntaxes { get; private set; } = new HashSet(); public IReadOnlyCollection SoftwareSyntaxes { get; private set; } = new HashSet(); } - - internal class SyntaxTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string syntaxId = "Id"; - builder.Property(syntaxId); - builder.HasKey(syntaxId); - } - } } \ No newline at end of file diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs index ee3bb393a..9ee0c301c 100644 --- a/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs +++ b/services/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs @@ -1,28 +1,14 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Entities { [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")] public class Tag { + public int Id { get; private set; } public string Name { get; private set; } = null!; public string? Description { get; private set; } public IReadOnlyCollection FilterListTags { get; private set; } = new HashSet(); } - - internal class TagTypeConfiguration : IEntityTypeConfiguration - { - public virtual void Configure(EntityTypeBuilder builder) - { - _ = builder ?? throw new ArgumentNullException(nameof(builder)); - - const string tagId = "Id"; - builder.Property(tagId); - builder.HasKey(tagId); - } - } } \ No newline at end of file