fix: correct calculate next occurrence

ApiDto/Common/OAuthProvider.cs

@@ -19,4 +19,4 @@ public enum OAuthProvider
     /// OAuth provider for Mail.ru.
     /// </summary>
     MailRu
-}
+}

ApiDto/Common/PasswordPolicy.cs

@@ -29,4 +29,4 @@ public class PasswordPolicy
     /// Gets or sets a value indicating whether at least one special character is required in the password.
     /// </summary>
     public bool RequireSpecialCharacter { get; set; }
-}
+}

ApiDto/Common/TwoFactorAuthentication.cs

@@ -14,4 +14,4 @@ public enum TwoFactorAuthentication
     /// TOTP (Time-based One-Time Password) is required for additional verification.
     /// </summary>
     TotpRequired,
-}
+}

ApiDto/Requests/CreateUserRequest.cs

@@ -27,4 +27,4 @@ public class CreateUserRequest
     [Required]
     [MinLength(2)]
     public required string Password { get; set; }
-}
+}

ApiDto/Requests/ScheduleRequest.cs

@@ -34,4 +34,4 @@ public class ScheduleRequest
     /// Gets or sets an array of lesson type IDs.
     /// </summary>
     public int[]? LessonType { get; set; } = null;
-}
+}

ApiDto/Responses/CampusDetailsResponse.cs

@@ -28,4 +28,4 @@ public class CampusDetailsResponse
     /// Gets or sets the address of the campus (optional).
     /// </summary>
     public string? Address { get; set; }
-}
+}

ApiDto/Responses/ScheduleResponse.cs

@@ -114,4 +114,4 @@ public class ScheduleResponse
     /// Gets or sets the links to online meetings for the schedule entry.
     /// </summary>
     public required IEnumerable<string?> LinkToMeet { get; set; }
-}
+}

Endpoint/Common/MapperDto/CronUpdateSkipConverter.cs

@@ -16,4 +16,4 @@ public static class CronUpdateSkipConverter
         }).ToList();
     public static List<ScheduleSettings.CronUpdateSkip> ConvertFromDto(this IEnumerable<Dto.Common.CronUpdateSkip> pairPeriod) =>
         pairPeriod.Select(x => x.Get()).ToList();
-}
+}

Endpoint/Common/MapperDto/PairPeriodTimeConverter.cs

@@ -11,4 +11,4 @@ public static class PairPeriodTimeConverter
 
     public static Dictionary<int, ScheduleSettings.PairPeriodTime> ConvertFromDto(this IDictionary<int, Dto.Common.PairPeriodTime> pairPeriod) =>
         pairPeriod.ToDictionary(kvp => kvp.Key, kvp => new ScheduleSettings.PairPeriodTime(kvp.Value.Start, kvp.Value.End));
-}
+}

Endpoint/Common/Services/CronUpdateSkipService.cs

@@ -45,32 +45,31 @@ public static class CronUpdateSkipService
         if (depth <= 0)
             return [];
 
-        currentDate ??= DateOnly.FromDateTime(DateTime.Now);
+        DateTimeOffset nextRunTime = (currentDate?.ToDateTime(TimeOnly.MinValue) ?? DateTime.Now).ToUniversalTime();
-        DateTimeOffset nextRunTime = currentDate.Value.ToDateTime(TimeOnly.FromDateTime(DateTime.Now));
-
         List<DateTimeOffset> result = [];
 
         do
         {
-            var lastSkip = data.FilterDateEntry(nextRunTime.DateTime).LastOrDefault();
+            var lastSkippedEntry = data.FilterDateEntry(nextRunTime.DateTime).LastOrDefault();
 
-            if (lastSkip is { Start: not null, End: not null })
+            if (lastSkippedEntry is { Start: not null, End: not null })
-                nextRunTime = new DateTimeOffset(lastSkip.End.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero);
+                nextRunTime = lastSkippedEntry.End.Value.ToDateTime(TimeOnly.MinValue).AddDays(1);
-            else if (lastSkip.Date.HasValue)
+            else if (lastSkippedEntry.Date.HasValue)
-                nextRunTime = new DateTimeOffset(lastSkip.Date.Value.AddDays(1), new TimeOnly(0, 0, 0), TimeSpan.Zero);
+                nextRunTime = lastSkippedEntry.Date.Value.ToDateTime(TimeOnly.MinValue).AddDays(1);
 
-            var next = expression.GetNextOccurrence(nextRunTime.ToUniversalTime(), TimeZoneInfo.Local);
+            var nextOccurrence = expression.GetNextOccurrence(nextRunTime.AddMinutes(-1), TimeZoneInfo.Local);
 
-            if (!next.HasValue)
+            if (!nextOccurrence.HasValue)
                 return result;
 
-            nextRunTime = next.Value;
+            if (data.FilterDateEntry(nextOccurrence.Value.DateTime).Count != 0)
-
+            {
-            if (data.FilterDateEntry(nextRunTime.DateTime).Any())
+                nextRunTime = nextOccurrence.Value.AddDays(1);
                 continue;
+            }
 
-            result.Add(nextRunTime);
+            result.Add(nextOccurrence.Value.ToLocalTime());
-            nextRunTime = nextRunTime.AddMinutes(1);
+            nextRunTime = nextOccurrence.Value.AddMinutes(1);
 
         } while (result.Count < depth);
 

