Merge pull request '#30215522, #30770058 Фикс ГГД' (#254) from fix/well_operations into dev

Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/254

AsbCloudDb/Migrations/20240415043251_Update_WellOperationName.cs

@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace AsbCloudDb.Migrations
+{
+    /// <inheritdoc />
+    public partial class Update_WellOperationName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "t_well_operation_category",
+                keyColumn: "id",
+                keyValue: 5089,
+                column: "name",
+                value: "Спуск КО на транспортной колонне");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "t_well_operation_category",
+                keyColumn: "id",
+                keyValue: 5089,
+                column: "name",
+                value: "Спуск КО на транспотрной колонне");
+        }
+    }
+}

AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs

@@ -284,7 +284,7 @@ namespace AsbCloudDb.Migrations
                         .HasColumnName("date")
                         .HasComment("Дата формирования отчёта");
 
-                    b.Property<DateTime?>("DateLastUpdate")
+                    b.Property<DateTimeOffset?>("DateLastUpdate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_last_update")
                         .HasComment("Дата последнего обновления");
@@ -1418,7 +1418,7 @@ namespace AsbCloudDb.Migrations
 
                     NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
 
-                    b.Property<DateTime>("DateDownload")
+                    b.Property<DateTimeOffset>("DateDownload")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("date_download")
                         .HasComment("Дата загрузки");
@@ -1613,17 +1613,17 @@ namespace AsbCloudDb.Migrations
                         .HasColumnName("message")
                         .HasComment("Сообщение уведомления");
 
-                    b.Property<DateTime?>("ReadDate")
+                    b.Property<DateTimeOffset?>("ReadDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("read_date")
                         .HasComment("Дата прочтения уведомления");
 
-                    b.Property<DateTime>("RegistrationDate")
+                    b.Property<DateTimeOffset>("RegistrationDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("registration_date")
                         .HasComment("Дата регистрации уведомления");
 
-                    b.Property<DateTime?>("SentDate")
+                    b.Property<DateTimeOffset?>("SentDate")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("sent_date")
                         .HasComment("Дата отправки уведомления");
@@ -7136,7 +7136,7 @@ namespace AsbCloudDb.Migrations
                             IdParent = 4005,
                             KeyValueName = "dT",
                             KeyValueUnits = "мин",
-                            Name = "Спуск КО на транспотрной колонне"
+                            Name = "Спуск КО на транспортной колонне"
                         },
                         new
                         {

AsbCloudDb/Model/WellOperationCategory.cs

@@ -358,7 +358,7 @@ namespace AsbCloudDb.Model
             new () {Id = 5086, IdParent = 4005, Name = "Подъем БИ с выбросом на мостки", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5087, IdParent = 4005, Name = "Спуск БИ со сборкой с мостков", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5088, IdParent = 4005, Name = "Сборка и спуск ТБТ", KeyValueName = "dT", KeyValueUnits = "мин" },
-            new () {Id = 5089, IdParent = 4005, Name = "Спуск КО на транспотрной колонне", KeyValueName = "dT", KeyValueUnits = "мин" },
+            new () {Id = 5089, IdParent = 4005, Name = "Спуск КО на транспортной колонне", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5090, IdParent = 4008, Name = "Отворот допускной трубы", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5091, IdParent = 4008, Name = "Активация подвески, опрессовка", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5092, IdParent = 4008, Name = "Монтаж, опрессовка ФА", KeyValueName = "dT", KeyValueUnits = "мин" },

AsbCloudInfrastructure/Repository/CrudRepositoryBase.cs

@@ -142,11 +142,9 @@ namespace AsbCloudInfrastructure.Repository
             if (ids.Length != existingEntitiesCount)
                 throw new ArgumentInvalidException(nameof(dtos), "Все записи должны существовать в БД");
             
-            var entities = dtos.Select(Convert);
+            var entities = dbContext.Set<TEntity>().Where(e => ids.Contains(e.Id));
-            var entries = entities.Select(entity => dbSet.Update(entity)).Cast<EntityEntry>().ToList();
+            dbContext.Set<TEntity>().UpdateRange(entities);
-            var affected = await dbContext.SaveChangesAsync(token);
+            return await dbContext.SaveChangesAsync(token);
-            entries.ForEach(e => e.State = EntityState.Detached);
-            return affected;
         }
 
         /// <inheritdoc/>

AsbCloudInfrastructure/Services/WellOperations/WellOperationParser.cs

@@ -50,7 +50,7 @@ public class WellOperationParser<TTemplateParameters> : ExcelWellRelatedParser<W
 			var message = string.Format(XLExtentions.ProblemDetailsTemplate,
 				TemplateParameters.SheetName,
 				rowNumber,
-				TemplateParameters.Cells[nameof(WellOperationDto.WellSectionTypeCaption)],
+				TemplateParameters.Cells[nameof(WellOperationDto.WellSectionTypeCaption)].ColumnNumber,
 				"Указана некорректная секция");
 			throw new FileFormatException(message);
 		}
@@ -63,7 +63,7 @@ public class WellOperationParser<TTemplateParameters> : ExcelWellRelatedParser<W
 			var message = string.Format(XLExtentions.ProblemDetailsTemplate,
 				TemplateParameters.SheetName,
 				rowNumber,
-				TemplateParameters.Cells[nameof(WellOperationDto.OperationCategoryName)],
+				TemplateParameters.Cells[nameof(WellOperationDto.OperationCategoryName)].ColumnNumber,
 				"Указана некорректная операция");
 			throw new FileFormatException(message);
 		}