Merge pull request #254 from NCronJob-Dev/ntk/delegates

Straighten registration of untyped named jobs

Author: nulltoken

CHANGELOG.md

@@ -6,6 +6,8 @@ All notable changes to **NCronJob** will be documented in this file. The project
 
 ## [Unreleased]
 
+- Allow the registration of the same untyped job with different names. Reported by [@Mangatome](https://github.com/Mangatome) in [#~253](https://github.com/NCronJob-Dev/NCronJob/issues/253). Fixed by [@nulltoken](https://github.com/nulltoken) in [#252](https://github.com/NCronJob-Dev/NCronJob/pull/252) and [#254](https://github.com/NCronJob-Dev/NCronJob/pull/254).
+
 ## [v4.4.0] - 2025-03-10
 
 ### Added

src/NCronJob/Registry/JobDefinition.cs

@@ -28,7 +28,9 @@ private JobDefinition(
 
         Delegate = jobDelegate;
         IsTypedJob = false;
-        JobFullName = $"Untyped job {typeof(DynamicJobFactory).Namespace}.{DynamicJobNameGenerator.GenerateJobName(jobDelegate)}";
+        JobFullName = customName is not null ?
+            $"Untyped job {customName}" :
+            $"Untyped job {typeof(DynamicJobFactory).Namespace}.{DynamicJobNameGenerator.GenerateJobName(jobDelegate)}";
 
         JobPolicyMetadata = new JobExecutionAttributes(jobDelegate);
     }

src/NCronJob/Registry/JobRegistry.cs

@@ -145,15 +145,15 @@ private sealed class JobDefinitionEqualityComparer : IEqualityComparer<JobDefini
 
         public bool Equals(JobDefinition? x, JobDefinition? y) =>
             (x is null && y is null) || (x is not null && y is not null
-                                         && x.Type == y.Type && x.IsTypedJob
+                                         && x.JobFullName == y.JobFullName
                                          && x.Parameter == y.Parameter
                                          && x.CronExpression == y.CronExpression
                                          && x.TimeZone == y.TimeZone
                                          && x.CustomName == y.CustomName
                                          && x.IsStartupJob == y.IsStartupJob);
 
         public int GetHashCode(JobDefinition obj) => HashCode.Combine(
-            obj.Type,
+            obj.JobFullName,
             obj.Parameter,
             obj.CronExpression,
             obj.TimeZone,

tests/NCronJob.Tests/IntegrationTests.cs

@@ -663,13 +663,40 @@ public async Task StaticAnonymousJobsCanBeExecutedMultipleTimes()
     }
 
     [Fact]
-    public void AddingJobsWithTheSameCustomNameLeadsToException()
+    public void AddingUntypedJobsWithTheSameCustomNameLeadsToException()
     {
         Action act = () => ServiceCollection.AddNCronJob(
             n => n.AddJob(() => { }, Cron.AtEveryMinute, jobName: "Job1")
                 .AddJob(() => { }, Cron.AtMinute0, jobName: "Job1"));
 
-        act.ShouldThrow<InvalidOperationException>();
+        var e = act.ShouldThrow<InvalidOperationException>();
+        e.Message.ShouldStartWith("Job registration conflict detected. A job has already been registered with the name 'Job1'.");
+    }
+
+    [Fact]
+    public void AddingUntypedJobsWithTheSameDelegateLeadsToException()
+    {
+        Delegate jobDelegate = () => { };
+
+        Action act = () => ServiceCollection.AddNCronJob(
+            n => n.AddJob(jobDelegate, Cron.AtEveryMinute)
+                .AddJob(jobDelegate, Cron.AtEveryMinute));
+
+        var e = act.ShouldThrow<InvalidOperationException>();
+        e.Message.ShouldStartWith("Job registration conflict for job 'Untyped job NCronJob.UntypedJob_2SdMu4GO' detected. ");
+    }
+
+    [Fact]
+    public void CanAddUntypedJobsWithTheSameDelegateWithDifferentNames()
+    {
+        Delegate jobDelegate = () => { };
+
+        Action act = () => ServiceCollection.AddNCronJob(
+            n => n.AddJob(jobDelegate, Cron.AtEveryMinute)
+                .AddJob(jobDelegate, Cron.AtEveryMinute, jobName: "one")
+                .AddJob(jobDelegate, Cron.AtEveryMinute, jobName: "another"));
+
+        act.ShouldNotThrow();
     }
 
     [Fact]

tests/NCronJob.Tests/RuntimeJobRegistryTests.cs

@@ -67,6 +67,38 @@ public async Task MultipleDynamicallyAddedJobsAreExecuted()
         Storage.Entries.Count.ShouldBe(2);
     }
 
+    [Fact]
+    public async Task CanRegisterMultipleTimesTheSameDelegateWithDifferentNames()
+    {
+        ServiceCollection.AddNCronJob();
+
+        await StartNCronJob(startMonitoringEvents: false);
+
+        var registry = ServiceProvider.GetRequiredService<IRuntimeJobRegistry>();
+
+        Events.Count.ShouldBe(0);
+
+        Delegate jobDelegate = () => { };
+
+        // Trying to register twice the same unnamed delegates fails
+        registry.TryRegister(s => s.AddJob(jobDelegate, Cron.AtEveryMinute), out _).ShouldBe(true);
+
+        registry.TryRegister(s => s.AddJob(jobDelegate, Cron.AtEveryMinute), out Exception? unNamedUntypedJobException).ShouldBe(false);
+        unNamedUntypedJobException.ShouldNotBeNull();
+        unNamedUntypedJobException.Message.ShouldStartWith("Job registration conflict for job 'Untyped job NCronJob.UntypedJob_I2s40FrC' detected.");
+
+        // Trying to register twice the same named delegates fails as well
+        registry.TryRegister(s => s.AddJob(jobDelegate, Cron.AtEveryMinute, jobName: "one"), out _).ShouldBe(true);
+        registry.TryRegister(s => s.AddJob(jobDelegate, Cron.AtEveryMinute, jobName: "one"), out Exception? namedUntypedJobException).ShouldBe(false);
+        namedUntypedJobException.ShouldNotBeNull();
+        namedUntypedJobException.Message.ShouldStartWith("Job registration conflict detected. A job has already been registered with the name 'one'.");
+
+        registry.TryRegister(s => s.AddJob(jobDelegate, Cron.AtEveryMinute, jobName: "another"), out _).ShouldBe(true);
+
+        var jobRegistry = ServiceProvider.GetRequiredService<JobRegistry>();
+        jobRegistry.GetAllJobs().Select(jd => jd.JobFullName).ShouldBe(["Untyped job NCronJob.UntypedJob_I2s40FrC", "Untyped job one", "Untyped job another"]);
+    }
+
     [Fact]
     public async Task CanRemoveJobByName()
     {