feat(api): Реализованы JobController, JobGroupController

PARR.API/Contracts/V1/ApiRoutes.cs

@@ -377,6 +377,17 @@
             public const string getParam = "{id}";
         }
 
+        public static class JobGroup
+        {
+            public const string GetAll = Base + "/job-groups/";
+            public const string Get = Base + "/job-groups/" + getParam;
+
+            public const string Delete = Base + "/job-groups/" + getParam;
+            public const string Create = Base + "/job-groups/";
+            public const string Update = Base + "/job-groups/" + getParam;
+
+            public const string getParam = "{id}";
+        }
 
         public static class JobAutoControl
         {

PARR.API/Contracts/V1/Requests/JobGroupRequest.cs

@@ -0,0 +1,29 @@
+namespace PARR.API.Contracts.V1.Requests
+{
+    public class JobGroupRequest
+    {
+        public required string Name { get; set; }
+
+        public bool? IsUmbrella { get; set; }
+
+        public required string ShortDescription { get; set; }
+
+        public required string FullDescription { get; set; }
+
+        public required string Solution { get; set; }
+
+        public required string TemplateDuration { get; set; }
+
+        public DateTimeOffset ReferenceDate { get; set; }
+
+        public bool IsAutoDistributionEnabled { get; set; }
+
+        public bool IsAgent { get; set; }
+
+        public string? AgentName { get; set; }
+
+        public int? AgentTimeOutSec { get; set; }
+
+        public string? AgentScript { get; set; }
+    }
+}

PARR.API/Contracts/V1/Requests/JobRequest.cs

@@ -0,0 +1,19 @@
+namespace PARR.API.Contracts.V1.Requests
+{
+    public class JobRequest
+    {
+        public required Guid TnkId { get; set; }
+
+        public required Guid GroupId { get; set; }
+
+        public required string Name { get; set; }
+
+        public int? MinValueRelationships { get; set; }
+        
+        public int? MaxValueRelationships { get; set; }
+
+        public string? TemplateNameMask { get; set; }
+
+        public required string WorkName { get; set; }
+    }
+}

PARR.API/Contracts/V1/Requests/Queries/JobGroupQuery.cs

@@ -0,0 +1,17 @@
+using PARR.API.Contracts.V1.Requests.BaseRequests;
+
+namespace PARR.API.Contracts.V1.Requests.Queries
+{
+    public class JobGroupQuery: FullQuery
+    {
+        /// <summary>
+        /// Поиск по имени
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Поиск по короткому описанию
+        /// </summary>
+        public string? ShortDescription { get; set; }
+    }
+}

PARR.API/Contracts/V1/Requests/Queries/JobQuery.cs

@@ -0,0 +1,15 @@
+namespace PARR.API.Contracts.V1.Requests.Queries
+{
+    public class JobQuery
+    {
+        /// <summary>
+        /// Поиск по имени
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Поиск по Id группы работ
+        /// </summary>
+        public Guid? GroupId { get; set; }
+    }
+}

PARR.API/Contracts/V1/Responses/ApplicationInWorkResponse.cs

@@ -62,41 +62,41 @@
     }
 
 
-    public class TemplateStats
+    //public class TemplateStats
-    {
+    //{
-        /// <summary>
+    //    /// <summary>
-        /// Активированных шаблонов
+    //    /// Активированных шаблонов
-        /// </summary>
+    //    /// </summary>
-        public int Activated { get; set; }
+    //    public int Activated { get; set; }
 
-        /// <summary>
+    //    /// <summary>
-        /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
+    //    /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
-        /// </summary>
+    //    /// </summary>
-        public int Synchronized { get; set; }
+    //    public int Synchronized { get; set; }
 
-        /// <summary>
+    //    /// <summary>
-        /// Ошибок синхронизации (RobotStatus = 33/Error)
+    //    /// Ошибок синхронизации (RobotStatus = 33/Error)
-        /// </summary>
+    //    /// </summary>
-        public int Errors { get; set; }
+    //    public int Errors { get; set; }
-    }
+    //}
 
 
-    public class ScheduleStats
+    //public class ScheduleStats
-    {
+    //{
-        /// <summary>
+    //    /// <summary>
-        /// Активированных шаблонов
+    //    /// Активированных шаблонов
-        /// </summary>
+    //    /// </summary>
-        public int Activated { get; set; }
+    //    public int Activated { get; set; }
 
-        /// <summary>
+    //    /// <summary>
-        /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
+    //    /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
-        /// </summary>
+    //    /// </summary>
-        public int Synchronized { get; set; }
+    //    public int Synchronized { get; set; }
 
-        /// <summary>
+    //    /// <summary>
-        /// Ошибок синхронизации (RobotStatus = 33/Error)
+    //    /// Ошибок синхронизации (RobotStatus = 33/Error)
-        /// </summary>
+    //    /// </summary>
-        public int Errors { get; set; }
+    //    public int Errors { get; set; }
-    }
+    //}
 
 }

