From a2da2c912fa3ee168d80096850498d211b9be0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Fri, 8 Dec 2023 15:56:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/WellOperationController.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index cab7e32c..d4723657 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -17,6 +17,7 @@ using AsbCloudApp.Services.WellOperationImport; using AsbCloudApp.Data.WellOperationImport.Options; using AsbCloudApp.Exceptions; using AsbCloudDb.Model; +using AsbCloudInfrastructure; namespace AsbCloudWebApi.Controllers { @@ -267,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 { @@ -356,7 +357,6 @@ namespace AsbCloudWebApi.Controllers [HttpPost("import/fact/default/{deleteBeforeInsert:bool}")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status204NoContent)] [Permission] public Task ImportFactDefaultExcelFileAsync(int idWell, [FromForm] IFormFileCollection files, @@ -384,7 +384,6 @@ namespace AsbCloudWebApi.Controllers [HttpPost("import/plan/default")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status204NoContent)] [Permission] public Task ImportPlanDefaultExcelFileAsync(int idWell, [FromForm] IFormFileCollection files, @@ -411,7 +410,6 @@ namespace AsbCloudWebApi.Controllers [HttpPost("import/plan/gazpromKhantos")] [ProducesResponseType(typeof(IEnumerable), StatusCodes.Status200OK)] [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status204NoContent)] [Permission] public Task ImportPlanGazpromKhantosExcelFileAsync(int idWell, [FromForm] IFormFileCollection files, @@ -533,14 +531,14 @@ 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 (!wellOperations.Any()) - return NoContent(); - + { + if (dateStart.HasValue) + wellOperation.Day = (wellOperation.DateStart - dateStart.Value).TotalDays; + } + //TODO: очень быстрый костыль if (deleteBeforeInsert is not null && options.IdType == WellOperation.IdOperationTypeFact) {