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

feat(api,dal): в настройки добавлено поле ScheduleExcludeCalendar. Обновлен response для robot task

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-04 12:10:10 +10:00
parent 78f2ad37be
commit 0de2c4762e
12 changed files with 4147 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs
View File

@@ -23,6 +23,9 @@
public required string Exclude { get; set; }
// сделал возможный null, так как может в будущем это поле может не заполняться
public string? ExcludeCalendar { get; set; }
public required string Timezone { get; set; }
public required string RepeatRange { get; set; }

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

@@ -224,6 +224,7 @@ namespace PARR.API.MappingProfiles
.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.Timezone, o => o.MapFrom<RobotTaskScheduleTimezoneResolver>())
.ForMember(d => d.RepeatRange, o => o.MapFrom<RobotTaskScheduleRepeatRangeResolver>())
//todo: GenerationTime

22
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleExcludeCalendarResolver.cs Normal file
View File

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

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

@@ -16,7 +16,7 @@ namespace PARR.API.MappingProfiles.Resolvers
public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
{
return settingsFromDb.ScheduleExclude;
return settingsFromDb.ScheduleExcludeType;
}
}
}