PARR.API/Contracts/V1/Responses/JobBaseResponse.cs

@@ -12,6 +12,52 @@
 
     public class JobResponse : JobBaseResponse
     {
+        public int TemplatesCount { get; set; }
 
+        #region Статистика
+
+        public TemplateStats? TemplateStatistics { get; set; }
+
+        public ScheduleStats? ScheduleStatistics { get; set; }
+
+        #endregion
+    }
+
+
+    public class TemplateStats
+    {
+        /// <summary>
+        /// Активированных шаблонов
+        /// </summary>
+        public int Activated { get; set; }
+
+        /// <summary>
+        /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
+        /// </summary>
+        public int Synchronized { get; set; }
+
+        /// <summary>
+        /// Ошибок синхронизации (RobotStatus = 33/Error)
+        /// </summary>
+        public int Errors { get; set; }
+    }
+
+
+    public class ScheduleStats
+    {
+        /// <summary>
+        /// Активированных шаблонов
+        /// </summary>
+        public int Activated { get; set; }
+
+        /// <summary>
+        /// Синхронизировано шаблонов (TaskStatus = 30/Ok)
+        /// </summary>
+        public int Synchronized { get; set; }
+
+        /// <summary>
+        /// Ошибок синхронизации (RobotStatus = 33/Error)
+        /// </summary>
+        public int Errors { get; set; }
     }
 }

PARR.API/Contracts/V1/Responses/JobGroupResponse.cs

@@ -0,0 +1,38 @@
+using PARR.DAL.Models.Job;
+
+namespace PARR.API.Contracts.V1.Responses
+{
+    public class JobGroupBaseResponse
+    {
+        public Guid Id { get; set; }
+
+        public required string Name { get; set; }
+
+        public bool? IsUmbrella { get; set; }
+
+        public required string ShortDescription { get; set; }
+
+        public required string FullDescription { get; set; }
+
+        public required string Solution { get; set; }
+
+        public required string TemplateDuration { get; set; }
+
+        public DateTimeOffset ReferenceDate { get; set; }
+
+        public bool IsAutoDistributionEnabled { get; set; }
+
+        public bool IsAgent { get; set; }
+
+        public string? AgentName { get; set; }
+
+        public int? AgentTimeOutSec { get; set; }
+
+        public string? AgentScript { get; set; }
+    }
+
+    public class JobGroupResponse : JobGroupBaseResponse
+    {
+        public List<JobResponse>? Jobs { get; set; }
+    }
+}

PARR.API/Controllers/V1/JobController.cs

