Отчистка кода после рефакторинга

This commit is contained in:
2025-04-16 13:07:57 +04:00
parent d095001caf
commit 0c95c6d68b
26 changed files with 53 additions and 67 deletions
@@ -8,7 +8,7 @@ public partial class KeywordAlias
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column(Order = 1)]
public int Id { get; set; }
public int Id { get; set; }
[Column(Order = 2)]
public int KeywordId { get; set; }
+6 -7
View File
@@ -1,19 +1,18 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base.Keywords;
using Pf2eDataScrapper.Model.Base.Source;
using Pf2eDataScrapper.Model.Base.Targets;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure;
using Pf2eDataScrapper.Model.Structure.AncestryRelation;
using Pf2eDataScrapper.Model.Structure.BackgroundRelation;
using Pf2eDataScrapper.Model.Structure.ClassRelation;
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using Pf2eDataScrapper.Model.Structure.FeatRelation;
using Pf2eDataScrapper.Model.Structure.SpellRelation;
using Pf2eDataScrapper.Model.Structure;
using Pf2eDataScrapper.Model.Base.Source;
using Pf2eDataScrapper.Model.Base.Targets;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base.Keywords;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System.Reflection.Metadata;
namespace Pf2eDataScrapper.Model;
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -1,7 +1,5 @@
using Pf2eDataScrapper.Model.Structure;
using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.AncestryRelation;
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.AncestryRelation;
@@ -1,7 +1,7 @@
using Pf2eDataScrapper.Model.Structure.BackgroundRelation;
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Structure.BackgroundRelation;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
@@ -1,8 +1,6 @@
using Pf2eDataScrapper.Model.Structure;
using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Base;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
+3 -3
View File
@@ -1,7 +1,7 @@
using Pf2eDataScrapper.Model.Structure.ClassRelation;
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Structure.ClassRelation;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -1,9 +1,9 @@
namespace Pf2eDataScrapper.Model.Structure.ClassRelation;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.ClassRelation;
public partial class ClassProgression
{
[Key]
@@ -1,6 +1,6 @@
using Pf2eDataScrapper.Model.Common;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.ClassRelation;
@@ -1,5 +1,5 @@
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
+5 -5
View File
@@ -1,9 +1,9 @@
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
@@ -9,7 +9,7 @@ public partial class DeitySpell
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column(Order = 1)]
public int Id { get; set; }
[Column(Order = 2)]
public int DeityId { get; set; }
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
+4 -4
View File
@@ -1,8 +1,8 @@
using Pf2eDataScrapper.Model.Structure.FeatRelation;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure.FeatRelation;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -1,5 +1,4 @@
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.FeatRelation;
+2 -2
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
+3 -4
View File
@@ -1,8 +1,7 @@
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Structure.SpellRelation;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure;
@@ -49,7 +48,7 @@ public partial class Spell : IEntity
[Column(Order = 11)]
public bool CanHeightening { get; set; }
public virtual SpellArea? SpellArea { get; set; }
public virtual SpellRitual? SpellRitual { get; set; }
@@ -1,7 +1,6 @@
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
@@ -1,7 +1,6 @@
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations.Schema;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
-1
View File
@@ -1,5 +1,4 @@
using Pf2eDataScrapper;
using Pf2eDataScrapper.Importers.Implementations.Aonprd;
using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry;
EnvSettings.Load();