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

feat(dal,api): добавлены таблицы исключений расписания еспп.

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-25 17:01:42 +10:00
parent c7fdf9f97d
commit eb57f4b3cd
21 changed files with 343 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -116,9 +116,17 @@ namespace PARR.API.Controllers.V1
.Include(t => t.Template)
.ThenInclude(a => a!.Job)
.ThenInclude(t => t!.Group)
.ThenInclude(t => t!.EsppSchValues)
.ThenInclude(t => t!.EsppSchTypeConfig)
.ThenInclude(t => t!.EsppSchTypeSchedule)
.ThenInclude(t => t!.EsppSchValues)
.ThenInclude(t => t!.EsppSchTypeConfig)
.ThenInclude(t => t!.EsppSchTypeSchedule)
.Include(t => t.Template)
.ThenInclude(t => t!.Job)
.ThenInclude(t => t!.Group)
.ThenInclude(t => t!.ScheduleExcludeType)
.Include(t => t.Template)
.ThenInclude(t => t!.Job)
.ThenInclude(t => t!.Group)
.ThenInclude(t => t.ScheduleExcludeTypeCalendar)
.Include(t => t.Template)
.ThenInclude(t => t.UnitsInTemplate);

6
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -227,8 +227,10 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.TemplateName, o => o.MapFrom(s => s.Template!.Name))
.ForMember(d => d.TemplateId, o => o.MapFrom(s => s.Template!.Id))
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Template!.Job!.WorkGroupMask))
.ForMember(d => d.Exclude, o => o.MapFrom<RobotTaskScheduleExcludeResolver>())
.ForMember(d => d.ExcludeCalendar, o => o.MapFrom<RobotTaskScheduleExcludeCalendarResolver>())
//.ForMember(d => d.Exclude, o => o.MapFrom<RobotTaskScheduleExcludeResolver>())
.ForMember(d => d.Exclude, o => o.MapFrom(s => s.Template!.Job!.Group!.ScheduleExcludeType!.EsppName))
//.ForMember(d => d.ExcludeCalendar, o => o.MapFrom<RobotTaskScheduleExcludeCalendarResolver>())
.ForMember(d => d.ExcludeCalendar, o => o.MapFrom(s => s.Template!.Job!.Group!.ScheduleExcludeTypeCalendar != null ? s.Template!.Job!.Group!.ScheduleExcludeTypeCalendar.EsppName : null))
.ForMember(d => d.Timezone, o => o.MapFrom<RobotTaskScheduleTimezoneResolver>())
.ForMember(d => d.RepeatRange, o => o.MapFrom<RobotTaskScheduleRepeatRangeResolver>())
//todo: GenerationTime

24
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleExcludeCalendarResolver.cs
View File

@@ -5,18 +5,18 @@ using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
{
public class RobotTaskScheduleExcludeCalendarResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string?>
{
private readonly SettingsFromDb settingsFromDb;
//public class RobotTaskScheduleExcludeCalendarResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string?>
//{
// private readonly SettingsFromDb settingsFromDb;
public RobotTaskScheduleExcludeCalendarResolver(SettingsFromDb settingsFromDb)
{
this.settingsFromDb = settingsFromDb;
}
// public RobotTaskScheduleExcludeCalendarResolver(SettingsFromDb settingsFromDb)
// {
// this.settingsFromDb = settingsFromDb;
// }
public string? Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string? destMember, ResolutionContext context)
{
return settingsFromDb.ScheduleExcludeCalendar;
}
}
// public string? Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string? destMember, ResolutionContext context)
// {
// return settingsFromDb.ScheduleExcludeCalendar;
// }
//}
}

24
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleExcludeResolver.cs
View File

@@ -5,18 +5,18 @@ using PARR.DAL.Models;
namespace PARR.API.MappingProfiles.Resolvers
{
public class RobotTaskScheduleExcludeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
{
private readonly SettingsFromDb settingsFromDb;
//public class RobotTaskScheduleExcludeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{
// private readonly SettingsFromDb settingsFromDb;
public RobotTaskScheduleExcludeResolver(SettingsFromDb settingsFromDb)
{
this.settingsFromDb = settingsFromDb;
}
// public RobotTaskScheduleExcludeResolver(SettingsFromDb settingsFromDb)
// {
// this.settingsFromDb = settingsFromDb;
// }
public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
{
return settingsFromDb.ScheduleExcludeType;
}
}
// public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
// {
// return settingsFromDb.ScheduleExcludeType;
// }
//}
}