Merge branch 'dev' into feature/sections

AsbCloudApp/Data/User/ContactDto.cs

@@ -1,12 +1,11 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace AsbCloudApp.Data.User
+namespace AsbCloudApp.Data.User;
-{
+
 /// <summary>
 /// Контакт
 /// </summary>
-
 public class ContactDto : IId
 {
     /// <inheritdoc/>
@@ -16,12 +15,14 @@ namespace AsbCloudApp.Data.User
     /// ключ типа компании
     /// </summary>
     [Required]
+    [Range(1, int.MaxValue)]
     public int IdCompanyType { get; set; }
 
     /// <summary>
     /// ключ скважины
     /// </summary>
     [Required]
+    [Range(1,int.MaxValue)]
     public int IdWell { get; set; }
 
     /// <summary>
@@ -54,8 +55,6 @@ namespace AsbCloudApp.Data.User
     /// Компания
     /// </summary>
     [Required]
-        [StringLength(260, MinimumLength = 3, ErrorMessage = "Допустимая длина должности от 3 до 260 символов")]
+    [StringLength(260, MinimumLength = 3, ErrorMessage = "Допустимая длина названия компании от 3 до 260 символов")]
     public string Company { get; set; } = null!;
-
-    }
 }

AsbCloudWebApi/Controllers/WellOperationController.cs

@@ -16,6 +16,8 @@ using AsbCloudApp.Data.WellOperationImport;
 using AsbCloudApp.Services.WellOperationImport;
 using AsbCloudApp.Data.WellOperationImport.Options;
 using AsbCloudApp.Exceptions;