Endpoint/Configuration/Core/Startup/JwtConfiguration.cs

@@ -64,4 +64,4 @@ public static class JwtConfiguration
             };
         });
     }
-}
+}

Endpoint/Configuration/Core/Startup/LoggerConfiguration.cs

@@ -99,4 +99,4 @@ public static class LoggerConfiguration
                 };
         });
     }
-}
+}

Endpoint/Configuration/ISaveSettings.cs

@@ -2,4 +2,4 @@
 public interface ISaveSettings
 {
     void SaveSetting();
-}
+}

Security/Common/Interfaces/ICacheService.cs

@@ -13,4 +13,4 @@ public interface ICacheService
 
     Task<T?> GetAsync<T>(string key, CancellationToken cancellationToken = default);
     Task RemoveAsync(string key, CancellationToken cancellationToken = default);
-}
+}

Security/Common/Model/CookieOptions.cs

@@ -26,4 +26,4 @@ public class CookieOptions
 
     internal void DropCookie(HttpContext context, string name) =>
         SetCookie(context, name, "", DateTimeOffset.MinValue);
-}
+}

SqlData/Migrations/MysqlMigrations/Migrations/20240601023106_InitialMigration.cs

@@ -386,4 +386,4 @@ namespace MysqlMigrations.Migrations
                 name: "Campus");
         }
     }
-}
+}

SqlData/Migrations/MysqlMigrations/Migrations/20241027034820_RemoveUnusedRef.cs

@@ -80,4 +80,4 @@ namespace MysqlMigrations.Migrations
                 onDelete: ReferentialAction.SetNull);
         }
     }
-}
+}

SqlData/Migrations/PsqlMigrations/Migrations/20240601021702_InitialMigration.cs

@@ -362,4 +362,4 @@ namespace PsqlMigrations.Migrations
                 name: "Campus");
         }
     }
-}
+}

SqlData/Migrations/PsqlMigrations/Migrations/20241027032753_RemoveUnusedRef.cs

@@ -46,4 +46,4 @@ namespace PsqlMigrations.Migrations
                 onDelete: ReferentialAction.SetNull);
         }
     }
-}
+}

SqlData/Migrations/SqliteMigrations/Migrations/20240601015714_InitialMigration.cs

@@ -361,4 +361,4 @@ namespace SqliteMigrations.Migrations
                 name: "Campus");
         }
     }
-}
+}

SqlData/Migrations/SqliteMigrations/Migrations/20241027032931_RemoveUnusedRef.cs

@@ -46,4 +46,4 @@ namespace SqliteMigrations.Migrations
                 onDelete: ReferentialAction.SetNull);
         }
     }
-}
+}

SqlData/Persistence/Common/ModelBuilderExtensions.cs

@@ -19,4 +19,4 @@ public static class ModelBuilderExtensions
         var applyConcreteMethod = applyGenericMethod.MakeGenericMethod(entityType);
         applyConcreteMethod.Invoke(modelBuilder, [configuration]);
     }
-}
+}