@@ -0,0 +1,282 @@
+using AutoMapper;
+using FluentValidation;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests;
+using PARR.API.Contracts.V1.Requests.Queries;
+using PARR.API.Contracts.V1.Responses;
+using PARR.API.Contracts.V1.Responses.Base;
+using PARR.API.Controllers.V1.Base;
+using PARR.API.Extensions;
+using PARR.API.Services.Interfaces;
+using PARR.Constants;
+using PARR.DAL.Contracts;
+using PARR.DAL.DomainModels;
+using PARR.DAL.Models.Job;
+using PARR.DAL.Services.Interfaces;
+using PARR.DAL.Services.Interfaces.Job;
+
+namespace PARR.API.Controllers.V1
+{
+    /// <summary>
+    /// Управление работами
+    /// </summary>
+    [Authorize(Roles = ParrRoles.Administrator.Role)]
+    public class JobController : BaseApiController
+    {
+        private readonly ILogger<JobController> logger;
+        private readonly IMapper mapper;
+        private readonly IUriService uriService;
+        private readonly IJobService jobService;
+        private readonly ITemplateService templateService;
+        private readonly IValidator<JobRequest> validator;
+
+        public JobController(
+            ILogger<JobController> logger,
+            IMapper mapper,
+            IUriService uriService,
+            IJobService jobService,
+            ITemplateService templateService,
+            IValidator<JobRequest> validator
+            )
+        {
+            this.logger = logger;
+            this.mapper = mapper;
+            this.uriService = uriService;
+            this.jobService = jobService;
+            this.templateService = templateService;
+            this.validator = validator;
+        }
+
+        /// <summary>
+        /// Получить список заданий на выполнение работ(Job) постранично
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet(ApiRoutes.Job.GetAll)]
+        public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] JobQuery filter)
+        {
+            var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
+
+            IQueryable<Job> query = jobService.Get().Include(t => t.Tnk);
+
+            query = query.OrderBy(t => t.Name);
+
+            if (!string.IsNullOrEmpty(filter.Name))
+                query = query.Where(t => t.Name.ToLower().Contains(filter.Name.ToLower()));
+
+            if (filter.GroupId.HasValue)
+                query = query.Where(t => t.GroupId == filter.GroupId.Value);
+
+            var jobs = await jobService.GetPage(query, paginationFilter).ToListAsync();
+
+            if (!jobs.Any())
+                return NoContent();
+
+            var response = mapper.Map<List<JobResponse>>(jobs);//TODO Migration to job
+
+            var paginationResponse = new PagedResponse<JobResponse>(response, true).GetPaginatedProps(paginationFilter, query);
+
+            return Ok(paginationResponse);
+        }
+
+
+        /// <summary>
+        /// Получить задание на выполнение работ по id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet(ApiRoutes.Job.Get)]
+        public async Task<IActionResult> GetById([FromRoute] Guid id)
+        {
+            var job = await jobService.Get().Include(t => t.Tnk).FirstOrDefaultAsync(t => t.Id == id);
+
+            if (job == null)
+                return NotFound();
+
+            var response = mapper.Map<JobResponse>(job);
+            response.TemplatesCount = await templateService.Get().CountAsync(t => t.JobId == id);
+
+            var statistics = await GetStatisticsAsync(response.Id);
+            BindStatistics(response, statistics);
+
+            return Ok(new Response<JobResponse>(response, true));
+        }
+
+
+        /// <summary>
+        /// Создать задание на выполнение работ (Job)
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost(ApiRoutes.Job.Create)]
+        public async Task<IActionResult> Create([FromBody] JobRequest request)
+        {
+            var resultValidate = await validator.ValidateAsync(request);
+
+            if (!resultValidate.IsValid)
+                return BadRequest(new Response(resultValidate.Errors));
+
+            var job = new Job
+            {
+                Id = Guid.NewGuid(),
+                Name = request.Name.Trim(),
+                WorkName = request.WorkName.Trim(),
+                MinValueRelationships = request.MinValueRelationships,
+                MaxValueRelationships = request.MaxValueRelationships,
+                TemplateNameMask = request.TemplateNameMask?.Trim(),
+                TnkId = request.TnkId,
+                GroupId = request.GroupId
+            };
+
+
+            if (!await jobService.CreateAsync(job) || !await jobService.CommitAsync())
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при созании задания на выполнение работ" } }));
+
+            logger.LogInformation($"Пользователь {User.Identity?.Name} добавил задание на выполнение работ: {job.Id}, {job.Name}, {job.WorkName}");
+
+
+            var createdJob = await jobService.Get().Include(t => t.Tnk)
+                                             .FirstAsync(t => t.Id == job.Id);
+
+            var locationUri = uriService.GetUri(ApiRoutes.Job.Get, ApiRoutes.Job.getParam, createdJob.Id);
+
+            var response = mapper.Map<JobResponse>(createdJob);
+            // так как мы только что создали Job, то у него нет шаблонов, смело ставим = 0 (ускоряем запрос)
+            response.TemplatesCount = 0;
+
+            return Created(locationUri, new Response<JobResponse>(response, true));
+        }
+
+
+        /// <summary>
+        /// Обновить задание на выполнение работ (Job)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPut(ApiRoutes.Job.Update)]
+        public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] JobRequest request)
+        {
+            var resultValidate = await validator.ValidateAsync(request);
+            if (!resultValidate.IsValid)
+                return BadRequest(new Response(resultValidate.Errors));
+
+            var orig = await jobService.Get().Include(t => t.Tnk)
+                                .FirstOrDefaultAsync(t => t.Id == id);
+
+            if (orig == null)
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении задания на выполнение работ. Не найдено задание с Id: {id}" } }));
+
+            orig.Name = request.Name.Trim();
+            orig.WorkName = request.WorkName.Trim();
+            orig.MinValueRelationships = request.MinValueRelationships;
+            orig.MaxValueRelationships = request.MaxValueRelationships;
+            orig.TemplateNameMask = request.TemplateNameMask?.Trim();
+            orig.TnkId = request.TnkId;
+            orig.GroupId = request.GroupId;
+
+            if (!await jobService.CommitAsync())
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при изменении задания на выполнение работ." } }));
+
+            logger.LogInformation($"Пользователь {User.Identity?.Name} обновил задание на выполнение работ: {orig.Id}," +
+                $" {orig.Name}, {orig.WorkName}, {orig.MinValueRelationships}, {orig.MaxValueRelationships}," +
+                $" {orig.TemplateNameMask}, {orig.TnkId}, {nameof(orig.GroupId)}");
+
+
+            var updatedApplicationInWork = await jobService.Get().Include(t => t.Tnk)
+                                        .FirstAsync(t => t.Id == orig.Id);
+
+            var response = mapper.Map<JobResponse>(updatedApplicationInWork);
+            response.TemplatesCount = await templateService.Get().CountAsync(t => t.JobId == id);
+
+            var statistics = await GetStatisticsAsync(response.Id);
+            BindStatistics(response, statistics);
+
+            return Ok(new Response<JobResponse>(response, true));
+
+        }
+
+
+        /// <summary>
+        /// Удалить задание на выполнение работ (только если нет связанных шаблонов)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete(ApiRoutes.Job.Delete)]
+        public async Task<IActionResult> Delete([FromRoute] Guid id)
+        {
+            var job = await jobService.Get().Include(t => t.Tnk)
+                                .FirstOrDefaultAsync(t => t.Id == id);
+
+            if (job == null)
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel {
+                    Message = $"Ошибка при удалении задания на выполнение работ. Не найдено задание на выполнение работ Id: {id}"
+                } }));
+
+            var templateCount = await templateService.Get().CountAsync(t => t.JobId == id);
+
+            if (templateCount > 0)
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel {
+                    Message = $"Ошибка при удалении задания на выполнение работ. С данным заданием связаны шаблоны: {templateCount} шт."
+                } }));
+
+            if (!jobService.Delete(job) || !await jobService.CommitAsync())
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel {
+                    Message = $"Ошибка при удалении задания на выполнение работ"
+                } }));
+
+            logger.LogInformation($"Пользователь {User.Identity?.Name} удалил задание на выполнение работ: {job.Id},{job.Name}," +
+                $" {job.WorkName}, {job.MinValueRelationships}, {job.MaxValueRelationships}," +
+                $" {job.TemplateNameMask}, {job.TnkId}, {job.GroupId}");
+
+            return NoContent();
+        }
+
+
+        /// <summary>
+        /// Загрузка статистики
+        /// </summary>
+        /// <param name="jobId"></param>
+        /// <returns></returns>
+        private async Task<JobStatModel> GetStatisticsAsync(Guid jobId)
+        {
+            var statResult = await jobService.Get()
+                            .Include(t => t.Templates)
+                                .ThenInclude(t => t.RobotConfigurations)
+                            .Where(x => x.Id == jobId)
+                            .Select(t => new
+                            {
+                                TemplateActivated = t.Templates.Count(x => x.IsActiveTemplate),
+                                TemplateSynchronized = t.Templates.Count(x => x.RobotConfigurations.Any(c => c.TaskStatusCode == (int)TaskStatusEnum.Ok && c.RobotCode == (int)RobotsEnum.TemplateOrder)),
+                                TemplateErrors = t.Templates.Count(x => x.RobotConfigurations.Any(c => c.RobotStatusCode == (int)RobotStatusEnum.Error && c.RobotCode == (int)RobotsEnum.TemplateOrder)),
+                                ScheduleActivated = t.Templates.Count(x => x.IsActiveSchedule),
+                                ScheduleSynchronized = t.Templates.Count(x => x.RobotConfigurations.Any(c => c.TaskStatusCode == (int)TaskStatusEnum.Ok && c.RobotCode == (int)RobotsEnum.ScheduleOrder)),
+                                ScheduleErrors = t.Templates.Count(x => x.RobotConfigurations.Any(c => c.RobotStatusCode == (int)RobotStatusEnum.Error && c.RobotCode == (int)RobotsEnum.ScheduleOrder))
+
+                            }).FirstOrDefaultAsync();
+
+            return new JobStatModel
+            {
+                ScheduleStatistics = new ScheduleStats { Activated = statResult?.ScheduleActivated ?? 0, Errors = statResult?.ScheduleErrors ?? 0, Synchronized = statResult?.ScheduleSynchronized ?? 0 },
+                TemplateStatistics = new TemplateStats { Activated = statResult?.TemplateActivated ?? 0, Errors = statResult?.TemplateErrors ?? 0, Synchronized = statResult?.TemplateSynchronized ?? 0 }
+            };
+        }
+
+        private void BindStatistics(JobResponse job, JobStatModel statistics)
+        {
+            job.TemplateStatistics = new TemplateStats { Activated = statistics.TemplateStatistics.Activated, Errors = statistics.TemplateStatistics.Errors, Synchronized = statistics.TemplateStatistics.Synchronized };
+            job.ScheduleStatistics = new ScheduleStats { Activated = statistics.ScheduleStatistics.Activated, Errors = statistics.ScheduleStatistics.Errors, Synchronized = statistics.ScheduleStatistics.Synchronized };
+        }
+
+
+    }
+
+    public class JobStatModel
+    {
+        public TemplateStats TemplateStatistics { get; set; }
+
+        public ScheduleStats ScheduleStatistics { get; set; }
+    }
+}

