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

feat(api): templateResponse - добавлена инфа о часовом поясе

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-04 09:50:30 +10:00
parent 4a864bd18b
commit 6bce085fef
4 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PARR.API/Controllers/V1/TemplateController.cs
View File

@@ -19,6 +19,7 @@ using PARR.DAL.DomainServices.Shortcodes;
using PARR.DAL.Models;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.Controllers.V1
{
@@ -36,6 +37,8 @@ namespace PARR.API.Controllers.V1
private readonly IShortcodesService shortcodesService;
private readonly IOrderService orderService;
private readonly INextRunService nextRunService;
private readonly SettingsFromDb settingsFromDb;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public TemplateController(
IMapper mapper,
@@ -45,7 +48,9 @@ namespace PARR.API.Controllers.V1
ILogger<TemplateController> logger,
IShortcodesService shortcodesService,
IOrderService orderService,
INextRunService nextRunService
INextRunService nextRunService,
SettingsFromDb settingsFromDb,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
)
{
this.mapper = mapper;
@@ -56,6 +61,8 @@ namespace PARR.API.Controllers.V1
this.shortcodesService = shortcodesService;
this.orderService = orderService;
this.nextRunService = nextRunService;
this.settingsFromDb = settingsFromDb;
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
}
@@ -337,9 +344,18 @@ namespace PARR.API.Controllers.V1
/// <param name="response"></param>
private void FillNextRunWithResponseAreaInLocal(TemplateBaseResponse response)
{
response.NextRunResponseAreaInLocal = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
? nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, response.ResponseArea)
: response.NextRun;
var responseArea = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
? response.ResponseArea
: settingsFromDb.DefaultResponseAreaToTimeOffset;
//response.NextRunResponseAreaInLocal = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
// ? nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, response.ResponseArea)
// // возвращаем в дефолтной зоне
// : nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, settingsFromDb.DefaultResponseAreaToTimeOffset);
response.NextRunResponseAreaInLocal = nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, responseArea);
response.Timezone = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
}
}