feat(api): в респонс шаблона добавлены поля с расписанием

PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs

@@ -3,6 +3,12 @@
     // Вот это тот самый респонс
     public class EsppScheduleResponse
     {
+        public DateTimeOffset NextRun { get; set; }
+
+        public DateTimeOffset? LastRun { get; set; }
+
+        public string Timezone { get; set; } = string.Empty;
+
         public EsppScheduleTypeScheduleResponse? TypeSchedule { get; set; }
 
         public List<EsppScheduleValResponse>? Values { get; set; }

PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs

@@ -38,7 +38,7 @@
         public required string NextStart { get; set; }
 
         /// <summary>
-        /// Тип задания: ругелярно, еженедельно...
+        /// Тип задания: Регулярно, еженедельно...
         /// </summary>
         public required string ScheduleType { get; set; }
 

PARR.API/Controllers/V1/RobotTaskController.cs

@@ -123,7 +123,9 @@ namespace PARR.API.Controllers.V1
                     await UpdateLastNextRunDate(task);
 
                     //RobotTaskScheduleResponse
-                    return Ok(new Response<RobotTaskScheduleResponse>(mapper.Map<RobotTaskScheduleResponse>(task), true));
+                    var response = mapper.Map<RobotTaskScheduleResponse>(task);
+
+                    return Ok(new Response<RobotTaskScheduleResponse>(response, true));
                 default:
                     break;
             }

PARR.API/MappingProfiles/Resolvers/TemplateScheduleResolver.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using PARR.API.Contracts.V1.Responses;
+using PARR.DAL.Contracts;
 using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 
@@ -10,16 +11,19 @@ namespace PARR.API.MappingProfiles.Resolvers
         private readonly IEsppSchTypeConfigService esppConfigService;
         private readonly ILogger<TemplateScheduleResolver> logger;
         private readonly IMapper mapper;
+        private readonly SettingsFromDb settingsFromDb;
 
         public TemplateScheduleResolver(
             IEsppSchTypeConfigService esppConfigService,
             ILogger<TemplateScheduleResolver> logger,
-            IMapper mapper
+            IMapper mapper,
+            SettingsFromDb settingsFromDb
             )
         {
             this.esppConfigService = esppConfigService;
             this.logger = logger;
             this.mapper = mapper;
+            this.settingsFromDb = settingsFromDb;
         }
 
         public EsppScheduleResponse? Resolve(Template source, TemplateResponse destination, EsppScheduleResponse? destMember, ResolutionContext context)
@@ -34,6 +38,9 @@ namespace PARR.API.MappingProfiles.Resolvers
 
             var response = new EsppScheduleResponse
             {
+                NextRun = source.ApplicationsInWork!.NextRun,
+                LastRun = source.ApplicationsInWork.LastRun,
+                Timezone = settingsFromDb.ScheduleTimezone,
                 TypeSchedule = mapper.Map<EsppScheduleTypeScheduleResponse>(schedule.TypeSchedule),
                 Values = mapper.Map<List<EsppScheduleValResponse>>(schedule.Values).OrderBy(t => t.Order).ToList()
             };

PARR.DAL/TransformServices/EsppScheduleTransformService.cs

@@ -124,7 +124,10 @@ namespace PARR.DAL.TransformServices
 
         public async Task<List<DateTimeOffset>> GetNextScheduleAsync(Guid applicationInWorkId, DateTimeOffset lastRun)
         {
-            return GetNextSchedule(await GetEsppSchedule(applicationInWorkId), lastRun);
+            var esppSchedule = await GetEsppSchedule(applicationInWorkId);
+            var nextSchedule = GetNextSchedule(esppSchedule, lastRun);
+
+            return nextSchedule;
         }