PARR.API/Controllers/V1/JobGroupController.cs

@@ -0,0 +1,250 @@
+using AutoMapper;
+using FluentValidation;
+using InfluxDB.Client.Api.Domain;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests;
+using PARR.API.Contracts.V1.Requests.Queries;
+using PARR.API.Contracts.V1.Responses;
+using PARR.API.Contracts.V1.Responses.Base;
+using PARR.API.Controllers.V1.Base;
+using PARR.API.Extensions;
+using PARR.API.Services.Interfaces;
+using PARR.Constants;
+using PARR.DAL.DomainModels;
+using PARR.DAL.Models.Job;
+using PARR.DAL.Services.Interfaces.Job;
+using System.ComponentModel.DataAnnotations;
+
+namespace PARR.API.Controllers.V1
+{
+    /// <summary>
+    /// Управление группами работам
+    /// </summary>
+    [Authorize(Roles = ParrRoles.Administrator.Role)]
+    public class JobGroupController : BaseApiController
+    {
+        private readonly ILogger<JobController> logger;
+        private readonly IMapper mapper;
+        private readonly IUriService uriService;
+        private readonly IJobGroupService groupService;
+        private readonly IValidator<JobGroupRequest> validator;
+
+        public JobGroupController(
+            ILogger<JobController> logger,
+            IMapper mapper,
+            IUriService uriService,
+            IJobGroupService groupService,
+            IValidator<JobGroupRequest> validator
+            )
+        {
+            this.logger = logger;
+            this.mapper = mapper;
+            this.uriService = uriService;
+            this.groupService = groupService;
+            this.validator = validator;
+        }
+
+
+        /// <summary>
+        /// Получить список групп заданий на выполнение работ постранично
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet(ApiRoutes.JobGroup.GetAll)]
+        public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] JobGroupQuery filter)
+        {
+            var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
+
+            IQueryable<JobGroup> query = groupService.Get();
+
+            query = query.OrderBy(t => t.GroupName);
+
+            if (!string.IsNullOrEmpty(filter.Name))
+                query = query.Where(t => t.GroupName.ToLower().Contains(filter.Name.ToLower()));
+
+            if (!string.IsNullOrEmpty(filter.ShortDescription))
+                query = query.Where(t => t.ShortDescription.ToLower().Contains(filter.ShortDescription.ToLower()));
+
+            if (filter.IsFull)
+                query = query.Include(t => t.Jobs).ThenInclude(t => t.Tnk);
+
+            var jobs = await groupService.GetPage(query, paginationFilter).ToListAsync();
+
+            if (!jobs.Any())
+                return NoContent();
+
+            if (filter.IsFull == true)
+            {
+                var responseFull = mapper.Map<List<JobGroupResponse>>(jobs);
+                var paginationResponseFull = new PagedResponse<JobGroupResponse>(responseFull, true).GetPaginatedProps(paginationFilter, query);
+
+                return Ok(paginationResponseFull);
+            }
+
+            var response = mapper.Map<List<JobGroupBaseResponse>>(jobs);
+
+            var paginationResponse = new PagedResponse<JobGroupBaseResponse>(response, true).GetPaginatedProps(paginationFilter, query);
+
+            return Ok(paginationResponse);
+        }
+
+
+        /// <summary>
+        /// Получить группу заданий на выполнение работ по id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet(ApiRoutes.JobGroup.Get)]
+        public async Task<IActionResult> GetById([FromRoute] Guid id)
+        {
+            var jobGroup = await groupService.Get()
+                                        .Include(t => t.Jobs).ThenInclude(t => t.Tnk)
+                                        .FirstOrDefaultAsync(t => t.Id == id);
+
+            if (jobGroup == null)
+                return NotFound();
+
+            var response = mapper.Map<JobGroupResponse>(jobGroup);
+
+            return Ok(new Response<JobGroupResponse>(response, true));
+        }
+
+
+        /// <summary>
+        /// Создать группу заданий на выполнение работ (JobGroup)
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost(ApiRoutes.JobGroup.Create)]
+        public async Task<IActionResult> Create([FromBody] JobGroupRequest request)
+        {
+            var resultValidate = await validator.ValidateAsync(request);
+
+            if (!resultValidate.IsValid)
+                return BadRequest(new Response(resultValidate.Errors));
+
+            var jobGroup = new JobGroup
+            {
+                Id = Guid.NewGuid(),
+                GroupName = request.Name.Trim(),
+                IsUmbrella = request.IsUmbrella,
+                ShortDescription = request.ShortDescription.Trim(),
+                FullDescription = request.FullDescription.Trim(),
+                Solution = request.Solution.Trim(),
+                TemplateDuration = request.TemplateDuration.Trim(),
+                ReferenceDate = request.ReferenceDate,
+                IsAutoDistributionEnabled = request.IsAutoDistributionEnabled,
+                IsAgent = request.IsAgent,
+                AgentName = request.AgentName,
+                AgentTimeOutSec = request.AgentTimeOutSec,
+                AgentScript = request.AgentScript
+            };
+
+
+            if (!await groupService.CreateAsync(jobGroup) || !await groupService.CommitAsync())
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при создании группы заданий на выполнение работ" } }));
+
+            logger.LogInformation($"Пользователь {User.Identity?.Name} добавил группу заданий на выполнение работ: {jobGroup.Id}, {jobGroup.GroupName}, {jobGroup.ShortDescription}");
+
+
+            var createdJobGroup = await groupService.Get().Include(t=>t.Jobs).ThenInclude(t => t.Tnk)
+                                             .FirstAsync(t => t.Id == jobGroup.Id);
+
+            var locationUri = uriService.GetUri(ApiRoutes.JobGroup.Get, ApiRoutes.JobGroup.getParam, createdJobGroup.Id);
+
+            var response = mapper.Map<JobGroupResponse>(createdJobGroup);
+
+            return Created(locationUri, new Response<JobGroupResponse>(response, true));
+        }
+
+
+        /// <summary>
+        /// Обновить группу заданий на выполнение работ (JobGroup)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPut(ApiRoutes.JobGroup.Update)]
+        public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] JobGroupRequest request)
+        {
+            var resultValidate = await validator.ValidateAsync(request);
+
+            if (!resultValidate.IsValid)
+                return BadRequest(new Response(resultValidate.Errors));
+
+            var orig = await groupService.Get()
+                                    .Include(t=>t.Jobs)
+                                        .ThenInclude(t => t.Tnk)
+                                    .FirstOrDefaultAsync(t => t.Id == id);
+
+            if (orig == null)
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении группы заданий на выполнение работ. Не найдена группа с Id: {id}" } }));
+
+            orig.GroupName = request.Name.Trim();
+            orig.IsUmbrella = request.IsUmbrella;
+            orig.ShortDescription = request.ShortDescription.Trim();
+            orig.FullDescription = request.FullDescription.Trim();
+            orig.Solution = request.Solution.Trim();
+            orig.TemplateDuration = request.TemplateDuration.Trim();
+            orig.ReferenceDate = request.ReferenceDate;
+            orig.IsAutoDistributionEnabled = request.IsAutoDistributionEnabled;
+            orig.IsAgent = request.IsAgent;
+            orig.AgentName = request.AgentName;
+            orig.AgentTimeOutSec = request.AgentTimeOutSec;
+            orig.AgentScript = request.AgentScript;
+
+            if (!await groupService.CommitAsync())
+                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.Solution}, {orig.TemplateDuration}, {orig.ReferenceDate}, {orig.IsAutoDistributionEnabled}" +
+                $", {orig.IsAgent}, {orig.AgentName}, {orig.AgentTimeOutSec}, {orig.AgentScript}");
+
+
+            var updatedJobGroup = await groupService.Get()
+                                                    .Include(t => t.Jobs)
+                                                        .ThenInclude(t => t.Tnk)
+                                                    .FirstAsync(t => t.Id == orig.Id);
+
+            var response = mapper.Map<JobResponse>(updatedJobGroup);
+
+            return Ok(new Response<JobResponse>(response, true));
+        }
+
+
+        /// <summary>
+        /// Удалить группу заданий на выполнение работ (только если нет связанных шаблонов)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpDelete(ApiRoutes.JobGroup.Delete)]
+        public async Task<IActionResult> Delete([FromRoute] Guid id)
+        {
+            var jobGroup = await groupService.Get()
+                                .Include(t => t.Jobs)
+                                    .ThenInclude(t => t.Tnk)
+                                .FirstOrDefaultAsync(t => t.Id == id);
+
+            if (jobGroup == null)
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel {
+                    Message = $"Ошибка при удалении группы заданий на выполнение работ. Не найдена группа заданий на выполнение работ Id: {id}"
+                } }));
+
+            if (!groupService.Delete(jobGroup) || !await groupService.CommitAsync())
+                return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel {
+                    Message = $"Ошибка при удалении группы заданий на выполнение работ"
+                } }));
+
+            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}");
+
+            return NoContent();
+        }
+    }
+}

