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

Compare commits

base: Winsomnia:ea4c8b61e083ce791578e511339b11f6a9154f76
Branches Tags
Winsomnia:master Winsomnia:release/v1.0.0
...
compare: Winsomnia:e79ec360ea3b56cb5136b76f2db6fc908b6ee9f4
Branches Tags
Winsomnia:master Winsomnia:release/v1.0.0

2 Commits
ea4c8b61e0 ... e79ec360ea

Author SHA1 Message Date
Polianin Nikita
e79ec360ea Merge branch 'release/v1.0.0' of https://git.winsomnia.net/Winsomnia/MireaBackend into release/v1.0.0
Some checks failed
.NET Test Pipeline / build-and-test (push) Failing after 1m36s
Details
Build and Deploy Docker Container / build-and-deploy (push) Successful in 2m37s
Details
2025-02-06 16:29:48 +03:00
Polianin Nikita
31c1d2804d fix: hotfix calculate next run time 2025-02-06 16:27:20 +03:00
1 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

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

@ -37,7 +37,7 @@ public static class CronUpdateSkipService
.OrderBy(x => x.End ?? x.Date) .OrderBy(x => x.End ?? x.Date)
.ToList(); .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)
@ -45,8 +45,8 @@ public static class CronUpdateSkipService
if (depth <= 0) if (depth <= 0)
return []; return [];
currentDate ??= DateOnly.FromDateTime(DateTime.UtcNow); currentDate ??= DateOnly.FromDateTime(DateTime.Now);
DateTimeOffset nextRunTime = currentDate.Value.ToDateTime(new TimeOnly(0, 0, 0)); DateTimeOffset nextRunTime = currentDate.Value.ToDateTime(TimeOnly.FromDateTime(DateTime.Now));
List<DateTimeOffset> result = []; List<DateTimeOffset> result = [];
@ -59,7 +59,7 @@ public static class CronUpdateSkipService
else if (lastSkip.Date.HasValue) else if (lastSkip.Date.HasValue)
nextRunTime = new DateTimeOffset(lastSkip.Date.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero); nextRunTime = new DateTimeOffset(lastSkip.Date.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero);
var next = expression.GetNextOccurrence(nextRunTime, TimeZoneInfo.Local); var next = expression.GetNextOccurrence(nextRunTime.ToUniversalTime(), TimeZoneInfo.Local);
if (!next.HasValue) if (!next.HasValue)
return result; return result;