feat(api): изменены респонсы Job и JobGroup.

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

@@ -1,6 +1,8 @@
-namespace PARR.API.Contracts.V1.Requests.Queries
+using PARR.API.Contracts.V1.Requests.BaseRequests;
+
+namespace PARR.API.Contracts.V1.Requests.Queries
 {
-    public class JobQuery
+    public class JobQuery : FullQuery
     {
         /// <summary>
         /// Поиск по имени

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

@@ -1,6 +1,4 @@
-using PARR.DAL.Models.Job;
+namespace PARR.API.Contracts.V1.Responses
-
-namespace PARR.API.Contracts.V1.Responses
 {
     public class JobBaseResponse
     {
@@ -10,24 +8,65 @@ namespace PARR.API.Contracts.V1.Responses
 
         public required string TemplateNameMask { get; set; }
 
-        public TnkResponse? Tnk { get; set; }
+        public required string WorkName { get; set; }
-        public JobGroupBaseResponse? Group { get; set; }
     }
 
+
     public class JobResponse : JobBaseResponse
     {
-        public int TemplatesCount { get; set; }
+
+        public TnkResponse? Tnk { get; set; }
+
+        public JobGroupBaseResponse? Group { get; set; }
+
+        public int? TemplatesCount { get; set; }
+
+        public List<UnitFilterResponse>? UnitFilters { get; set; }
 
         #region Статистика
 
-        public TemplateStats? TemplateStatistics { get; set; }
+        //public TemplateStats? TemplateStatistics { get; set; }
 
-        public ScheduleStats? ScheduleStatistics { get; set; }
+        //public ScheduleStats? ScheduleStatistics { get; set; }
 
         #endregion
     }
 
 
+    public class UnitFilterResponse
+    {
+        public required string UnitFilterMask { get; set; }
+
+        public List<FieldFilterResponse>? FieldFilters { get; set; }
+
+        public List<RelationshipFilterResponse>? RelationshipFilters { get; set; }
+
+    }
+
+
+    public class FieldFilterResponse
+    {
+        public required FieldResponse Field { get; set; }
+
+        public string? ValueMask { get; set; }
+
+    }
+
+
+    public class RelationshipFilterResponse
+    {
+        public required FieldResponse Field { get; set; }
+
+        public bool? IsParent { get; set; }
+
+        public string? ValueMask { get; set; }
+
+        public bool? IsFullMatch { get; set; }
+
+        public bool? IsInverse { get; set; }
+    }
+
+
     public class TemplateStats
     {
         /// <summary>

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

@@ -32,9 +32,9 @@
 
         public bool IsAutoDistributionEnabled { get; set; }
 
-        public UnitBaseResponse? Unit { get; set; }
+        public UnitResponse? Unit { get; set; }
 
-        public JobBaseResponse? Job { get; set; }
+        public JobResponse? Job { get; set; }
 
         public ProcessResponse? Process { get; set; }
 

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

@@ -18,15 +18,15 @@
     /// <summary>
     /// Response с всеми аттребутами и их значениями
     /// </summary>
-    public class UnitWithAttributesResponse : UnitBaseResponse
+    public class UnitWithAttributesResponse : UnitResponse
     {
         public DateTimeOffset? LastLogon { get; set; }
 
         public List<AttributeResponse>? Attributes { get; set; }
 
-        public List<UnitBaseResponse>? Parents { get; set; }
+        public List<UnitResponse>? Parents { get; set; }
 
-        public List<UnitBaseResponse>? Childrens { get; set; }
+        public List<UnitResponse>? Childrens { get; set; }
     }
 
 }

PARR.API/Controllers/V1/JobController.cs

@@ -59,7 +59,7 @@ namespace PARR.API.Controllers.V1
         {
             var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
 
-            IQueryable<Job> query = jobService.Get().Include(t => t.Tnk).Include(t=>t.Group);
+            IQueryable<Job> query = jobService.Get();
 
             query = query.OrderBy(t => t.Name);
 
@@ -69,6 +69,21 @@ namespace PARR.API.Controllers.V1
             if (filter.GroupId.HasValue)
                 query = query.Where(t => t.GroupId == filter.GroupId.Value);
 
+            if (filter.IsFull)
+            {
+                query = query
+                    .Include(t => t.Tnk)
+                    .Include(t => t.Group);
+
+                query = query
+                    .Include(t => t.UnitFilters)
+                        .ThenInclude(t => t.FieldFilters)
+                            .ThenInclude(t => t.Field)
+                    .Include(t => t.UnitFilters)
+                        .ThenInclude(t => t.RelationshipFilters)
+                            .ThenInclude(t => t.UnitField);
+            }
+
             var jobs = await jobService.GetPage(query, paginationFilter).ToListAsync();
 
             if (!jobs.Any())
@@ -90,12 +105,21 @@ namespace PARR.API.Controllers.V1
         [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);
+            var job = await jobService.Get()
+                                .Include(t => t.Tnk)
+                                .Include(t => t.Group)
+                                .Include(t => t.UnitFilters)
+                                    .ThenInclude(t => t.FieldFilters)
+                                        .ThenInclude(t => t.Field)
+                                .Include(t => t.UnitFilters)
+                                    .ThenInclude(t => t.RelationshipFilters)
+                                .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);
@@ -270,8 +294,8 @@ namespace PARR.API.Controllers.V1
 
         private void BindStatistics(JobResponse job, JobStatModel statistics)
         {
-            job.TemplateStatistics = new TemplateStats { Activated = statistics.TemplateStatistics.Activated, Errors = statistics.TemplateStatistics.Errors, Synchronized = statistics.TemplateStatistics.Synchronized };
+            //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 };
+            //job.ScheduleStatistics = new ScheduleStats { Activated = statistics.ScheduleStatistics.Activated, Errors = statistics.ScheduleStatistics.Errors, Synchronized = statistics.ScheduleStatistics.Synchronized };
         }
 
 

PARR.API/Controllers/V1/JobGroupController.cs

@@ -12,9 +12,11 @@ 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;
 using PARR.DAL.Models.Job;
+using PARR.DAL.Services.Interfaces;
 using PARR.DAL.Services.Interfaces.Job;
 
 namespace PARR.API.Controllers.V1
@@ -30,7 +32,9 @@ namespace PARR.API.Controllers.V1
         private readonly IUriService uriService;
         private readonly IJobGroupService groupService;
         private readonly IJobService jobService;
+        private readonly IEsppSchTypeConfigService esppConfigService;
         private readonly IValidator<JobGroupRequest> validator;
+        private readonly SettingsFromDb settingsFromDb;
 
         public JobGroupController(
             ILogger<JobController> logger,
@@ -38,7 +42,9 @@ namespace PARR.API.Controllers.V1
             IUriService uriService,
             IJobGroupService groupService,
             IJobService jobService,
-            IValidator<JobGroupRequest> validator
+            IEsppSchTypeConfigService esppConfigService,
+            IValidator<JobGroupRequest> validator,
+            SettingsFromDb settingsFromDb
             )
         {
             this.logger = logger;
@@ -46,7 +52,9 @@ namespace PARR.API.Controllers.V1
             this.uriService = uriService;
             this.groupService = groupService;
             this.jobService = jobService;
+            this.esppConfigService = esppConfigService;
             this.validator = validator;
+            this.settingsFromDb = settingsFromDb;
         }
 
 
@@ -66,7 +74,7 @@ namespace PARR.API.Controllers.V1
             if (!string.IsNullOrEmpty(filter.Name))
                 query = query.Where(t => t.GroupName.ToLower().Contains(filter.Name.ToLower()));
 
-            if (filter.IsFull)//TODO а зачем он тогда вообще???
+            if (filter.IsFull)
                 query = query.Include(t => t.Jobs).ThenInclude(t => t.Tnk);
 
             var jobGroups = await groupService.GetPage(query, paginationFilter).ToListAsync();
@@ -76,6 +84,10 @@ namespace PARR.API.Controllers.V1
 
             var response = mapper.Map<List<JobGroupResponse>>(jobGroups);
 
+            if (filter.IsFull)
+                foreach (var jobGroupResponse in response)
+                    await AppendMissingDataAsync(jobGroupResponse);
+
             var paginationResponse = new PagedResponse<JobGroupResponse>(response, true).GetPaginatedProps(paginationFilter, query);
 
             return Ok(paginationResponse);
@@ -255,7 +267,7 @@ namespace PARR.API.Controllers.V1
 
 
         /// <summary>
-        /// Удалить группу заданий на выполнение работ (только если нет связанных шаблонов)
+        /// Удалить группу заданий на выполнение работ (только если нет связанных заданий)
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
@@ -322,5 +334,29 @@ namespace PARR.API.Controllers.V1
 
             return isScheduleChanged;
         }
+
+
+        private async Task AppendMissingDataAsync(JobGroupResponse jobGroupResponse)
+        {
+            var schedule = await esppConfigService.GetEsppScheduleDtoAsync(jobGroupResponse.Id);
+
+            if (schedule == null)
+            {
+                logger.LogError($"Не смог замапить расписание, так как оно null. JobGroupId: {jobGroupResponse.Id}");
+                return;
+            }
+
+            var scheduleResponse = new JobGroupScheduleResponse
+            {
+                Timezone = settingsFromDb.ScheduleTimezone,
+                TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
+                Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
+            };
+
+            jobGroupResponse.Schedule = scheduleResponse;
+
+            jobGroupResponse.JobsCount = await jobService.Get().CountAsync(t => t.GroupId == jobGroupResponse.Id);
+
+        }
     }
 }