PARR.API/MappingProfiles/DomainToResponseProfile.cs

@@ -160,8 +160,8 @@ namespace PARR.API.MappingProfiles
                 .ForMember(d => d.FullDescription, o => o.MapFrom(s => s.Template!.Job!.Group!.FullDescription))
                 .ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.Job!.Group!.ShortDescription.ApplyShortcode(ShortcodeEnum.EK, s.Template!.Unit!.Name)))
                 .ForMember(d => d.Solution, o => o.MapFrom(s => s.Template!.Job!.Group!.Solution))
-                 //.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
+                //.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
-                 //ЗО берем у группы а не у хоста
+                //ЗО берем у группы а не у хоста
                 .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Unit.BaseFields.ResponseArea))
                 .ForMember(d => d.TemplateDuration, o => o.MapFrom(s => s.Template!.Job!.Group!.TemplateDuration))
                 .ForMember(d => d.Initiator, o => o.MapFrom<RobotTaskTemplateInitiatorResolver>())
@@ -306,6 +306,15 @@ namespace PARR.API.MappingProfiles
             CreateMap<Job, JobResponse>();
             #endregion
 
+            #region JobGroup
+            CreateMap<JobGroup, JobGroupBaseResponse>()
+                .Include<JobGroup, JobGroupResponse>()
+                .ForMember(d => d.Name, o => o.MapFrom(s => s.GroupName));
+
+            CreateMap<JobGroup, JobGroupResponse>()
+                .ForMember(d => d.Jobs, o => o.MapFrom(s => s.Jobs));
+            #endregion
+
             #region JobAutoControl
 
             CreateMap<JobAutoControl, JobAutoControlBaseResponse>()

