From b3c5744f977434886071c397b57f0e0b811d0358 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Fri, 27 Oct 2017 17:20:09 -0500
Subject: [PATCH] minor entity cleanup

---
 src/FilterLists.Data/Entities/BaseEntity.cs                   | 2 +-
 src/FilterLists.Data/Entities/FilterList.cs                   | 4 ++--
 src/FilterLists.Data/Entities/Maintainer.cs                   | 2 +-
 .../EntityTypeConfigurations/BaseEntityConfiguration.cs       | 3 ---
 .../EntityTypeConfigurations/LanguageTypeConfiguration.cs     | 2 --
 .../EntityTypeConfigurations/MaintainerTypeConfiguration.cs   | 3 ---
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/FilterLists.Data/Entities/BaseEntity.cs b/src/FilterLists.Data/Entities/BaseEntity.cs
index 1b7f2991e..5bfe60d79 100644
--- a/src/FilterLists.Data/Entities/BaseEntity.cs
+++ b/src/FilterLists.Data/Entities/BaseEntity.cs
@@ -4,7 +4,7 @@ namespace FilterLists.Data.Entities
 {
     public abstract class BaseEntity
     {
-        public long Id { get; set; }
+        public int Id { get; set; }
         public DateTime CreatedDateUtc { get; set; }
         public DateTime? ModifiedDateUtc { get; set; }
     }
diff --git a/src/FilterLists.Data/Entities/FilterList.cs b/src/FilterLists.Data/Entities/FilterList.cs
index 5e12d2505..6c9f49fb4 100644
--- a/src/FilterLists.Data/Entities/FilterList.cs
+++ b/src/FilterLists.Data/Entities/FilterList.cs
@@ -4,8 +4,6 @@ namespace FilterLists.Data.Entities
 {
     public class FilterList : BaseEntity
     {
-        public List<Language> Languages { get; set; }
-        public long MaintainerId { get; set; }
         public string Description { get; set; }
         public string DescriptionSourceUrl { get; set; }
         public string DonateUrl { get; set; }
@@ -13,6 +11,8 @@ public class FilterList : BaseEntity
         public string ForumUrl { get; set; }
         public string HomeUrl { get; set; }
         public string IssuesUrl { get; set; }
+        public List<Language> Languages { get; set; }
+        public int MaintainerId { get; set; }
         public string Name { get; set; }
         public string ViewUrl { get; set; }
     }
diff --git a/src/FilterLists.Data/Entities/Maintainer.cs b/src/FilterLists.Data/Entities/Maintainer.cs
index 03c5cac46..8da7bf417 100644
--- a/src/FilterLists.Data/Entities/Maintainer.cs
+++ b/src/FilterLists.Data/Entities/Maintainer.cs
@@ -4,8 +4,8 @@ namespace FilterLists.Data.Entities
 {
     public class Maintainer : BaseEntity
     {
-        public List<FilterList> FilterLists { get; set; }
         public string Email { get; set; }
+        public List<FilterList> FilterLists { get; set; }
         public string HomeUrl { get; set; }
         public string Name { get; set; }
         public string TwitterHandle { get; set; }
diff --git a/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityConfiguration.cs
index 398d6074b..48c778b7f 100644
--- a/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityConfiguration.cs
+++ b/src/FilterLists.Data/EntityTypeConfigurations/BaseEntityConfiguration.cs
@@ -8,9 +8,6 @@ public class BaseEntityTypeConfiguration<TBase> : IEntityTypeConfiguration<TBase
     {
         public virtual void Configure(EntityTypeBuilder<TBase> entityTypeBuilder)
         {
-            entityTypeBuilder.Property(b => b.Id)
-                .ValueGeneratedOnAdd();
-
             entityTypeBuilder.Property(b => b.CreatedDateUtc)
                 .HasColumnType("TIMESTAMP")
                 .HasDefaultValueSql("CURRENT_TIMESTAMP")
diff --git a/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs
index 81ffea8b8..4df0b5810 100644
--- a/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs
+++ b/src/FilterLists.Data/EntityTypeConfigurations/LanguageTypeConfiguration.cs
@@ -8,8 +8,6 @@ public class LanguageTypeConfiguration : BaseEntityTypeConfiguration<Language>
     {
         public override void Configure(EntityTypeBuilder<Language> entityTypeBuilder)
         {
-            entityTypeBuilder.ToTable("languages");
-
             entityTypeBuilder.Property(b => b.Iso6391)
                 .HasMaxLength(2);
 
diff --git a/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs
index ad7c06088..0a4999f30 100644
--- a/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs
+++ b/src/FilterLists.Data/EntityTypeConfigurations/MaintainerTypeConfiguration.cs
@@ -1,5 +1,4 @@
 using FilterLists.Data.Entities;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace FilterLists.Data.EntityTypeConfigurations
@@ -8,8 +7,6 @@ public class MaintainerTypeConfiguration : BaseEntityTypeConfiguration<Maintaine
     {
         public override void Configure(EntityTypeBuilder<Maintainer> entityTypeBuilder)
         {
-            entityTypeBuilder.ToTable("maintainers");
-
             entityTypeBuilder.Property(b => b.Email)
                 .HasMaxLength(126);