Winsomnia/MireaBackend
2
0
Fork 0
Code Pull Requests Actions Projects Releases Activity

fix: correct filter data

Browse Source
This commit is contained in:
Polianin Nikita
2025-02-02 20:28:04 +03:00
parent 7d6b21c5bb
commit b3a0964aac
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Endpoint/Common/Services/CronUpdateSkipService.cs
View File

@ -18,7 +18,7 @@ public static class CronUpdateSkipService
throw new ArgumentException("It is impossible to create a structure because it has incorrect values."); throw new ArgumentException("It is impossible to create a structure because it has incorrect values.");
} }
public static List<ScheduleSettings.CronUpdateSkip> Filter(this List<ScheduleSettings.CronUpdateSkip> data, DateOnly? currentDate = null) public static List<ScheduleSettings.CronUpdateSkip> FilterDateEntry(this List<ScheduleSettings.CronUpdateSkip> data, DateOnly? currentDate = null)
{ {
currentDate ??= DateOnly.FromDateTime(DateTime.Now); currentDate ??= DateOnly.FromDateTime(DateTime.Now);
return data.OrderBy(x => x.End ?? x.Date) return data.OrderBy(x => x.End ?? x.Date)
@ -26,8 +26,18 @@ public static class CronUpdateSkipService
.ToList(); .ToList();
} }
public static List<ScheduleSettings.CronUpdateSkip> Filter(this List<ScheduleSettings.CronUpdateSkip> data, DateTime? currentDate = null) => public static List<ScheduleSettings.CronUpdateSkip> FilterDateEntry(this List<ScheduleSettings.CronUpdateSkip> data, DateTime? currentDate = null) =>
data.Filter(DateOnly.FromDateTime(currentDate ?? DateTime.Now)); data.FilterDateEntry(DateOnly.FromDateTime(currentDate ?? DateTime.Now));
public static List<ScheduleSettings.CronUpdateSkip> Filter(this List<ScheduleSettings.CronUpdateSkip> data, DateOnly? currentDate = null)
{
currentDate ??= DateOnly.FromDateTime(DateTime.Now);
return data.Where(x => x.Date >= currentDate || x.End >= currentDate)
.OrderBy(x => x.End ?? x.Date)
.ToList();
}
public static List<DateTimeOffset> GetNextTask(this List<ScheduleSettings.CronUpdateSkip> data, public static List<DateTimeOffset> GetNextTask(this List<ScheduleSettings.CronUpdateSkip> data,
CronExpression expression, int depth = 1, DateOnly? currentDate = null) CronExpression expression, int depth = 1, DateOnly? currentDate = null)
@ -42,7 +52,7 @@ public static class CronUpdateSkipService
do do
{ {
var lastSkip = data.Filter(nextRunTime.DateTime).LastOrDefault(); var lastSkip = data.FilterDateEntry(nextRunTime.DateTime).LastOrDefault();
if (lastSkip is { Start: not null, End: not null }) if (lastSkip is { Start: not null, End: not null })
nextRunTime = new DateTimeOffset(lastSkip.End.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero); nextRunTime = new DateTimeOffset(lastSkip.End.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero);
@ -56,7 +66,7 @@ public static class CronUpdateSkipService
nextRunTime = next.Value; nextRunTime = next.Value;
if (data.Filter(nextRunTime.DateTime).Any()) if (data.FilterDateEntry(nextRunTime.DateTime).Any())
continue; continue;
result.Add(nextRunTime); result.Add(nextRunTime);

6
Endpoint/Controllers/V1/Configuration/ScheduleController.cs
View File

@ -103,7 +103,9 @@ public class ScheduleController(ILogger<ScheduleController> logger, IOptionsSnap
/// <returns>Cron update skip dates.</returns> /// <returns>Cron update skip dates.</returns>
[HttpGet("CronUpdateSkip")] [HttpGet("CronUpdateSkip")]
public ActionResult<List<CronUpdateSkip>> CronUpdateSkip() => public ActionResult<List<CronUpdateSkip>> CronUpdateSkip() =>
config.Value.ScheduleSettings!.CronUpdateSkipDateList.Filter(DateTime.Now).ConvertToDto(); config.Value.ScheduleSettings!.CronUpdateSkipDateList
.Filter()
.ConvertToDto();
/// <summary> /// <summary>
/// Updates the list of cron update skip dates in the configuration. /// Updates the list of cron update skip dates in the configuration.
@ -124,7 +126,7 @@ public class ScheduleController(ILogger<ScheduleController> logger, IOptionsSnap
throw new ControllerArgumentException(ex.Message); throw new ControllerArgumentException(ex.Message);
} }
config.Value.ScheduleSettings!.CronUpdateSkipDateList = result.Filter(DateTime.Now); config.Value.ScheduleSettings!.CronUpdateSkipDateList = result.Filter();
config.Value.SaveSetting(); config.Value.SaveSetting();
return Ok(); return Ok();