PARR.API/Validators/JobGroupValidator.cs

@@ -0,0 +1,26 @@
+using FluentValidation;
+using PARR.API.Contracts.V1.Requests;
+
+namespace PARR.API.Validators
+{
+    public class JobGroupValidator : AbstractValidator<JobGroupRequest>
+    {
+        public JobGroupValidator()
+        {
+            RuleFor(t => t.Name)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.ShortDescription)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.FullDescription)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.Solution)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.TemplateDuration)
+                .NotNull().NotEmpty();
+        }
+    }
+}

PARR.API/Validators/JobValidator.cs

@@ -0,0 +1,48 @@
+using FluentValidation;
+using PARR.API.Contracts.V1.Requests;
+using PARR.DAL.Services.Interfaces;
+using PARR.DAL.Services.Interfaces.Job;
+
+namespace PARR.API.Validators
+{
+    public class JobValidator : AbstractValidator<JobRequest>
+    {
+        private readonly ITnkService tnkService;
+        private readonly IJobGroupService jobGroupService;
+
+        public JobValidator(
+            ITnkService tnkService,
+            IJobGroupService jobGroupService
+            )
+        {
+            this.tnkService = tnkService;
+            this.jobGroupService = jobGroupService;
+
+            RuleFor(t => t.Name)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.WorkName)
+                .NotNull().NotEmpty();
+
+            RuleFor(t => t.TnkId)
+                .MustAsync(async (entity, value, c) => await IsTnkExist(entity))
+                .WithMessage("Указан несуществующий Id ТНК");
+
+            RuleFor(t => t.GroupId)
+                .MustAsync(async (entity, value, c) => await IsGroupExist(entity))
+                .WithMessage("Указан несуществующий Id группы работ");
+        }
+
+
+        private async Task<bool> IsGroupExist(JobRequest entity)
+        {
+            return await jobGroupService.GetAsync(entity.GroupId) != null;
+        }
+
+
+        private async Task<bool> IsTnkExist(JobRequest entity)
+        {
+            return await tnkService.GetAsync(entity.TnkId) != null;
+        }
+    }
+}