+using AsbCloudDb.Model;
+using AsbCloudInfrastructure;
 
 namespace AsbCloudWebApi.Controllers
 {
@@ -266,7 +268,7 @@ namespace AsbCloudWebApi.Controllers
             if (!await CanUserEditWellOperationsAsync(idWell, cancellationToken))
                 return Forbid();
 
-            if (deleteBeforeInsert && wellOperations.Any())
+            if (deleteBeforeInsert)
             {
                 var existingOperations = await operationRepository.GetAsync(new WellOperationRequest
                 {
@@ -344,46 +346,85 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
 
-
         /// <summary>
-        /// Импорт операций из excel (xlsx) файла. Стандартный заполненный шаблон
+        /// Импорт фактических операций из excel (xlsx) файла. Стандартный заполненный шаблон
+        /// </summary>
+        /// <param name="idWell">id скважины</param>
+        /// <param name="files">Коллекция из одного файла xlsx</param>
+        /// <param name="deleteBeforeInsert">Удалить операции перед сохранением</param>
+        /// <param name="cancellationToken"></param>
+        /// <returns></returns>
+        [HttpPost("import/fact/default/{deleteBeforeInsert:bool}")]
+        [ProducesResponseType(typeof(IEnumerable<WellOperationDto>), StatusCodes.Status200OK)]
+        [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
+        [Permission]
+        public Task<IActionResult> ImportFactDefaultExcelFileAsync(int idWell,
+            [FromForm] IFormFileCollection files,
+            bool deleteBeforeInsert,
+            CancellationToken cancellationToken)
+        {
+            var options = new WellOperationImportDefaultOptionsDto
+            {
+                IdType = WellOperation.IdOperationTypeFact
+            };
+
+            return ImportExcelFileAsync(idWell, files, options,
+                (stream, _) => wellOperationDefaultExcelParser.Parse(stream, options),
+                deleteBeforeInsert,
+                cancellationToken);
+        }
+        
+        /// <summary>
+        /// Импорт плановых операций из excel (xlsx) файла. Стандартный заполненный шаблон
         /// </summary>
         /// <param name="idWell">id скважины</param>
-        /// <param name="options">Параметры для парсинга файла</param>
         /// <param name="files">Коллекция из одного файла xlsx</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        [HttpPost("import/default")]
+        [HttpPost("import/plan/default")]
         [ProducesResponseType(typeof(IEnumerable<WellOperationDto>), StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
         [Permission]
-        public Task<IActionResult> ImportDefaultExcelFileAsync(int idWell,
+        public Task<IActionResult> ImportPlanDefaultExcelFileAsync(int idWell,
-            [FromQuery] WellOperationImportDefaultOptionsDto options,
             [FromForm] IFormFileCollection files,
-            CancellationToken cancellationToken) => ImportExcelFileAsync(idWell, files, options,
+            CancellationToken cancellationToken)
+        {
+            var options = new WellOperationImportDefaultOptionsDto
+            {
+                IdType = WellOperation.IdOperationTypePlan
+            };
+            
+            return ImportExcelFileAsync(idWell, files, options,
                 (stream, _) => wellOperationDefaultExcelParser.Parse(stream, options),
+                null,
                 cancellationToken);
+        }
 
         /// <summary>
         /// Импорт операций из excel (xlsx) файла. ГПНХ (Хантос)
         /// </summary>
         /// <param name="idWell">id скважины</param>
-        /// <param name="options">Параметры для парсинга файла</param>
         /// <param name="files">Коллекция из одного файла xlsx</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        [HttpPost("import/gazpromKhantos")]
+        [HttpPost("import/plan/gazpromKhantos")]
         [ProducesResponseType(typeof(IEnumerable<WellOperationDto>), StatusCodes.Status200OK)]
         [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
         [Permission]
-        public Task<IActionResult> ImportGazpromKhantosExcelFileAsync(int idWell,
+        public Task<IActionResult> ImportPlanGazpromKhantosExcelFileAsync(int idWell,
-            [FromQuery] WellOperationImportGazpromKhantosOptionsDto options,
             [FromForm] IFormFileCollection files,
-            CancellationToken cancellationToken) => ImportExcelFileAsync(idWell, files, options, 
+            CancellationToken cancellationToken)
+        {
+            var options = new WellOperationImportGazpromKhantosOptionsDto
+            {
+                IdType = WellOperation.IdOperationTypePlan
+            };
+            
+            return ImportExcelFileAsync(idWell, files, options,
                 (stream, _) => wellOperationGazpromKhantosExcelParser.Parse(stream, options),
+                null,
                 cancellationToken);
+        }
 
         /// <summary>
         /// Создает excel файл с операциями по скважине
@@ -451,9 +492,11 @@ namespace AsbCloudWebApi.Controllers
             return File(stream, "application/octet-stream", fileName);
         }
 
+        //TODO: deleteBeforeInsert тоже быстрый костыль
         private async Task<IActionResult> ImportExcelFileAsync<TOptions>(int idWell, [FromForm] IFormFileCollection files,
             TOptions options,
             Func<Stream, TOptions, SheetDto> parseMethod,
+            bool? deleteBeforeInsert,
             CancellationToken cancellationToken)
             where TOptions : IWellOperationImportOptions
         {
@@ -488,13 +531,22 @@ namespace AsbCloudWebApi.Controllers
                 var wellOperations = wellOperationImportService.Import(idWell, idUser.Value, options.IdType, sheet)
                     .OrderBy(w => w.DateStart);
 
-                var dateStart = wellOperations.Min(w => w.DateStart);
+                var dateStart = wellOperations.MinOrDefault(w => w.DateStart);
 
                 foreach (var wellOperation in wellOperations)
-                    wellOperation.Day = (wellOperation.DateStart - dateStart).TotalDays;
+                {
+                    if (dateStart.HasValue)
+                        wellOperation.Day = (wellOperation.DateStart - dateStart.Value).TotalDays;
+                }
 
-                if (!wellOperations.Any())
+                //TODO: очень быстрый костыль
-                    return NoContent();
+                if (deleteBeforeInsert is not null && options.IdType == WellOperation.IdOperationTypeFact)
+                {
+                    return await InsertRangeAsync(idWell, options.IdType, 
+                        deleteBeforeInsert.Value, 
+                        wellOperations,
+                        cancellationToken);
+                }
 
                 return Ok(wellOperations);
             }