Немного отчистки кода и общий тип

Pf2eDataScrapper/Model/Action.cs

@@ -1,10 +1,8 @@
-using System;
+using Pf2eDataScrapper.Model.Enum;
-using System.Collections.Generic;
-using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Action
+public partial class Action : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/Ancestry.cs

@@ -1,10 +1,8 @@
-using System;
+using Pf2eDataScrapper.Model.Enum;
-using System.Collections.Generic;
-using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Ancestry
+public partial class Ancestry : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/AncestryBoost.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class AncestryBoost
 {

Pf2eDataScrapper/Model/AncestryItem.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class AncestryItem
 {

Pf2eDataScrapper/Model/AncestryLanguage.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class AncestryLanguage
 {

Pf2eDataScrapper/Model/Background.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Background
+public partial class Background : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/BackgroundBoost.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class BackgroundBoost
 {

Pf2eDataScrapper/Model/BackgroundItem.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class BackgroundItem
 {

Pf2eDataScrapper/Model/BackgroundSkill.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class BackgroundSkill
 {

Pf2eDataScrapper/Model/CampaignFeature.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class CampaignFeature
+public partial class CampaignFeature : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/Class.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Class
+public partial class Class : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/ClassKeyAbility.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class ClassKeyAbility
 {

Pf2eDataScrapper/Model/ClassProgression.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class ClassProgression
 {

Pf2eDataScrapper/Model/ClassTraining.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class ClassTraining
 {

Pf2eDataScrapper/Model/Condition.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Condition
+public partial class Condition : IEntity
 {
     public int Id { get; set; } = -1;
 

Pf2eDataScrapper/Model/Deity.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Deity
+public partial class Deity : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/DeityAttribute.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class DeityAttribute
 {

Pf2eDataScrapper/Model/DeityDomain.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class DeityDomain
 {

Pf2eDataScrapper/Model/DeitySpell.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class DeitySpell
 {

Pf2eDataScrapper/Model/DeityWeapon.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class DeityWeapon
 {

Pf2eDataScrapper/Model/Entity.cs

@@ -1,9 +1,6 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
 
-namespace Pf2eDataScrapper.Model;
+public partial class Entity : IEntity
-
-public partial class Entity
 {
     public int Id { get; set; } = -1;
 
@@ -21,17 +18,5 @@ public partial class Entity
 
     public bool? IsChecked { get; set; }
 
-    public virtual ICollection<AncestryItem> AncestryItems { get; set; } = new List<AncestryItem>();
-
-    public virtual ICollection<BackgroundItem> BackgroundItems { get; set; } = new List<BackgroundItem>();
-
-    public virtual ICollection<ClassProgression> ClassProgressions { get; set; } = new List<ClassProgression>();
-
-    public virtual ICollection<EntityAlias> EntityAliases { get; set; } = new List<EntityAlias>();
-
-    public virtual ICollection<EntityExternal> EntityExternals { get; set; } = new List<EntityExternal>();
-
-    public virtual Frequency? Frequency { get; set; }
-
     public virtual ICollection<Trait> Traits { get; set; } = new List<Trait>();
 }

Pf2eDataScrapper/Model/EntityAlias.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class EntityAlias
 {

Pf2eDataScrapper/Model/EntityExternal.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class EntityExternal
 {

Pf2eDataScrapper/Model/EntityKeyword.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class EntityKeyword
 {

Pf2eDataScrapper/Model/EntitySource.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class EntitySource
 {

Pf2eDataScrapper/Model/ExternalTarget.cs

@@ -1,8 +1,4 @@
-using Pf2eDataScrapper.Model;
+namespace Pf2eDataScrapper.Model;
-using System;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class ExternalTarget
 {

Pf2eDataScrapper/Model/Feat.cs

@@ -1,10 +1,8 @@
 using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Feat
+public partial class Feat : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/FeatPrerequisite.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class FeatPrerequisite
 {

Pf2eDataScrapper/Model/Frequency.cs

@@ -1,8 +1,4 @@
-using Pf2eDataScrapper.Model;
+namespace Pf2eDataScrapper.Model;
-using System;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Frequency
 {

Pf2eDataScrapper/Model/Heritage.cs

@@ -1,11 +1,8 @@
-using Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Enum;
-using System;
-using System.Collections.Generic;
-using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Heritage
+public partial class Heritage : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/IEntity.cs

@@ -0,0 +1,21 @@
+namespace Pf2eDataScrapper.Model
+{
+    internal interface IEntity
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string Img { get; set; }
+
+        public string Description { get; set; }
+
+        public string? DescriptionGm { get; set; }
+
+        public string Slug { get; set; }
+
+        public bool? IsTranslated { get; set; }
+
+        public bool? IsChecked { get; set; }
+    }
+}

Pf2eDataScrapper/Model/Keyword.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Keyword
 {

Pf2eDataScrapper/Model/KeywordAlias.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class KeywordAlias
 {

Pf2eDataScrapper/Model/Language.cs

@@ -1,8 +1,4 @@
-using Pf2eDataScrapper.Model;
+namespace Pf2eDataScrapper.Model;
-using System;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Language
 {

Pf2eDataScrapper/Model/Source.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Source
 {

Pf2eDataScrapper/Model/Spell.cs

@@ -1,10 +1,8 @@
-using System;
+using Pf2eDataScrapper.Model.Enum;
-using System.Collections.Generic;
-using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Spell
+public partial class Spell : IEntity
 {
     public int Id { get; set; }
 

Pf2eDataScrapper/Model/SpellArea.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class SpellArea
 {

Pf2eDataScrapper/Model/SpellDamage.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class SpellDamage
 {

Pf2eDataScrapper/Model/SpellDefense.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class SpellDefense
 {

Pf2eDataScrapper/Model/SpellRitual.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class SpellRitual
 {

Pf2eDataScrapper/Model/Training.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Training
 {

Pf2eDataScrapper/Model/Trait.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Pf2eDataScrapper.Model;
-using System.Collections.Generic;
-
-namespace Pf2eDataScrapper.Model;
 
 public partial class Trait
 {