Переход от наследования таблиц на 1-1 связи

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/CompendiumLoader.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.Compendium;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/DataBuilder/AbstractProcessor.cs

@@ -1,6 +1,8 @@
-using LinqToDB.DataProvider.SapHana;
+using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Linq;
+using NpgsqlTypes;
-using Npgsql;
+using Pf2eDataScrapper.Model;
+using Pf2eDataScrapper.Model.Enum;
+using System.ComponentModel;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
 {
@@ -10,23 +12,49 @@ namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
 
         public readonly JObject Input = input;
 
-        public abstract void Process();
+        protected DataBuilderHelper Helper = DataBuilderHelper.Instance;
+
+        public Entity Entity { get; set; } = new Entity();
+
+        public abstract EntityType Type { get; }
+
+        public abstract IEntity Object { get; }
+
+        public virtual void Process()
+        {
+            Entity.Id = Helper.NextId;
+            Entity.Type = Type;
+
+            Entity.Name = GetRequired<string>("name");
+            Entity.Img = GetRequired<string>("img");
+            Entity.Description = GetRequired<string>("system.description.value");
+            Entity.DescriptionGm = GetOptional<string>("system.description.gm");
+
+            Entity.IsTranslated = false;
+            Entity.IsChecked = false;
+
+            Entity.Slug = Helper.GenerateSlug(Entity.Name);
+
+            Object.Id = Entity.Id;
+
+            Context.Entities.Add(Entity);
+
+            // TODO Traits, Alias
+        }
 
         public void Save()
         {
             Context.SaveChanges();
         }
 
-
+        public T GetRequired<T>(string path)
-
-        protected T GetRequired<T>(string path)
         {
             var token = Input.SelectToken(path) ?? throw new NullReferenceException($"'{path}' is null");
 
             return token.ToObject<T>() ?? throw new NullReferenceException($"'{path}' is null");
         }
 
-        protected T? GetOptional<T>(string path)
+        public T? GetOptional<T>(string path)
         {
             var token = Input.SelectToken(path) ?? null;
 
@@ -38,6 +66,39 @@ namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
             return token.ToObject<T>() ?? default;
         }
 
+        public T EnumRequired<T>(string path) where T : Enum
+        {
+            return EnumOptional<T>(path) ?? throw new Exception($"Can't resolve Enum value for {typeof(T).Name} in path {path}");
+        }
 
+        public T? EnumOptional<T>(string path) where T : Enum
+        {
+            string? value = GetOptional<string>(path);
+
+            if (value == null)
+            {
+                return default;
+            }
+
+            foreach (var field in typeof(T).GetFields())
+            {
+                if (Attribute.GetCustomAttribute(field, typeof(PgNameAttribute)) is PgNameAttribute attribute)
+                {
+                    if (attribute.PgName == value)
+                    {
+                        return (T)field.GetValue(null);
+                    }
+                }
+                else
+                {
+                    if (field.Name == value)
+                    {
+                        return (T)field.GetValue(null);
+                    }
+                }
+            }
+
+            return default;
+        }
     }
 }

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/DataBuilder/DataBuilderHelper.cs

