mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dal): из таблицы JobGroup удалено поле IsUmbrella

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-11-25 12:26:24 +10:00
parent 1aabd3a844
commit ce12f1b5fe
6 changed files with 4013 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PARR.API/Controllers/V1/JobController.cs
View File

@@ -78,7 +78,7 @@ namespace PARR.API.Controllers.V1
{
query = query
.Include(t => t.Tnk)
.Include(t => t.Group).ThenInclude(t=>t.GroupType);
.Include(t => t.Group).ThenInclude(t => t.GroupType);
query = query
.Include(t => t.UnitFilters)
@@ -117,7 +117,7 @@ namespace PARR.API.Controllers.V1
{
var job = await jobService.Get()
.Include(t => t.Tnk)
.Include(t => t.Group).ThenInclude(t=>t.GroupType)
.Include(t => t.Group).ThenInclude(t => t.GroupType)
.Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters)
.ThenInclude(t => t.UnitField)
@@ -158,12 +158,15 @@ namespace PARR.API.Controllers.V1
#region Проверка существования работы с такими же параметрами
var isExistTheSameLinks = await jobService.Get()
.Include(t => t.Group).ThenInclude(t => t.GroupType)
.CountAsync(t =>
t.Group!.IsUmbrella == true &&
//t.Group!.IsUmbrella == true &&
t.Group!.GroupType!.Code == JobGroupTypesEnum.Umbrella &&
t.GroupId == request.GroupId &&
(t.MinValueRelationships == request.MinValueRelationships ||
t.MaxValueRelationships == request.MaxValueRelationships)
);
);
if (isExistTheSameLinks > 0)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.Name), Message = $"Работа с указанным диапазоном связей пересекается с уже имеющейся в базе данных({request.MinValueRelationships}-{request.MaxValueRelationships})" } }));
#endregion
@@ -178,7 +181,7 @@ namespace PARR.API.Controllers.V1
var createdJob = await jobService.Get()
.Include(t => t.Tnk)
.Include(t => t.Group).ThenInclude(t=>t.GroupType)
.Include(t => t.Group).ThenInclude(t => t.GroupType)
.Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters)
.ThenInclude(t => t.UnitField)
@@ -211,7 +214,7 @@ namespace PARR.API.Controllers.V1
var orig = await jobService.Get()
.Include(t => t.Tnk)
.Include(t => t.Group).ThenInclude(t=>t.GroupType)
.Include(t => t.Group).ThenInclude(t => t.GroupType)
.Include(t => t.UnitFilters)
.ThenInclude(t => t.FieldFilters)
.Include(t => t.UnitFilters)

10
PARR.API/Controllers/V1/JobGroupController.cs
View File

@@ -234,7 +234,7 @@ namespace PARR.API.Controllers.V1
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении группы заданий на выполнение работ." } }));
logger.LogInformation($"Пользователь {User.Identity?.Name} обновил группу заданий на выполнение работ: {orig.Id}," +
$" {orig.GroupName}, {orig.IsUmbrella}, {orig.ShortDescription}, {orig.FullDescription}," +
$" {orig.GroupName}, {orig.ShortDescription}, {orig.FullDescription}," +
$" {orig.Solution}, {orig.TemplateDuration}, {orig.ReferenceDate}, {orig.IsAutoDistributionEnabled}" +
$", {orig.IsAgent}, {orig.AgentName}, {orig.AgentTimeOutSec}, {orig.AgentScript}");
@@ -299,10 +299,10 @@ namespace PARR.API.Controllers.V1
} }));
logger.LogInformation($"Пользователь {User.Identity?.Name} удалил группу заданий на выполнение работ: {jobGroup.Id},{jobGroup.GroupName}," +
$" {jobGroup.IsUmbrella}, {jobGroup.ShortDescription}, {jobGroup.FullDescription}," +
$" {jobGroup.Solution}, {jobGroup.TemplateDuration}, {jobGroup.ReferenceDate}" +
$"{jobGroup.IsAutoDistributionEnabled}, {jobGroup.IsAgent}, {jobGroup.AgentName}" +
$"{jobGroup.AgentTimeOutSec}, {jobGroup.AgentScript}");
$" {jobGroup.ShortDescription}, {jobGroup.FullDescription}," +
$" {jobGroup.Solution}, {jobGroup.TemplateDuration}, {jobGroup.ReferenceDate}," +
$" {jobGroup.IsAutoDistributionEnabled}, {jobGroup.IsAgent}, {jobGroup.AgentName}," +
$" {jobGroup.AgentTimeOutSec}, {jobGroup.AgentScript}");
return NoContent();
}