Начало работы по окончательносму оформлению моделей

Pf2eDataScrapper/Model/Action.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Ancestry.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/AncestryItem.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class AncestryItem
 {

Pf2eDataScrapper/Model/Background.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/BackgroundItem.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class BackgroundItem
 {

Pf2eDataScrapper/Model/CampaignFeature.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Class.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/ClassProgression.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class ClassProgression
 {

Pf2eDataScrapper/Model/Common/Entity.cs

@@ -0,0 +1,52 @@
+using Microsoft.EntityFrameworkCore;
+using Pf2eDataScrapper.Model.Enum;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Pf2eDataScrapper.Model.Common;
+
+[Table("entity")]
+public class Entity
+{
+    [Key]
+    [Column("id", Order = 1)]
+    public int Id { get; set; }
+
+    [Column("name", Order = 2)]
+    [StringLength(255)]
+    [Required]
+    [Comment("Отображаемое имя")]
+    public string Name { get; set; } = null!;
+
+    [Column("type", Order = 3)]
+    [Required]
+    [Comment("Тип объекта")]
+    public EntityType Type { get; set; }
+
+    [Column("slug", Order = 4)]
+    [Required]
+    [Comment("Часть имени в URL")]
+    public string Slug { get; set; } = null!;
+
+    [Column("img", Order = 5)]
+    [StringLength(255)]
+    [Comment("Изображение объекта")]
+    public string Img { get; set; } = null!;
+
+    [Column("description")]
+    [Comment("Текстовое описание объекта")]
+    public string Description { get; set; } = null!;
+
+    [Column("rarity")]
+    public EntityRarity Rarity { get; set; } = EntityRarity.Common;
+
+    [Column("is_translated")]
+    [Comment("Флаг, указывающий, что у объекта существует перевод")]
+    public bool? IsTranslated { get; set; } = false;
+
+    [Column("is_checked")]
+    [Comment("Флаг, указывающий, что объект был проверен и не требует автоматической перезаписи")]
+    public bool? IsChecked { get; set; } = false;
+
+    public virtual ICollection<Trait> Traits { get; set; } = [];
+}

Pf2eDataScrapper/Model/Common/EntityAlias.cs

@@ -0,0 +1,25 @@
+using Pf2eDataScrapper.Model.Enum;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Pf2eDataScrapper.Model.Common;
+
+[Table("entity_alias")]
+public partial class EntityAlias
+{
+    [Key]
+    [Column("id", Order = 1)]
+    public int Id { get; set; }
+
+    [Column("entity_id", Order = 2)]
+    [ForeignKey("Entity")]
+    public int EntityId { get; set; }
+
+    [Column("type", Order = 3)]
+    public AliasType Type { get; set; } = AliasType.Other;
+
+    [Column("alias", Order = 4)]
+    public string Alias { get; set; } = null!;
+
+    public virtual Entity Entity { get; set; } = null!;
+}

Pf2eDataScrapper/Model/Common/Trait.cs

@@ -0,0 +1,29 @@
+using Pf2eDataScrapper.Model.Enum;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Pf2eDataScrapper.Model.Common;
+
+[Table("trait")]
+public partial class Trait
+{
+    [Key]
+    [Column("id", Order = 1)]
+    public int Id { get; set; }
+
+    [Column("name", Order = 2)]
+    [Required]
+    public string Name { get; set; } = null!;
+
+    [Column("type", Order = 3)]
+    public TraitType Type { get; set; }
+
+    [Column("slug", Order = 4)]
+    [Required]
+    public string Slug { get; set; } = null!;
+
+    [Column("description", Order = 5)]
+    public string Description { get; set; } = null!;
+
+    public virtual ICollection<Entity> Entities { get; set; } = [];
+}

Pf2eDataScrapper/Model/Condition.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Deity.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Entity.cs

@@ -1,26 +0,0 @@
-using Pf2eDataScrapper.Model.Enum;
-
-namespace Pf2eDataScrapper.Model;
-
-public class Entity
-{
-    public int Id { get; set; }
-
-    public string Name { get; set; } = null!;
-
-    public string Img { get; set; } = null!;
-
-    public EntityType Type { get; set; }
-
-    public string Description { get; set; } = null!;
-
-    public string? DescriptionGm { get; set; }
-
-    public string Slug { get; set; } = null!;
-
-    public bool? IsTranslated { get; set; }
-
-    public bool? IsChecked { get; set; }
-
-    public virtual ICollection<Trait> Traits { get; set; } = [];
-}

Pf2eDataScrapper/Model/EntityAlias.cs

@@ -1,12 +0,0 @@
-namespace Pf2eDataScrapper.Model;
-
-public partial class EntityAlias
-{
-    public int Id { get; set; }
-
-    public int EntityId { get; set; }
-
-    public string Alias { get; set; } = null!;
-
-    public virtual Entity Entity { get; set; } = null!;
-}

Pf2eDataScrapper/Model/EntityExternal.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class EntityExternal
 {

Pf2eDataScrapper/Model/EntityKeyword.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class EntityKeyword
 {

Pf2eDataScrapper/Model/EntitySource.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class EntitySource
 {

Pf2eDataScrapper/Model/Enum/ActionCategory.cs

@@ -0,0 +1,18 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum ActionCategory
+{
+    [PgName("offensive")]
+    offensive,
+
+    [PgName("defensive")]
+    defensive,
+
+    [PgName("interaction")]
+    interaction,
+
+    [PgName("familiar")]
+    familiar,
+}

Pf2eDataScrapper/Model/Enum/ActionType.cs

@@ -0,0 +1,18 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum ActionType
+{
+    [PgName("action")]
+    action,
+
+    [PgName("free")]
+    free,
+
+    [PgName("reaction")]
+    reaction,
+
+    [PgName("passive")]
+    passive,
+}

Pf2eDataScrapper/Model/Enum/AliasType.cs

@@ -0,0 +1,21 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum AliasType
+{
+    [PgName("old")]
+    Old,
+
+    [PgName("english")]
+    English,
+
+    [PgName("old_english")]
+    OldEnglish,
+
+    [PgName("hobby")]
+    Hobby,
+
+    [PgName("other")]
+    Other,
+}

Pf2eDataScrapper/Model/Enum/AncestryVision.cs

@@ -0,0 +1,15 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum AncestryVision
+{
+    [PgName("normal")]
+    normal,
+
+    [PgName("low-light-vision")]
+    LowLightVision,
+
+    [PgName("darkvision")]
+    darkvision,
+}

Pf2eDataScrapper/Model/Enum/CampaignFeatureCategory.cs

@@ -0,0 +1,21 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum CampaignFeatureCategory
+{
+    [PgName("army_tactic")]
+    ArmyTactic,
+
+    [PgName("army_war_action")]
+    ArmyWarAction,
+
+    [PgName("kingdom_activity")]
+    KingdomActivity,
+
+    [PgName("kingdom_feat")]
+    KingdomFeat,
+
+    [PgName("kingdom_feature")]
+    KingdomFeature,
+}

Pf2eDataScrapper/Model/Enum/ClassProgressionType.cs

@@ -0,0 +1,24 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum ClassProgressionType
+{
+    [PgName("entity")]
+    Entity,
+
+    [PgName("ancestry_feat")]
+    AncestryFeat,
+
+    [PgName("class_feat")]
+    ClassFeat,
+
+    [PgName("general_feat")]
+    GeneralFeat,
+
+    [PgName("skill_feat")]
+    SkillFeat,
+
+    [PgName("skill_increase")]
+    SkillIncrease,
+}

Pf2eDataScrapper/Model/Enum/DeityCategory.cs

@@ -0,0 +1,18 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum DeityCategory
+{
+    [PgName("deity")]
+    Deity,
+
+    [PgName("pantheon")]
+    Pantheon,
+
+    [PgName("covenant")]
+    Covenant,
+
+    [PgName("philosophy")]
+    Philosophy,
+}

Pf2eDataScrapper/Model/Enum/DeityFonts.cs

@@ -0,0 +1,18 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum DeityFonts
+{
+    [PgName("none")]
+    None,
+
+    [PgName("heal")]
+    Heal,
+
+    [PgName("harm")]
+    Harm,
+
+    [PgName("any")]
+    Any,
+}

Pf2eDataScrapper/Model/Enum/DeitySanctification.cs

@@ -0,0 +1,15 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum DeitySanctification
+{
+    [PgName("holy")]
+    Holy,
+
+    [PgName("unholy")]
+    Unholy,
+
+    [PgName("any")]
+    Any,
+}

Pf2eDataScrapper/Model/Enum/EntityRarity.cs

@@ -0,0 +1,19 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum
+{
+    public enum EntityRarity
+    {
+        [PgName("common")]
+        Common, 
+
+        [PgName("uncommon")]
+        Uncommon,
+
+        [PgName("rare")]
+        Rare,
+
+        [PgName("unique")]
+        Unique
+    }
+}

Pf2eDataScrapper/Model/Enum/FeatActionType.cs

@@ -0,0 +1,18 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum FeatActionType
+{
+    [PgName("passive")]
+    Passive,
+
+    [PgName("action")]
+    Action,
+
+    [PgName("reaction")]
+    Reaction,
+
+    [PgName("free")]
+    Free,
+}

Pf2eDataScrapper/Model/Enum/FeatCategory.cs

@@ -0,0 +1,39 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum FeatCategory
+{
+    [PgName("ancestryfeature")]
+    Ancestryfeature,
+
+    [PgName("classfeature")]
+    Classfeature,
+
+    [PgName("calling")]
+    Calling,
+
+    [PgName("class")]
+    Class,
+
+    [PgName("skill")]
+    Skill,
+
+    [PgName("general")]
+    General,
+
+    [PgName("ancestry")]
+    Ancestry,
+
+    [PgName("bonus")]
+    Bonus,
+
+    [PgName("deityboon")]
+    Deityboon,
+
+    [PgName("curse")]
+    Curse,
+
+    [PgName("pfsboon")]
+    Pfsboon,
+}

Pf2eDataScrapper/Model/Enum/Size.cs

@@ -0,0 +1,12 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum Size
+{
+    [PgName("med")]
+    med,
+
+    [PgName("tiny")]
+    tiny,
+}

Pf2eDataScrapper/Model/Enum/SpellAreaType.cs

@@ -0,0 +1,27 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum SpellAreaType
+{
+    [PgName("burst")]
+    Burst,
+
+    [PgName("emanation")]
+    Emanation,
+
+    [PgName("cone")]
+    Cone,
+
+    [PgName("line")]
+    Line,
+
+    [PgName("square")]
+    Square,
+
+    [PgName("cube")]
+    Cube,
+
+    [PgName("cylinder")]
+    Cylinder,
+}

Pf2eDataScrapper/Model/Enum/SpellDamageCategory.cs

@@ -0,0 +1,12 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum SpellDamageCategory
+{
+    [PgName("persistent")]
+    Persistent,
+
+    [PgName("splash")]
+    Splash,
+}

Pf2eDataScrapper/Model/Enum/SpellDamageKinds.cs

@@ -0,0 +1,15 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum;
+
+public enum SpellDamageKinds
+{
+    [PgName("damage")]
+    Damage,
+
+    [PgName("healing")]
+    Healing,
+
+    [PgName("any")]
+    Any,
+}

Pf2eDataScrapper/Model/Enum/TraitType.cs

@@ -0,0 +1,13 @@
+using NpgsqlTypes;
+
+namespace Pf2eDataScrapper.Model.Enum
+{
+    public enum TraitType
+    {
+        [PgName("regular")]
+        Regular,
+
+        [PgName("tradition")]
+        Tradition
+    }
+}

Pf2eDataScrapper/Model/Feat.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Frequency.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model;
 
 public partial class Frequency
 {

Pf2eDataScrapper/Model/Heritage.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/IEntity.cs

@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Model
+using Pf2eDataScrapper.Model.Common;
+
+namespace Pf2eDataScrapper.Model
 {
     internal interface IEntity
     {

Pf2eDataScrapper/Model/Spell.cs

@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Model.Enum;
+using Pf2eDataScrapper.Model.Common;
+using Pf2eDataScrapper.Model.Enum;
 
 namespace Pf2eDataScrapper.Model;
 

Pf2eDataScrapper/Model/Trait.cs

@@ -1,12 +0,0 @@
-namespace Pf2eDataScrapper.Model;
-
-public partial class Trait
-{
-    public int Id { get; set; }
-
-    public string Name { get; set; } = null!;
-
-    public string Slug { get; set; } = null!;
-
-    public string Description { get; set; } = null!;
-}