PARR.DAL/Models/Job/Job.cs

@@ -47,14 +47,16 @@ namespace PARR.DAL.Models.Job
 
         public Guid GroupId { get; set; }
 
-        
+
         [ForeignKey(nameof(GroupId))]
         public JobGroup? Group { get; set; }
 
         [ForeignKey(nameof(TnkId))]
         public Tnk? Tnk { get; set; }
-                
 
-        public ICollection<JobUnitFilter> UnitFilters { get; set; }= new HashSet<JobUnitFilter>();
+
+        public ICollection<JobUnitFilter> UnitFilters { get; set; } = new HashSet<JobUnitFilter>();
+
+        public ICollection<Template> Templates { get; set; } = new HashSet<Template>();
     }
 }

PARR.DAL/Models/Unit/Unit.cs

@@ -42,6 +42,7 @@ namespace PARR.DAL.Models.Unit
                     result.ResponseArea = UnitValues.FirstOrDefault(t => t.Field?.AihitName == "ЗО_РГ")?.Value?.Value;
                     result.WorkGroup = UnitValues.FirstOrDefault(t => t.Field?.AihitName == "РАБОЧАЯ_ГР_ОТВ_ЗА_ЭК")?.Value?.Value;
                     result.Status = UnitValues.FirstOrDefault(t => t.Field?.AihitName == "СТАТУС")?.Value?.Value;
