Плановая траектория изменение модели

1. Поправил сущность и DTO
2. Создал новые миграции

AsbCloudApp/Data/TrajectoryGeoFactDto.cs

@@ -33,16 +33,6 @@ public abstract class TrajectoryGeoDto
     /// Глубина вертикальная
     /// </summary>
     public double? VerticalDepth { get; set; }
-    
-    /// <summary>
-    /// Север отн- но устья
-    /// </summary>
-    public double? NorthOrifice { get; set; }
-    
-    /// <summary>
-    /// Восток отн- но устья
-    /// </summary>
-    public double? EastOrifice { get; set; }
 }
 
 /// <summary>

AsbCloudApp/Data/TrajectoryGeoPlanDto.cs

@@ -21,41 +21,6 @@ namespace AsbCloudApp.Data
         /// </summary>
         public int IdUser { get; set; }
         
-        /// <summary>
-        /// Абсолютная отметка
-        /// </summary>
-        public double AbsoluteMark { get; set; }
-
-        /// <summary>
-        /// Восток картографический
-        /// </summary>
-        public double EastCartographic { get; set; }
-
-        /// <summary>
-        /// Север картографический
-        /// </summary>
-        public double NorthCartographic { get; set; }
-
-        /// <summary>
-        /// Пространственная интенсивность
-        /// </summary>
-        public double SpatialIntensity { get; set; }
-
-        /// <summary>
-        /// Интенсивность по углу
-        /// </summary>
-        public double AngleIntensity { get; set; }
-
-        /// <summary>
-        /// Интенсивность по азимуту
-        /// </summary>
-        public double AzimuthIntensity { get; set; }
-
-        /// <summary>
-        /// Смещение от устья
-        /// </summary>
-        public double OrificeOffset { get; set; }
-
         /// <summary>
         /// Радиус цели
         /// </summary>

AsbCloudDb/Migrations/20230821110455_Update_PlannedTrajectory.cs