PARR.API/MappingProfiles/DomainToResponseProfile.cs

@@ -114,7 +114,7 @@ namespace PARR.API.MappingProfiles
                 .ForMember(d => d.Field, o => o.MapFrom(s => s.Field))
                 .ForMember(d => d.Value, o => o.MapFrom(s => s.Value));
 
-            CreateMap<Unit, UnitBaseResponse>()
+            CreateMap<Unit, UnitResponse>()
                 .Include<Unit, UnitWithAttributesResponse>()
                 .ForMember(d => d.Name, o => o.MapFrom(s => s.Name));
 
@@ -300,10 +300,15 @@ namespace PARR.API.MappingProfiles
             #endregion
 
             #region Job
-            CreateMap<Job, JobBaseResponse>()
+            CreateMap<Job, JobBaseResponse>();
-                .Include<Job, JobResponse>();
-
             CreateMap<Job, JobResponse>();
+
+            CreateMap<JobUnitFilter, UnitFilterResponse>();
+            CreateMap<FieldFilter, FieldResponse>();
+            CreateMap<FieldFilter, FieldFilterResponse>();
+            CreateMap<JobRelationshipFilter, RelationshipFilterResponse>()
+                .ForMember(d => d.Field, o => o.MapFrom(s => s.UnitField));
+
             #endregion
 
             #region JobGroup
