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

feat(api,bll,dal,esppScheduleSync,TemplateGenerator): изменен рассчет nextRun для задания роботу и синхронизатору, подставляется в зависимости от настроек ЗО и таймзоны УЗ робота ЕСПП. Переименование полей в БД

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-03 16:15:19 +10:00
parent c0210656d9
commit ead4653ad0
36 changed files with 13010 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PARR.API/MappingProfiles/Resolvers/ApplicationInWorkScheduleResolver.cs
View File

@@ -3,6 +3,7 @@ using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.MappingProfiles.Resolvers
{
@@ -12,18 +13,21 @@ namespace PARR.API.MappingProfiles.Resolvers
private readonly ILogger<ApplicationInWorkScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public ApplicationInWorkScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
ILogger<ApplicationInWorkScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
)
{
this.esppConfigService = esppConfigService;
this.logger = logger;
this.mapper = mapper;
this.settingsFromDb = settingsFromDb;
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
}
public ApplicationInWorkScheduleResponse? Resolve(ApplicationsInWork source, ApplicationInWorkResponse destination, ApplicationInWorkScheduleResponse? destMember, ResolutionContext context)
@@ -38,7 +42,8 @@ namespace PARR.API.MappingProfiles.Resolvers
var response = new ApplicationInWorkScheduleResponse
{
Timezone = settingsFromDb.ScheduleTimezone,
//Timezone = settingsFromDb.ScheduleTimezone,
Timezone = scheduleResponseAreaTimeOffsetService.GetDefault.EsppValue,
TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
};

9
PARR.API/MappingProfiles/Resolvers/JobGroupScheduleResolver.cs
View File

@@ -3,6 +3,7 @@ using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models.Job;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.MappingProfiles.Resolvers
{
@@ -12,18 +13,21 @@ namespace PARR.API.MappingProfiles.Resolvers
private readonly ILogger<JobGroupScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public JobGroupScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
ILogger<JobGroupScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
)
{
this.esppConfigService = esppConfigService;
this.logger = logger;
this.mapper = mapper;
this.settingsFromDb = settingsFromDb;
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
}
@@ -39,7 +43,8 @@ namespace PARR.API.MappingProfiles.Resolvers
var response = new JobGroupScheduleResponse
{
Timezone = settingsFromDb.ScheduleTimezone,
//Timezone = settingsFromDb.ScheduleTimezone,
Timezone = scheduleResponseAreaTimeOffsetService.GetDefault.EsppValue,
TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
};

32
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleGenerationTimeResolver.cs
View File

@@ -3,26 +3,26 @@ using PARR.API.Contracts.V1.Responses;
using PARR.BLL.Helpers;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.TransformServices;
namespace PARR.API.MappingProfiles.Resolvers
{
public class RobotTaskScheduleGenerationTimeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
{
private readonly SettingsFromDb settingsFromDb;
private readonly INextRunModifierService nextRunModifierService;
//public class RobotTaskScheduleGenerationTimeResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{
// private readonly SettingsFromDb settingsFromDb;
// private readonly INextRunModifierService nextRunModifierService;
public RobotTaskScheduleGenerationTimeResolver(SettingsFromDb settingsFromDb, INextRunModifierService nextRunModifierService)
{
this.settingsFromDb = settingsFromDb;
this.nextRunModifierService = nextRunModifierService;
}
// public RobotTaskScheduleGenerationTimeResolver(SettingsFromDb settingsFromDb, INextRunModifierService nextRunModifierService)
// {
// this.settingsFromDb = settingsFromDb;
// this.nextRunModifierService = nextRunModifierService;
// }
public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
{
var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template!.NextRun);
// public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
// {
// var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template!.NextRun);
return EsppScheduleHelpers.GetGenerationTime(nextRunForRobot);
}
}
// return EsppScheduleHelpers.GetGenerationTime(nextRunForRobot);
// }
//}
}

53
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleNextStartResolver.cs
View File

