feat!: Move second precision to job

Author: linkdotnet

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to **NCronJob** will be documented in this file. The project
 
 ## [Unreleased]
 
+### Changed
+
+- Moved `EnableSecondPrecision` from `AddNCronJob` to `AddCronJob` to allow for more granular control over the precision of the cron expression
+
 ## [0.12.0] - 2024-03-22
 
 ### Changed

src/LinkDotNet.NCronJob/JobOption.cs

@@ -24,6 +24,17 @@ public sealed class JobOption
     /// Gets or sets the <see cref="IsolationLevel"/> of the executed job.
     /// </summary>
     public IsolationLevel IsolationLevel { get; set; }
+
+    /// <summary>
+    /// Determines whether the cron expression can specify second-level precision.
+    /// </summary>
+    /// <remarks>
+    /// When enabled, cron expressions must include a seconds field, allowing for more precise scheduling.
+    /// By default, this is disabled, and cron expressions are expected to start with the minute field.
+    /// Enabling this affects scheduling granularity and may influence performance, especially for jobs
+    /// that are scheduled to run very frequently.
+    /// </remarks>
+    public bool EnableSecondPrecision { get; set; }
 }
 
 /// <summary>

src/LinkDotNet.NCronJob/NCronJobExtensions.cs

@@ -81,11 +81,9 @@ private static CrontabSchedule GetCronExpression(IServiceCollection services, Jo
     {
         using var serviceProvider = services.BuildServiceProvider();
 
-        var nCronJobOptions = serviceProvider.GetRequiredService<NCronJobOptions>();
-
         var cronParseOptions = new CrontabSchedule.ParseOptions
         {
-            IncludingSeconds = nCronJobOptions.EnableSecondPrecision
+            IncludingSeconds = option.EnableSecondPrecision
         };
 
         return CrontabSchedule.TryParse(option.CronExpression, cronParseOptions)

src/LinkDotNet.NCronJob/NCronJobOptions.cs

@@ -12,15 +12,4 @@ public sealed class NCronJobOptions
     /// The higher the value, the longer it will take to run instant jobs.
     /// </remarks>
     public TimeSpan TimerInterval { get; set; } = TimeSpan.FromSeconds(1);
-
-    /// <summary>
-    /// Determines whether cron expressions can specify second-level precision.
-    /// </summary>
-    /// <remarks>
-    /// When enabled, cron expressions must include a seconds field, allowing for more precise scheduling.
-    /// By default, this is disabled, and cron expressions are expected to start with the minute field.
-    /// Enabling this affects scheduling granularity and may influence performance, especially for jobs
-    /// that are scheduled to run very frequently.
-    /// </remarks>
-    public bool EnableSecondPrecision { get; set; }
 }

tests/NCronJob.Tests/ExtensionsTests.cs

@@ -21,9 +21,13 @@ public void AddingCronJobWithSecondPrecisionExpressionNotThrowException()
     {
         var everySecond = "* * * * * *";
         var collection = new ServiceCollection();
-        collection.AddNCronJob(options => options.EnableSecondPrecision  = true);
+        collection.AddNCronJob();
 
-        Action act = () => collection.AddCronJob<FakeJob>(o => o.CronExpression = everySecond);
+        Action act = () => collection.AddCronJob<FakeJob>(o =>
+        {
+            o.EnableSecondPrecision = true;
+            o.CronExpression = everySecond;
+        });
 
         act.ShouldNotThrow();
     }

tests/NCronJob.Tests/NCronJobIntegrationTests.cs

@@ -121,8 +121,12 @@ public async Task CronJobThatIsScheduledEverySecondShouldBeExecuted()
     {
         var fakeTimer = TimeProviderFactory.GetTimeProvider();
         ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
-        ServiceCollection.AddNCronJob(p => p.EnableSecondPrecision = true);
-        ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * * *");
+        ServiceCollection.AddNCronJob();
+        ServiceCollection.AddCronJob<SimpleJob>(p =>
+        {
+            p.EnableSecondPrecision = true;
+            p.CronExpression = "* * * * * *";
+        });
         await using var provider = ServiceCollection.BuildServiceProvider();
 
         await provider.GetRequiredService<IHostedService>().StartAsync(CancellationToken);
@@ -132,6 +136,30 @@ public async Task CronJobThatIsScheduledEverySecondShouldBeExecuted()
         jobFinished.ShouldBeTrue();
     }
 
+    [Fact]
+    public async Task CanRunSecondPrecisionAndMinutePrecisionJobs()
+    {
+        var fakeTimer = TimeProviderFactory.GetTimeProvider();
+        ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
+        ServiceCollection.AddNCronJob();
+        ServiceCollection.AddCronJob<SimpleJob>(p =>
+        {
+            p.EnableSecondPrecision = true;
+            p.CronExpression = "* * * * * *";
+        });
+        ServiceCollection.AddCronJob<SimpleJob>(p =>
+        {
+            p.CronExpression = "* * * * *";
+        });
+        await using var provider = ServiceCollection.BuildServiceProvider();
+
+        await provider.GetRequiredService<IHostedService>().StartAsync(CancellationToken);
+
+        fakeTimer.Advance(TimeSpan.FromSeconds(61));
+        var jobFinished = await WaitForJobsOrTimeout(61);
+        jobFinished.ShouldBeTrue();
+    }
+
     [Fact]
     public async Task LongRunningJobShouldNotBlockSchedulerWithIsolationLevelTask()
     {