@@ -313,9 +318,9 @@ namespace PARR.API.MappingProfiles
             CreateMap<JobGroup, JobGroupBaseResponse>()
                .ForMember(d => d.Name, o => o.MapFrom(s => s.GroupName));
 
-            CreateMap<JobGroup, JobGroupResponse>()
+            CreateMap<JobGroup, JobGroupResponse>();
-                .ForMember(d => d.Schedule, o => o.MapFrom<JobGroupScheduleResolver>())
+            //.ForMember(d => d.Schedule, o => o.MapFrom<JobGroupScheduleResolver>())
-                .ForMember(d => d.JobsCount, o => o.MapFrom(s => s.Jobs.Count()));
+            //.ForMember(d => d.JobsCount, o => o.MapFrom(s => s.Jobs.Count()));
 
             #endregion
 

PARR.API/MappingProfiles/Resolvers/JobGroupScheduleResolver.cs

@@ -14,7 +14,7 @@ namespace PARR.API.MappingProfiles.Resolvers
         private readonly SettingsFromDb settingsFromDb;
 
         public JobGroupScheduleResolver(
-                        IEsppSchTypeConfigService esppConfigService,
+            IEsppSchTypeConfigService esppConfigService,
             ILogger<JobGroupScheduleResolver> logger,
             IMapper mapper,
             SettingsFromDb settingsFromDb

PARR.DAL/Models/Job/FieldFilter.cs

@@ -9,7 +9,7 @@ namespace PARR.DAL.Models.Job
 {
     [Table("FieldFilters", Schema = DataContextSettings.Job)]
     [Comment("Таблица описания критериев выборки аттрибутов ЭК")]
-    public class FieldFilter : IBase
+    public class FieldFilter : IBase//TODO Почему этот не Job тра та та
     {
         [Key]
         public Guid Id { get; set; }
@@ -26,7 +26,7 @@ namespace PARR.DAL.Models.Job
 
 
         [ForeignKey(nameof(FieldId))]
-        public UnitField? Field { get; set; }
+        public UnitField? Field { get; set; }//TODO как-то определитесь уже просто Field или UnitField
 
         [ForeignKey(nameof(UnitFilterId))]
         public JobUnitFilter? UnitFilter { get; set; }

PARR.DAL/Models/Job/JobRelationshipFilter.cs

@@ -8,7 +8,7 @@ namespace PARR.DAL.Models.Job
     [Table("RelationshipFilters", Schema = DataContextSettings.Job)]
     [Comment("Таблица фильтров связей ЭК")]
     [PrimaryKey(nameof(UnitFilterId), nameof(FieldId))]
-    public class JobRelationshipFilter //: IBase
+    public class JobRelationshipFilter //: IBase //TODO Почему этот Job тра та та
     {
         //[Key]
         //public Guid Id { get; set; }
@@ -45,7 +45,7 @@ namespace PARR.DAL.Models.Job
 
 
         [ForeignKey(nameof(FieldId))]
-        public UnitField? UnitField { get; set; }
+        public UnitField? UnitField { get; set; }//TODO как-то определитесь уже просто Field или UnitField