diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContext.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContext.cs index f7a1b5d..77af498 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContext.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContext.cs @@ -28,8 +28,8 @@ public class AmineContentCalibrationContext : DbContext { entity.HasKey(x => x.Id); entity.HasMany(x => x.Images) - .WithOne(x => x.Separator) - .HasForeignKey(x => x.SeparatorRecordId) + .WithOne(x => x.UsedInSeparatorRecord) + .HasForeignKey(x => x.UsedInSeparatorRecordId) .OnDelete(DeleteBehavior.Cascade); entity.Property(x => x.Type) .IsRequired() @@ -43,11 +43,11 @@ public class AmineContentCalibrationContext : DbContext { entity.HasKey(x => x.Id); entity.HasMany(x => x.SampleImages) - .WithOne(x => x.CalibrationSample) - .HasForeignKey(x => x.CalibrationSampleId) + .WithOne(x => x.UsedInCalibrationRecordSample) + .HasForeignKey(x => x.UsedInCalibrationRecordSampleId) .OnDelete(DeleteBehavior.Cascade); entity.HasMany(x => x.SeparatorImages) - .WithMany(x => x.UsedInCalibrations) + .WithMany(x => x.UsedInCalibrationRecordsSeparator) .UsingEntity>( "CalibrationSeparatorImage", j => j diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs index 6aebf89..c84b738 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/CalibrationRecord.cs @@ -26,7 +26,7 @@ public record CalibrationRecord public required double? MixtureNormalRate { get; set; } [Comment("Фактический расход кондиционирующей смеси (кг/т | гр/кг)")] public required double? MixtureActualRate { get; set; } - [Comment("Измеренное колличество масла (кг/т | гр/кг)")] + [Comment("Измеренное количество масла (кг/т | гр/кг)")] public required double? MeasuredContent { get; set; } [Comment("Изображения пробы")] public required List SampleImages { get; set; } diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs index df6abcd..4fc5c5c 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/ImageRecord.cs @@ -16,12 +16,12 @@ public record ImageRecord public required string ImagePath { get; set; } // 1:N - public int? SeparatorRecordId { get; set; } - public SeparatorRecord? Separator { get; set; } + public int? UsedInSeparatorRecordId { get; set; } + public SeparatorRecord? UsedInSeparatorRecord { get; set; } - public int? CalibrationSampleId { get; set; } - public CalibrationRecord? CalibrationSample { get; set; } + public int? UsedInCalibrationRecordSampleId { get; set; } + public CalibrationRecord? UsedInCalibrationRecordSample { get; set; } // M:N - public List UsedInCalibrations { get; set; } = new(); + public List UsedInCalibrationRecordsSeparator { get; set; } = new(); } diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.Designer.cs similarity index 90% rename from GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs rename to GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.Designer.cs index 0c5c894..84daae6 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.Designer.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.Designer.cs @@ -8,11 +8,11 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Calibration +namespace GSS2.Core.Analysis.AmineContent.Database.Calibration.Migrations { [DbContext(typeof(AmineContentCalibrationContext))] - [Migration("20260303084152_AmineContentCalibrationInitial")] - partial class AmineContentCalibrationInitial + [Migration("20260313083001_AmineContentCalibration0")] + partial class AmineContentCalibration0 { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -44,7 +44,7 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.Property("MeasuredContent") .HasColumnType("REAL") - .HasComment("Измеренное колличество масла (кг/т | гр/кг)"); + .HasComment("Измеренное количество масла (кг/т | гр/кг)"); b.Property("MixtureActualRate") .HasColumnType("REAL") @@ -103,16 +103,16 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration .HasColumnType("INTEGER") .HasComment("Уникальный идентификатор"); - b.Property("CalibrationSampleId") - .HasColumnType("INTEGER"); - b.Property("ImagePath") .IsRequired() .HasMaxLength(1024) .HasColumnType("TEXT") .HasComment("Путь к файлу изображения"); - b.Property("SeparatorRecordId") + b.Property("UsedInCalibrationRecordSampleId") + .HasColumnType("INTEGER"); + + b.Property("UsedInSeparatorRecordId") .HasColumnType("INTEGER"); b.Property("Uv254Intensity") @@ -129,9 +129,9 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.HasKey("Id"); - b.HasIndex("CalibrationSampleId"); + b.HasIndex("UsedInCalibrationRecordSampleId"); - b.HasIndex("SeparatorRecordId"); + b.HasIndex("UsedInSeparatorRecordId"); b.ToTable("ImageRecords"); }); @@ -177,19 +177,19 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration modelBuilder.Entity("GSS2.Core.Analysis.AmineContent.Database.Calibration.ImageRecord", b => { - b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", "CalibrationSample") + b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", "UsedInCalibrationRecordSample") .WithMany("SampleImages") - .HasForeignKey("CalibrationSampleId") + .HasForeignKey("UsedInCalibrationRecordSampleId") .OnDelete(DeleteBehavior.Cascade); - b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.SeparatorRecord", "Separator") + b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.SeparatorRecord", "UsedInSeparatorRecord") .WithMany("Images") - .HasForeignKey("SeparatorRecordId") + .HasForeignKey("UsedInSeparatorRecordId") .OnDelete(DeleteBehavior.Cascade); - b.Navigation("CalibrationSample"); + b.Navigation("UsedInCalibrationRecordSample"); - b.Navigation("Separator"); + b.Navigation("UsedInSeparatorRecord"); }); modelBuilder.Entity("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", b => diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.cs similarity index 88% rename from GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs rename to GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.cs index cb4f6b3..48e6ccc 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/20260303084152_AmineContentCalibrationInitial.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/20260313083001_AmineContentCalibration0.cs @@ -3,10 +3,10 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Calibration +namespace GSS2.Core.Analysis.AmineContent.Database.Calibration.Migrations { /// - public partial class AmineContentCalibrationInitial : Migration + public partial class AmineContentCalibration0 : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -27,7 +27,7 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration MixtureAmineContent = table.Column(type: "REAL", nullable: true, comment: "Содержание аминов в кондиционирующей смеси (%)"), MixtureNormalRate = table.Column(type: "REAL", nullable: true, comment: "Норма расхода кондиционирующей смеси (кг/т | гр/кг)"), MixtureActualRate = table.Column(type: "REAL", nullable: true, comment: "Фактический расход кондиционирующей смеси (кг/т | гр/кг)"), - MeasuredContent = table.Column(type: "REAL", nullable: true, comment: "Измеренное колличество масла (кг/т | гр/кг)") + MeasuredContent = table.Column(type: "REAL", nullable: true, comment: "Измеренное количество масла (кг/т | гр/кг)") }, constraints: table => { @@ -58,21 +58,21 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration Uv365Intensity = table.Column(type: "REAL", nullable: false, comment: "Интенсивность УФ излучения 365 нм (0..1)"), Uv254Intensity = table.Column(type: "REAL", nullable: false, comment: "Интенсивность УФ излучения 254 нм (0..1)"), ImagePath = table.Column(type: "TEXT", maxLength: 1024, nullable: false, comment: "Путь к файлу изображения"), - SeparatorRecordId = table.Column(type: "INTEGER", nullable: true), - CalibrationSampleId = table.Column(type: "INTEGER", nullable: true) + UsedInSeparatorRecordId = table.Column(type: "INTEGER", nullable: true), + UsedInCalibrationRecordSampleId = table.Column(type: "INTEGER", nullable: true) }, constraints: table => { table.PrimaryKey("PK_ImageRecords", x => x.Id); table.ForeignKey( - name: "FK_ImageRecords_CalibrationRecords_CalibrationSampleId", - column: x => x.CalibrationSampleId, + name: "FK_ImageRecords_CalibrationRecords_UsedInCalibrationRecordSampleId", + column: x => x.UsedInCalibrationRecordSampleId, principalTable: "CalibrationRecords", principalColumn: "Id", onDelete: ReferentialAction.Cascade); table.ForeignKey( - name: "FK_ImageRecords_SeparatorRecords_SeparatorRecordId", - column: x => x.SeparatorRecordId, + name: "FK_ImageRecords_SeparatorRecords_UsedInSeparatorRecordId", + column: x => x.UsedInSeparatorRecordId, principalTable: "SeparatorRecords", principalColumn: "Id", onDelete: ReferentialAction.Cascade); @@ -108,14 +108,14 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration column: "ImageRecordId"); migrationBuilder.CreateIndex( - name: "IX_ImageRecords_CalibrationSampleId", + name: "IX_ImageRecords_UsedInCalibrationRecordSampleId", table: "ImageRecords", - column: "CalibrationSampleId"); + column: "UsedInCalibrationRecordSampleId"); migrationBuilder.CreateIndex( - name: "IX_ImageRecords_SeparatorRecordId", + name: "IX_ImageRecords_UsedInSeparatorRecordId", table: "ImageRecords", - column: "SeparatorRecordId"); + column: "UsedInSeparatorRecordId"); } /// diff --git a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/AmineContentCalibrationContextModelSnapshot.cs similarity index 91% rename from GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs rename to GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/AmineContentCalibrationContextModelSnapshot.cs index 59a5fb9..06fa5f6 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Calibration/AmineContentCalibrationContextModelSnapshot.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Calibration/Migrations/AmineContentCalibrationContextModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Calibration +namespace GSS2.Core.Analysis.AmineContent.Database.Calibration.Migrations { [DbContext(typeof(AmineContentCalibrationContext))] partial class AmineContentCalibrationContextModelSnapshot : ModelSnapshot @@ -41,7 +41,7 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.Property("MeasuredContent") .HasColumnType("REAL") - .HasComment("Измеренное колличество масла (кг/т | гр/кг)"); + .HasComment("Измеренное количество масла (кг/т | гр/кг)"); b.Property("MixtureActualRate") .HasColumnType("REAL") @@ -100,16 +100,16 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration .HasColumnType("INTEGER") .HasComment("Уникальный идентификатор"); - b.Property("CalibrationSampleId") - .HasColumnType("INTEGER"); - b.Property("ImagePath") .IsRequired() .HasMaxLength(1024) .HasColumnType("TEXT") .HasComment("Путь к файлу изображения"); - b.Property("SeparatorRecordId") + b.Property("UsedInCalibrationRecordSampleId") + .HasColumnType("INTEGER"); + + b.Property("UsedInSeparatorRecordId") .HasColumnType("INTEGER"); b.Property("Uv254Intensity") @@ -126,9 +126,9 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration b.HasKey("Id"); - b.HasIndex("CalibrationSampleId"); + b.HasIndex("UsedInCalibrationRecordSampleId"); - b.HasIndex("SeparatorRecordId"); + b.HasIndex("UsedInSeparatorRecordId"); b.ToTable("ImageRecords"); }); @@ -174,19 +174,19 @@ namespace GSS2.Core.Analysis.AmineContent.Database.Calibration modelBuilder.Entity("GSS2.Core.Analysis.AmineContent.Database.Calibration.ImageRecord", b => { - b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", "CalibrationSample") + b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", "UsedInCalibrationRecordSample") .WithMany("SampleImages") - .HasForeignKey("CalibrationSampleId") + .HasForeignKey("UsedInCalibrationRecordSampleId") .OnDelete(DeleteBehavior.Cascade); - b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.SeparatorRecord", "Separator") + b.HasOne("GSS2.Core.Analysis.AmineContent.Database.Calibration.SeparatorRecord", "UsedInSeparatorRecord") .WithMany("Images") - .HasForeignKey("SeparatorRecordId") + .HasForeignKey("UsedInSeparatorRecordId") .OnDelete(DeleteBehavior.Cascade); - b.Navigation("CalibrationSample"); + b.Navigation("UsedInCalibrationRecordSample"); - b.Navigation("Separator"); + b.Navigation("UsedInSeparatorRecord"); }); modelBuilder.Entity("GSS2.Core.Analysis.AmineContent.Database.Calibration.CalibrationRecord", b => diff --git a/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.Designer.cs similarity index 97% rename from GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs rename to GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.Designer.cs index ae8c3ef..19930d7 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.Designer.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.Designer.cs @@ -8,11 +8,11 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Results +namespace GSS2.Core.Analysis.AmineContent.Database.Results.Migrations { [DbContext(typeof(AmineContentResultsContext))] - [Migration("20260303084204_AmineContentResultsInitial")] - partial class AmineContentResultsInitial + [Migration("20260313083009_AmineContentResults0")] + partial class AmineContentResults0 { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.cs b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.cs similarity index 98% rename from GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.cs rename to GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.cs index 831a715..a8bfc4a 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Results/20260303084204_AmineContentResultsInitial.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/20260313083009_AmineContentResults0.cs @@ -3,10 +3,10 @@ using Microsoft.EntityFrameworkCore.Migrations; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Results +namespace GSS2.Core.Analysis.AmineContent.Database.Results.Migrations { /// - public partial class AmineContentResultsInitial : Migration + public partial class AmineContentResults0 : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/GSS2.Core/Analysis/AmineContent/Database/Results/AmineContentResultsContextModelSnapshot.cs b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/AmineContentResultsContextModelSnapshot.cs similarity index 98% rename from GSS2.Core/Analysis/AmineContent/Database/Results/AmineContentResultsContextModelSnapshot.cs rename to GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/AmineContentResultsContextModelSnapshot.cs index 9eeb417..35c1e3d 100644 --- a/GSS2.Core/Analysis/AmineContent/Database/Results/AmineContentResultsContextModelSnapshot.cs +++ b/GSS2.Core/Analysis/AmineContent/Database/Results/Migrations/AmineContentResultsContextModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; #nullable disable -namespace GSS2.Core.Analysis.AmineContent.Database.Results +namespace GSS2.Core.Analysis.AmineContent.Database.Results.Migrations { [DbContext(typeof(AmineContentResultsContext))] partial class AmineContentResultsContextModelSnapshot : ModelSnapshot diff --git a/GSS2.Core/tools/CreateMigrations.ps1 b/GSS2.Core/tools/CreateMigrations.ps1 index e301eb9..83c2019 100644 --- a/GSS2.Core/tools/CreateMigrations.ps1 +++ b/GSS2.Core/tools/CreateMigrations.ps1 @@ -1,2 +1,2 @@ -dotnet ef migrations add -o .\Analysis\AmineContent\Database\Calibration --project .\GSS2.Core\ AmineContentCalibrationInitial --context AmineContentCalibrationContext -dotnet ef migrations add -o .\Analysis\AmineContent\Database\Results --project .\GSS2.Core\ AmineContentResultsInitial --context AmineContentResultsContext \ No newline at end of file +dotnet ef migrations add -o .\Analysis\AmineContent\Database\Calibration\Migrations --project .\GSS2.Core\ AmineContentCalibration0 --context AmineContentCalibrationContext +dotnet ef migrations add -o .\Analysis\AmineContent\Database\Results\Migrations --project .\GSS2.Core\ AmineContentResults0 --context AmineContentResultsContext \ No newline at end of file diff --git a/GSS2.Core/tools/CreateMigrations.sh b/GSS2.Core/tools/CreateMigrations.sh index 7b73f60..d069ec8 100644 --- a/GSS2.Core/tools/CreateMigrations.sh +++ b/GSS2.Core/tools/CreateMigrations.sh @@ -1,2 +1,2 @@ -dotnet ef migrations add -o ./Analysis/AmineContent/Database/Calibration --project ./GSS2.Core/ AmineContentCalibrationInitial --context AmineContentCalibrationContext -dotnet ef migrations add -o ./Analysis/AmineContent/Database/Results --project ./GSS2.Core/ AmineContentResultsInitial --context AmineContentResultsContext \ No newline at end of file +dotnet ef migrations add -o ./Analysis/AmineContent/Database/Calibration/Migrations --project ./GSS2.Core/ AmineContentCalibration0 --context AmineContentCalibrationContext +dotnet ef migrations add -o ./Analysis/AmineContent/Database/Results/Migrations --project ./GSS2.Core/ AmineContentResults0 --context AmineContentResultsContext \ No newline at end of file