feat(api): JobGroupController добавлена выдача расписания и количество связанных Job

This commit is contained in:
Mikhail Kuznetsov
2025-09-04 14:51:51 +10:00
parent 0793c169f9
commit c9dcdedeca
9 changed files with 214 additions and 79 deletions

View File

@@ -308,11 +308,15 @@ namespace PARR.API.MappingProfiles
#region JobGroup
CreateMap<JobGroup, JobGroupBaseResponse>()
.Include<JobGroup, JobGroupResponse>()
.ForMember(d => d.Name, o => o.MapFrom(s => s.GroupName));
.Include<JobGroup, JobGroupResponse>();
CreateMap<JobGroup, JobGroupBaseResponse>()
.ForMember(d => d.Name, o => o.MapFrom(s => s.GroupName));
CreateMap<JobGroup, JobGroupResponse>()
.ForMember(d => d.Jobs, o => o.MapFrom(s => s.Jobs));
.ForMember(d => d.Schedule, o => o.MapFrom<JobGroupScheduleResolver>())
.ForMember(d => d.JobsCount, o => o.MapFrom(s => s.Jobs.Count()));
#endregion
#region JobAutoControl

View File

@@ -0,0 +1,50 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models.Job;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.MappingProfiles.Resolvers
{
public class JobGroupScheduleResolver : IValueResolver<JobGroup, JobGroupResponse, JobGroupScheduleResponse?>
{
private readonly IEsppSchTypeConfigService esppConfigService;
private readonly ILogger<JobGroupScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
public JobGroupScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
ILogger<JobGroupScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb
)
{
this.esppConfigService = esppConfigService;
this.logger = logger;
this.mapper = mapper;
this.settingsFromDb = settingsFromDb;
}
public JobGroupScheduleResponse? Resolve(JobGroup source, JobGroupResponse destination, JobGroupScheduleResponse? destMember, ResolutionContext context)
{
var schedule = esppConfigService.GetEsppScheduleDto(source.Id);
if (schedule == null)
{
logger.LogError($"Не смог замапить расписание, так как оно null. JobGroupId: {source.Id}");
return null;
}
var response = new JobGroupScheduleResponse
{
Timezone = settingsFromDb.ScheduleTimezone,
TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
};
return response;
}
}
}