@@ -1,5 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Slugify;
-using Npgsql;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
 {
@@ -7,76 +6,23 @@ namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
     {
         public Pf2eDatabase Database = Pf2eDatabase.Instance;
 
+        public SlugHelper Slugger = new();
+
         private DataBuilderHelper()
         {
         }
 
-        public NpgsqlCommand PrepareInsert(string table, Dictionary<string, object?> data, bool returnId)
+        private int _id = 0;
-        {
-            List<string> columns = [];
-            List<string> patterns = [];
 
-            foreach (var key in data.Keys)
+        public int NextId { get => ++_id; }
+
+        public string GenerateSlug(string name)
         {
-                columns.Add(key);
+            return Slugger.GenerateSlug(name);
-                patterns.Add($":{key.ToUpper()}");
         }
 
-            string dml = $"INSERT INTO {table} (\"{string.Join("\", \"", columns)}\") VALUES ({string.Join(", ", patterns)})" + (returnId ? " RETURNING id" : "");
 
-            NpgsqlCommand cmd = Database.GetCommand(dml);
-            foreach (var kvp in data)
-            {
-                cmd.Parameters.AddWithValue(":" + kvp.Key.ToUpper(), kvp.Value ?? DBNull.Value);
-            }
 
-            Console.WriteLine(cmd.CommandText);
+        public readonly static DataBuilderHelper Instance = new();
-            return cmd;
-        }
-
-        public int Insert(string table, Dictionary<string, object?> data)
-        {
-            var cmd = PrepareInsert(table, data, true);
-            return (int)(cmd.ExecuteScalar() ?? throw new Exception("Not a number"));
-        }
-
-        public void InsertBlind(string table, Dictionary<string, object?> data)
-        {
-            var cmd = PrepareInsert(table, data, false);
-            cmd.ExecuteNonQuery();
-        }
-
-        public static object? JsonGet(JObject root, string path)
-        {
-            var token = root.SelectToken(path);
-
-            if (token == null)
-            {
-                return null;
-            }
-
-            if (token.Type == JTokenType.String)
-            {
-                return token.ToString();
-            }
-            else if (token.Type == JTokenType.Integer)
-            {
-                return token.ToObject<int>();
-            }
-            else if (token.Type == JTokenType.Float)
-            {
-                return token.ToObject<float>();
-            }
-            else if (token.Type == JTokenType.Boolean)
-            {
-                return token.ToObject<bool>();
-            }
-            else
-            {
-                return token.ToString();
-            }
-        }
-
-        public static DataBuilderHelper Instance = new();
     }
 }

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/DataBuilder/Pf2eTypeProcessor.cs

@@ -1,11 +1,10 @@
-using System.Reflection;
+namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
-
-namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder
 {
     [AttributeUsage(AttributeTargets.Class)]
-    internal class Pf2eTypeProcessor(string type) : Attribute
+    internal class Pf2eTypeProcessor(string type, int priority = 0) : Attribute
     {
         public readonly string Type = type;
 
+        public readonly int Priority = priority;
     }
 }

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/DataBuilder/Processors/ConditionProcessor.cs

@@ -1,40 +1,33 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.Model;
 using Pf2eDataScrapper.Model.Enum;
-using Slugify;
-using static LinqToDB.Common.Configuration;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder.Processors
 {
     [Pf2eTypeProcessor("Item.condition")]
     internal class ConditionProcessor(JObject input) : AbstractProcessor(input)
     {
+        public override EntityType Type => EntityType.Condition;
+
+        public override Condition Object { get; } = new();
+
         public override void Process()
         {
+            base.Process();
+
             JObject extra = new()
             {
-                    { "duration", Input.SelectToken("duration") },
+                { "duration", Input.SelectToken("system.duration") },
-                    { "overrides", Input.SelectToken("overrides") },
+                { "overrides", Input.SelectToken("system.overrides") },
-                    { "references", Input.SelectToken("references") },
+                { "references", Input.SelectToken("system.references") },
-                    { "value", Input.SelectToken("value") }
+                { "value", Input.SelectToken("system.value") }
             };
 
-            Condition condition = new()
+            Object.Extra = extra.ToString(Newtonsoft.Json.Formatting.Indented);
-            {
-                Name = GetRequired<string>("name"),
-                Img = GetRequired<string>("img"),
-                Description = GetRequired<string>("system.description.value"),
-                DescriptionGm = GetOptional<string>("system.description.gm"),
-                Type = EntityType.Condition,
-                IsTranslated = false,
-                IsChecked = false,
 
-                // Group = GetOptional<string>("system.group");
+            Object.Group = EnumOptional<ConditionGroup>("system.group");
-                Extra = extra.ToString(Newtonsoft.Json.Formatting.Indented)
-            };
-            condition.Slug = new SlugHelper().GenerateSlug(condition.Name);
 
-            Context.Conditions.Add(condition);
+            Context.Conditions.Add(Object);
         }
     }
 }

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/SchemaBuilder/CompendiumSchemaBuilder.cs

@@ -1,5 +1,4 @@
 using Konsole;
-using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.Compendium;
 using Pf2eDataScrapper.SchemaBuilder;
 

Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/SchemaBuilder/CompendiumSchemaTypeResolver.cs

@@ -1,9 +1,4 @@
-using System;
+using Newtonsoft.Json.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.SchemaBuilder;
 using Pf2eDataScrapper.SchemaBuilder.Types;
 

Pf2eDataScrapper/Model/Action.cs

@@ -1,28 +1,14 @@
-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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    // TODO ActionType
-
-    public EntityType Type { get; set; } = EntityType.Action;
-
-    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 int? Actions { get; set; }
 