+                    result.NotUnique = UnitValues.FirstOrDefault(t => t.Field?.AihitName == "НЕУНИКАЛЬНЫЙ_ЭК")?.Value?.Value; 
 
                     return result;
                 }
@@ -80,5 +81,7 @@ namespace PARR.DAL.Models.Unit
         public string? WorkGroup { get; set; }
 
         public string? Status { get; set; }
+
+        public string? NotUnique { get; set; }
     }
 }

PARR.Test/Worker.cs

@@ -48,21 +48,37 @@ namespace PARR.Test
                                     .ThenInclude(t => t.Field)
                                 .Include(t => t.UnitValues)
                                     .ThenInclude(t => t.Value)
-                                .Include(t => t.ParentUnits)
+                                .Where(t => /*EF.Functions.Like(t.Name, "%-ГВЦ") &&*/
-                                .Include(t => t.ChildUnits)
-                                .Where(t => EF.Functions.Like(t.Name, "%-ГВЦ") &&
                                              t.UnitValues.Any(v =>
                                                 v.Field!.AihitName == "ПОДКАТЕГОРИЯ_ЭК" && v.Value!.Value == "система хранения данных (схд)")
                                             && t.UnitValues.Any(v =>
                                                 v.Field!.AihitName == "ТИП_ЭК" && v.Value!.Value == "коммутатор")
-                                            //&& t.UnitValues.Any(v =>
+                                //&& t.UnitValues.Any(v =>
-                                            //    v.Field!.AihitName == "АКТИВЕН" && v.Value!.Value == "1")
+                                //    v.Field!.AihitName == "АКТИВЕН" && v.Value!.Value == "1")
-                                            // && t.UnitValues.Any(v =>
+                                 && t.UnitValues.Any(v =>
-                                            //    v.Field!.AihitName == "НЕУНИКАЛЬНЫЙ_ЭК" && v.Value!.Value == "0")
+                                    v.Field!.AihitName == "НЕУНИКАЛЬНЫЙ_ЭК" && v.Value!.Value == "0")
+                                 && !t.UnitValues.Any(v =>
+                                    v.Field!.AihitName == "СТАТУС" && v.Value!.Value == "6-Выведен из эксплуатации")
                                 );
 
-                var v1 =  await unitsQuery.Where(t => t.UnitValues.Any(v =>
+                var v1 = await unitsQuery
-                                                v.Field!.AihitName == "НЕУНИКАЛЬНЫЙ_ЭК" && v.Value!.Value == "0")).ToListAsync();
+                                .Include(t => t.ParentUnits)
+                                    .ThenInclude(t => t.ParentUnit)
+                                        .ThenInclude(t => t.UnitValues)
+                                            .ThenInclude(t => t.Field)
+                                .Include(t => t.ParentUnits)
+                                    .ThenInclude(t => t.ParentUnit)
+                                        .ThenInclude(t => t.UnitValues)
+                                            .ThenInclude(t => t.Value)
+                    .ToListAsync();
+                var res = v1
+                    .Where(t => (t.ParentUnits == null || t.ParentUnits.Count == 0) || !t.ParentUnits!.Any(a => a.ParentUnit != null && a.ParentUnit!.BaseFields!.NotUnique == "1"))
+                    .OrderBy(t => t.Name).ToList();
+                var service = scope.ServiceProvider.GetService<ITemplateNameGeneratorService>();
+                foreach (var item in res)
+                {
+                    var name = await service!.GetTemplateNameAsync(Guid.Parse("926793f7-c6d3-4f08-b5ce-517ce1a1ac37"), item.Id);
+                }
                 /*var service = scope.ServiceProvider.GetService<ITemplateNameGeneratorService>();
 
                 var ttt = await service.GetTemplateNameAsync(Guid.Parse("ba05948b-b040-48cc-ab77-0accc9c223a0"), Guid.Parse("d4a86f24-6975-4614-98ab-431f26e3eb69"));*/