@@ -3,26 +3,47 @@ using PARR.API.Contracts.V1.Responses;
using PARR.BLL.Helpers;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.TransformServices;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.MappingProfiles.Resolvers
{
public class RobotTaskScheduleNextStartResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
{
private readonly SettingsFromDb settingsFromDb;
private readonly INextRunModifierService nextRunModifierService;
//public class RobotTaskScheduleNextStartResolver : IValueResolver<RobotConfiguration, RobotTaskScheduleResponse, string>
//{
// private readonly SettingsFromDb settingsFromDb;
// private readonly INextRunModifierService nextRunModifierService;
// private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public RobotTaskScheduleNextStartResolver(SettingsFromDb settingsFromDb, INextRunModifierService nextRunModifierService)
{
this.settingsFromDb = settingsFromDb;
this.nextRunModifierService = nextRunModifierService;
}
// public RobotTaskScheduleNextStartResolver(
// SettingsFromDb settingsFromDb,
// INextRunModifierService nextRunModifierService,
// IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
// )
// {
// this.settingsFromDb = settingsFromDb;
// this.nextRunModifierService = nextRunModifierService;
// this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
// }
public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
{
var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template!.NextRun);
// public string Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, string destMember, ResolutionContext context)
// {
// var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template!.NextRun);
return EsppScheduleHelpers.GetNextRun(nextRunForRobot);
}
}
// // Сначала прибавляем офсет УЗ ЕСПП
// // потом прибаляем = офсет УЗ ЕСПП - offset ЗО
// // если включен - IsWorkGroupTimezone - группировка по таймозне группы, применяем тайм зону группы
// if (source.Template?.Job?.Group?.IsWorkGroupTimezone == true)
// {
// var responseArea = "TODO";
// var esppOffset = new TimeSpan(settingsFromDb.EsppRobotAccountTimeZoneHour, 0, 0);
// var workGroupOffset = scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea).UtcTimeOffset;
// var resultOffset = esppOffset - workGroupOffset;
// nextRunForRobot = nextRunForRobot.Add(resultOffset);
// }
// return EsppScheduleHelpers.GetNextRun(nextRunForRobot);
// }
//}
}

23
PARR.API/MappingProfiles/Resolvers/RobotTaskScheduleSchResolver.cs
View File

@@ -1,9 +1,8 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.TransformServices;
namespace PARR.API.MappingProfiles.Resolvers
{
@@ -11,17 +10,14 @@ namespace PARR.API.MappingProfiles.Resolvers
{
private readonly IEsppSchTypeConfigService esppConfigService;
private readonly ILogger<RobotTaskScheduleSchResolver> logger;
private readonly INextRunModifierService nextRunModifierService;
public RobotTaskScheduleSchResolver(
IEsppSchTypeConfigService esppConfigService,
ILogger<RobotTaskScheduleSchResolver> logger,
INextRunModifierService nextRunModifierService
ILogger<RobotTaskScheduleSchResolver> logger
)
{
this.esppConfigService = esppConfigService;
this.logger = logger;
this.nextRunModifierService = nextRunModifierService;
}
public List<RobotTaskScheduleSchResponse>? Resolve(RobotConfiguration source, RobotTaskScheduleResponse destination, List<RobotTaskScheduleSchResponse>? destMember, ResolutionContext context)
@@ -44,14 +40,15 @@ namespace PARR.API.MappingProfiles.Resolvers
Value = t.Value.Value
}).OrderBy(t => t.Order).ToList();
//Если задача относится к распределенной модели исполнения за период месяц устанавливаем день равный NextRun
if (source.Template!.Job!.Group!.IsAutoDistributionEnabled && schedule.TypeSchedule.Id == (int)EsppSchTypeScheduleEnum.Monthly)
{
var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template.NextRun);
////Если задача относится к распределенной модели исполнения за период месяц устанавливаем день равный NextRun
////УСТАРЕВШЕЕ
//if (source.Template!.Job!.Group!.IsAutoDistributionEnabled && schedule.TypeSchedule.Id == (int)EsppSchTypeScheduleEnum.Monthly)
//{
// var nextRunForRobot = nextRunModifierService.GetNextRunByAccountRobotTimeZone(source.Template.NextRun);
//response.First().Value = source.Template.NextRun.Day.ToString();
response.First().Value = nextRunForRobot.Day.ToString();
}
// //response.First().Value = source.Template.NextRun.Day.ToString();
// response.First().Value = nextRunForRobot.Day.ToString();
//}
return response;
}

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

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

9
PARR.API/MappingProfiles/Resolvers/TemplateScheduleResolver.cs
View File

@@ -3,6 +3,7 @@ using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.MappingProfiles.Resolvers
{
@@ -12,18 +13,21 @@ namespace PARR.API.MappingProfiles.Resolvers
private readonly ILogger<TemplateScheduleResolver> logger;
private readonly IMapper mapper;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public TemplateScheduleResolver(
IEsppSchTypeConfigService esppConfigService,
ILogger<TemplateScheduleResolver> logger,
IMapper mapper,
SettingsFromDb settingsFromDb
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
)
{
this.esppConfigService = esppConfigService;
this.logger = logger;
this.mapper = mapper;
this.settingsFromDb = settingsFromDb;
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
}
public EsppScheduleResponse? Resolve(Template source, TemplateResponse destination, EsppScheduleResponse? destMember, ResolutionContext context)
@@ -42,7 +46,8 @@ namespace PARR.API.MappingProfiles.Resolvers
//LastRun = source.ApplicationsInWork.LastRun,
NextRun = source.NextRun,
LastRun = source.LastRun,
Timezone = settingsFromDb.ScheduleTimezone,
// Timezone = settingsFromDb.ScheduleTimezone,
Timezone = scheduleResponseAreaTimeOffsetService.GetDefault.EsppValue,
TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
};