Pf2eDataScrapper/Model/Ancestry.cs

@@ -1,28 +1,14 @@
-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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    // TODO Size Vision
-
-    public EntityType Type { get; set; } = EntityType.Ancestry;
-
-    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 int Hp { get; set; }
 
@@ -30,11 +16,11 @@ public partial class Ancestry
 
     public int Speed { get; set; }
 
-    public virtual ICollection<AncestryBoost> AncestryBoosts { get; set; } = new List<AncestryBoost>();
+    public virtual ICollection<AncestryBoost> AncestryBoosts { get; set; } = [];
 
-    public virtual ICollection<AncestryItem> AncestryItems { get; set; } = new List<AncestryItem>();
+    public virtual ICollection<AncestryItem> AncestryItems { get; set; } = [];
 
-    public virtual ICollection<AncestryLanguage> AncestryLanguages { get; set; } = new List<AncestryLanguage>();
+    public virtual ICollection<AncestryLanguage> AncestryLanguages { get; set; } = [];
 
-    public virtual ICollection<Heritage> Heritages { get; set; } = new List<Heritage>();
+    public virtual ICollection<Heritage> Heritages { 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,28 +1,12 @@
 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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
-
-    public string Img { get; set; } = null!;
-
-    public EntityType Type { get; set; } = EntityType.Background;
-
-    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<BackgroundBoost> BackgroundBoosts { get; set; } = new List<BackgroundBoost>();
 

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,28 +1,14 @@
 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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    // TODO ActionType Category
-
-    public EntityType Type { get; set; } = EntityType.CampaignFeature;
-
-    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 int? Level { get; set; }
 

Pf2eDataScrapper/Model/Class.cs

@@ -1,28 +1,12 @@
 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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
-
-    public string Img { get; set; } = null!;
-
-    public EntityType Type { get; set; } = EntityType.Class;
-
-    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 int Hp { 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,30 +1,14 @@
 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;
+    public int Id { get; set; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    public ConditionGroup? Group { get; set; }
-
-    public EntityType Type { get; set; } = EntityType.Condition;
-
-    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 ConditionGroup Group { get; set; }
 
     public string? Extra { get; set; }
 }

Pf2eDataScrapper/Model/Deity.cs

@@ -1,28 +1,14 @@
 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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    // TODO Category Font Sanctification
-
-    public EntityType Type { get; set; } = EntityType.Deity;
-
-    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 bool SanctificationMust { 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,16 +1,17 @@
-using System;
+using Pf2eDataScrapper.Model.Enum;
-using System.Collections.Generic;
 
 namespace Pf2eDataScrapper.Model;
 
-public partial class Entity
+public class Entity
 {
-    public int Id { get; set; } = -1;
+    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; }
@@ -21,17 +22,5 @@ public partial class Entity
 
     public bool? IsChecked { get; set; }
 
-    public virtual ICollection<AncestryItem> AncestryItems { get; set; } = new List<AncestryItem>();
+    public virtual ICollection<Trait> Traits { get; set; } = [];
-
-    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,28 +1,14 @@
 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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
 
-    public string Img { get; set; } = null!;
+    // TODO ActionType Category
-
-    public EntityType Type { get; set; } = EntityType.Feat;
-
-    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 int? Actions { 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,29 +1,12 @@
-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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
-
-    public string Img { get; set; } = null!;
-
-    public EntityType Type { get; set; } = EntityType.Heritage;
-
-    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 int? AncestryId { get; set; }
 

Pf2eDataScrapper/Model/IEntity.cs

@@ -0,0 +1,10 @@
+namespace Pf2eDataScrapper.Model
+{
+    internal interface IEntity
+    {
+        public int Id { get; set; }
+
+        public Entity Entity { 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,28 +1,12 @@
-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; }
 
-    public string Name { get; set; } = null!;
+    public Entity Entity { get; set; } = null!;
-
-    public string Img { get; set; } = null!;
-
-    public EntityType Type { get; set; } = EntityType.Spell;
-
-    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 int Level { 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
 {
@@ -9,7 +6,7 @@ public partial class Trait
 
     public string Name { get; set; } = null!;
 
-    public string Description { get; set; } = null!;
+    public string Slug { get; set; } = null!;
 
-    public virtual ICollection<Entity> Entities { get; set; } = new List<Entity>();
+    public string Description { get; set; } = null!;
 }

Pf2eDataScrapper/SchemaBuilder/SchemaNode.cs

@@ -139,7 +139,8 @@ namespace Pf2eDataScrapper.SchemaBuilder
         /// <returns>Строковое представление элемента.</returns>
         public override string ToString()
         {
-            var result = new Dictionary<string, string>() {
+            var result = new Dictionary<string, string>()
+            {
                 ["type"] = GetTypeName(),
                 ["path"] = Path,
                 ["is_null"] = IsNullable ? "true" : "false",
@@ -204,7 +205,7 @@ namespace Pf2eDataScrapper.SchemaBuilder
         /// </summary>
         /// <param name="input">Словарь данных.</param>
         /// <returns>Строка форматированных данных</returns>
-        public static string FormatYaml(params Dictionary<string, string>[] input)
+        public static string FormatYaml(params List<Dictionary<string, string>> input)
         {
             var result = "";
 
@@ -218,7 +219,7 @@ namespace Pf2eDataScrapper.SchemaBuilder
             return result.Trim();
         }
 
-        public static Dictionary<string, string> MergeDictionaries(params Dictionary<string, string>[] input)
+        public static Dictionary<string, string> MergeDictionaries(params List<Dictionary<string, string>> input)
         {
             var result = new Dictionary<string, string>();
 

Pf2eDataScrapper/SchemaBuilder/Types/ObjectSchemaType.cs

@@ -114,7 +114,8 @@ namespace Pf2eDataScrapper.SchemaBuilder.Types
         /// <returns>Словарь данных</returns>
         public override Dictionary<string, string> GetYamlData()
         {
-            return new() {
+            return new()
+            {
                 ["schema"] = SchemaNode.FormatYaml(GetSchemaYaml())
             };
         }

Pf2eDataScrapper/SchemaBuilder/Types/StaticSchemaType.cs

@@ -1,5 +1,4 @@
-using System.Linq.Expressions;
+using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Linq;
 
 namespace Pf2eDataScrapper.SchemaBuilder.Types
 {
@@ -91,7 +90,8 @@ namespace Pf2eDataScrapper.SchemaBuilder.Types
                 }
             }
 
-            return new() { 
+            return new()
+            {
                 ["different_values"] = count.ToString() +
                     ((count == Root.Values) ? " (all different)" : "") +
                     ((count == 1) ? " (all same)" : ""),

Pf2eDataScrapper/schema.pgsql

@@ -142,6 +142,7 @@ CREATE TYPE "trait_type" AS ENUM (
 CREATE TABLE "trait" (
   "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
   "name" varchar NOT NULL,
+  "slug" varchar NOT NULL,
   "description" text NOT NULL,
   "type" trait_type NOT NULL
 );
@@ -210,7 +211,7 @@ CREATE TYPE "spell_damage_kinds" AS ENUM (
 );
 
 CREATE TABLE "spell" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "level" int NOT NULL,
   "cost" int NOT NULL,
   "counteraction" bool NOT NULL,
@@ -221,8 +222,8 @@ CREATE TABLE "spell" (
   "target" varchar NOT NULL,
   "time" varchar NOT NULL,
   "can_heightening" bool NOT NULL
-) INHERITS ("entity");
+);
--- ALTER TABLE "spell" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "spell" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "spell_area" (
   "spell_id" int PRIMARY KEY,
@@ -287,27 +288,27 @@ CREATE TYPE "ancestry_vision" AS ENUM (
 );
 
 CREATE TABLE "action" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "action_type" action_type NOT NULL,
   "actions" int,
   "category" action_category,
   "death_note" bool,
   "extra" text
-) INHERITS ("entity");
+);
--- ALTER TABLE "action" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "action" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 
 -- Ancestry
 
 CREATE TABLE "ancestry" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "hp" int NOT NULL,
   "reach" int NOT NULL,
   "size" enum_size NOT NULL,
   "speed" int NOT NULL,
   "vision" ancestry_vision NOT NULL
-) INHERITS ("entity");
+);
--- ALTER TABLE "ancestry" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "ancestry" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "ancestry_languages" (
   "ancestry_id" int,
@@ -339,9 +340,9 @@ ALTER TABLE "ancestry_items" ADD FOREIGN KEY ("item_id") REFERENCES "entity" ("i
 -- Background
 
 CREATE TABLE "background" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY
+  "id" int PRIMARY KEY
-) INHERITS ("entity");
+);
--- ALTER TABLE "background" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "background" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "background_items" (
   "background_id" int,
@@ -380,15 +381,15 @@ CREATE TYPE "campaign_feature_category" AS ENUM (
 );
 
 CREATE TABLE "campaign_feature" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "level" int,
   "action_type" action_type NOT NULL,
   "actions" int NOT NULL,
   "category" campaign_feature_category NOT NULL,
   "prerequisites" varchar,
   "extra" text
-) INHERITS ("entity");
+);
--- ALTER TABLE "campaign_feature" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "campaign_feature" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 
 -- Class
@@ -404,13 +405,13 @@ CREATE TYPE "class_progression_type" AS ENUM (
 );
 
 CREATE TABLE "class" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "hp" int NOT NULL,
   "perception" int NOT NULL,
   "spellcasting" bool NOT NULL,
   "additionalTrainedSkills" int NOT NULL
-) INHERITS ("entity");
+);
--- ALTER TABLE "class" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "class" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "class_key_abilities" (
   "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
@@ -452,11 +453,11 @@ CREATE TYPE "condition_group" AS ENUM (
 );
 
 CREATE TABLE "condition" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "group" condition_group,
   "extra" text
-) INHERITS ("entity");
+);
--- ALTER TABLE "condition" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "condition" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 
 -- Deity
@@ -483,13 +484,13 @@ CREATE TYPE "deity_sanctification" AS ENUM (
 );
 
 CREATE TABLE "deity" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "category" deity_category NOT NULL,
   "font" deity_fonts NOT NULL,
   "sanctification_must" bool NOT NULL,
   "sanctification_type" deity_sanctification NOT NULL
-) INHERITS ("entity");
+);
--- ALTER TABLE "deity" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "deity" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "deity_attributes" (
   "deity_id" int,
@@ -549,7 +550,7 @@ CREATE TYPE "feat_category" AS ENUM (
 );
 
 CREATE TABLE "feat" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "action_type" action_type NOT NULL,
   "actions" int,
   "category" feat_category NOT NULL,
@@ -559,8 +560,8 @@ CREATE TABLE "feat" (
   "location" varchar(12),
   "only_level_1" bool,
   "extra" text
-) INHERITS ("entity");
+);
--- ALTER TABLE "feat" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "feat" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 
 CREATE TABLE "feat_prerequisites" (
   "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
@@ -573,10 +574,10 @@ ALTER TABLE "feat_prerequisites" ADD FOREIGN KEY ("feat_id") REFERENCES "feat" (
 -- Heritage
 
 CREATE TABLE "heritage" (
-  "id" int DEFAULT nextval('entity_sequence') PRIMARY KEY,
+  "id" int PRIMARY KEY,
   "ancestry_id" int
-) INHERITS ("entity");
+);
--- ALTER TABLE "heritage" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
+ALTER TABLE "heritage" ADD FOREIGN KEY ("id") REFERENCES "entity" ("id");
 ALTER TABLE "heritage" ADD FOREIGN KEY ("ancestry_id") REFERENCES "ancestry" ("id");
 
 
@@ -599,6 +600,7 @@ $func$;
 
 ----------------------------------------------------------------------------------------------
 
+
 CREATE OR REPLACE FUNCTION f_drop_tables()
   RETURNS void
   LANGUAGE plpgsql AS
@@ -616,7 +618,7 @@ $func$;
 
 ----------------------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION f_drop_tables(_username text)
+CREATE OR REPLACE FUNCTION f_permission_tables(_username text)
   RETURNS void
   LANGUAGE plpgsql AS
 $func$

dbml/schema.dbml

@@ -14,8 +14,6 @@ Table entity {
 
     is_translated bool [default: false, note: "Первичный импорт идёт из англоязычного источника, перевод приходит вторым"]
     is_checked bool [default: false, note: "Флаг, указывающий, что перевод был проверен вручную и не требует обновления парсером"]
-
-    
 }
 Enum entity_type {
     action
@@ -98,6 +96,7 @@ Table entity_external {
 Table trait {
     id int [pk, increment]
     name varchar [not null]
+    slug varchar [not null]
     description text [not null]
     type trait_type [not null]
 }
@@ -369,7 +368,7 @@ Enum class_progression_type {
 Table condition {
     id int [pk, ref: - entity.id]
 
-    group condition_group [null]
+    group condition_group [null, note: "{}.group"]
 
     extra text [null, note: "json для того, что надо рассмотреть"]