@@ -0,0 +1,123 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AsbCloudDb.Migrations
+{
+    public partial class Update_PlannedTrajectory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "absolute_mark",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "angle_intensity",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "azimuth_intensity",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "east_cartographic",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "east_orifice",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "north_cartographic",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "north_orifice",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "orifice_offset",
+                table: "t_planned_trajectory");
+
+            migrationBuilder.DropColumn(
+                name: "spatial_intensity",
+                table: "t_planned_trajectory");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<double>(
+                name: "absolute_mark",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Абсолютная отметка");
+
+            migrationBuilder.AddColumn<double>(
+                name: "angle_intensity",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Интенсивность по углу");
+
+            migrationBuilder.AddColumn<double>(
+                name: "azimuth_intensity",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Интенсивность по азимуту");
+
+            migrationBuilder.AddColumn<double>(
+                name: "east_cartographic",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Восток картографический");
+
+            migrationBuilder.AddColumn<double>(
+                name: "east_orifice",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Восток отн-но устья");
+
+            migrationBuilder.AddColumn<double>(
+                name: "north_cartographic",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Север картографический");
+
+            migrationBuilder.AddColumn<double>(
+                name: "north_orifice",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Север отн-но устья");
+
+            migrationBuilder.AddColumn<double>(
+                name: "orifice_offset",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Смещение от устья");
+
+            migrationBuilder.AddColumn<double>(
+                name: "spatial_intensity",
+                table: "t_planned_trajectory",
+                type: "double precision",
+                nullable: false,
+                defaultValue: 0.0,
+                comment: "Пространственная интенсивность");
+        }
+    }
+}

AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs

@@ -2175,26 +2175,11 @@ namespace AsbCloudDb.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
-                    b.Property<double>("AbsoluteMark")
-                        .HasColumnType("double precision")
-                        .HasColumnName("absolute_mark")
-                        .HasComment("Абсолютная отметка");
-
-                    b.Property<double>("AngleIntensity")
-                        .HasColumnType("double precision")
-                        .HasColumnName("angle_intensity")
-                        .HasComment("Интенсивность по углу");
-
                     b.Property<double>("AzimuthGeo")
                         .HasColumnType("double precision")
                         .HasColumnName("azimuth_geo")
                         .HasComment("Азимут Географ.");
 
-                    b.Property<double>("AzimuthIntensity")
-                        .HasColumnType("double precision")
-                        .HasColumnName("azimuth_intensity")
-                        .HasComment("Интенсивность по азимуту");
-
                     b.Property<double>("AzimuthMagnetic")
                         .HasColumnType("double precision")
                         .HasColumnName("azimuth_magnetic")
@@ -2205,16 +2190,6 @@ namespace AsbCloudDb.Migrations
                         .HasColumnName("comment")
                         .HasComment("Комментарии");
 
-                    b.Property<double>("EastCartographic")
-                        .HasColumnType("double precision")
-                        .HasColumnName("east_cartographic")
-                        .HasComment("Восток картографический");
-
-                    b.Property<double>("EastOrifice")
-                        .HasColumnType("double precision")
-                        .HasColumnName("east_orifice")
-                        .HasComment("Восток отн-но устья");
-
                     b.Property<int>("IdUser")
                         .HasColumnType("integer")
                         .HasColumnName("id_user")
@@ -2225,31 +2200,11 @@ namespace AsbCloudDb.Migrations
                         .HasColumnName("id_well")
                         .HasComment("ID скважины");
 
-                    b.Property<double>("NorthCartographic")
-                        .HasColumnType("double precision")
-                        .HasColumnName("north_cartographic")
-                        .HasComment("Север картографический");
-
-                    b.Property<double>("NorthOrifice")
-                        .HasColumnType("double precision")
-                        .HasColumnName("north_orifice")
-                        .HasComment("Север отн-но устья");
-
-                    b.Property<double>("OrificeOffset")
-                        .HasColumnType("double precision")
-                        .HasColumnName("orifice_offset")
-                        .HasComment("Смещение от устья");
-
                     b.Property<double?>("Radius")
                         .HasColumnType("double precision")
                         .HasColumnName("radius")
                         .HasComment("Радиус цели");
 
-                    b.Property<double>("SpatialIntensity")
-                        .HasColumnType("double precision")
-                        .HasColumnName("spatial_intensity")
-                        .HasComment("Пространственная интенсивность");
-
                     b.Property<DateTimeOffset>("UpdateDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("update_date")

AsbCloudDb/Model/PlannedTrajectory.cs

@@ -35,33 +35,6 @@ namespace AsbCloudDb.Model
         [Column("vertical_depth"), Comment("Глубина вертикальная")]
         public double VerticalDepth { get; set; }
 
-        [Column("absolute_mark"), Comment("Абсолютная отметка")]
-        public double AbsoluteMark { get; set; }
-
-        [Column("north_orifice"), Comment("Север отн-но устья")]
-        public double NorthOrifice { get; set; }
-
-        [Column("east_orifice"), Comment("Восток отн-но устья")]
-        public double EastOrifice { get; set; }
-
-        [Column("east_cartographic"), Comment("Восток картографический")]
-        public double EastCartographic { get; set; }
-
-        [Column("north_cartographic"), Comment("Север картографический")]
-        public double NorthCartographic { get; set; }
-
-        [Column("spatial_intensity"), Comment("Пространственная интенсивность")]
-        public double SpatialIntensity { get; set; }
-
-        [Column("angle_intensity"), Comment("Интенсивность по углу")]
-        public double AngleIntensity { get; set; }
-
-        [Column("azimuth_intensity"), Comment("Интенсивность по азимуту")]
-        public double AzimuthIntensity { get; set; }
-
-        [Column("orifice_offset"), Comment("Смещение от устья")]
-        public double OrificeOffset { get; set; }
-
         [Column("comment"), Comment("Комментарии")]
         public string? Comment { get; set; }
 

AsbCloudInfrastructure/Repository/TrajectoryFactRepository.cs

@@ -41,8 +41,6 @@ namespace AsbCloudInfrastructure.Repository
                     IdWell = idWell,
                     AzimuthMagnetic = coord.Svymtf,
                     VerticalDepth = coord.Deptsvyv,
-                    NorthOrifice = coord.Svyns,
-                    EastOrifice = coord.Svyew,
                     WellboreDepth = coord.Deptsvym!.Value,
                     ZenithAngle = coord.Svyinc!.Value,
                     AzimuthGeo = coord.Svyazc!.Value