diff --git a/AsbCloudApp/Data/WellOperationDto.cs b/AsbCloudApp/Data/WellOperationDto.cs index 310b25d5..57fe41e0 100644 --- a/AsbCloudApp/Data/WellOperationDto.cs +++ b/AsbCloudApp/Data/WellOperationDto.cs @@ -34,6 +34,7 @@ namespace AsbCloudApp.Data /// id категории операции /// [Required] + [Range(5000, int.MaxValue)] public int IdCategory { get; set; } /// diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs index bcdc8d25..9bc3ee2a 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationImportService.cs @@ -45,6 +45,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService if (categories is null) { categories = db.WellOperationCategories + .Where(c => c.Id >= 5000) .AsNoTracking() .ToList(); } @@ -298,8 +299,8 @@ namespace AsbCloudInfrastructure.Services.WellOperationService if (vCategory is string categoryName) { var category = Categories.Find(c => c.Name.ToLower() == categoryName.ToLower()); - if (category is null || category.Id < 5000) - throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} указана некорректная категория операции"); + if (category is null) + throw new FileFormatException($"Лист {row.Worksheet.Name}. Строка {row.RowNumber()} указана некорректная категория операции ({categoryName})"); operation.IdCategory = category.Id; operation.CategoryName = category.Name; diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index ac3ce0f0..77e68531 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -244,9 +244,6 @@ namespace AsbCloudWebApi.Controllers if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false)) return Forbid(); - if (value.IdCategory < 5000) - throw new ArgumentInvalidException($"Выбрана некорректная категория скважины", nameof(value.IdCategory)); - value.IdWell = idWell; value.Id = idOperation; value.LastUpdateDate = DateTimeOffset.UtcNow;