Fixed a bug in cron and daily interval trigger caused by missing serialized timezone

Author: jenrom

src/Quartz.Impl.MongoDB.Tests/CronTriggerSpecs.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Linq;
+
+using Machine.Specifications;
+
+using Quartz.Impl.Triggers;
+using Quartz.Spi;
+
+namespace Quartz.Impl.MongoDB.Tests
+{
+    public class CronTriggerSpecs
+    {
+        public class When_a_cron_trigger_with_a_daily_schedule_at_5_o_clock_german_local_time_is_retrieved_from_the_job_store
+        {
+            private Establish context = () =>
+                {
+                    expectedTimeZone = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
+                    SystemTime.UtcNow = () => new DateTimeOffset(new DateTime(2012, 12, 12, 8, 0, 0));
+                    var tomorrow = new DateTime(2012, 12, 13, 5, 0, 0);
+                    expectedNextFireTime = new DateTimeOffset(tomorrow, expectedTimeZone.GetUtcOffset(tomorrow));
+
+                    jobStore = new JobStore();
+                    jobStore.ClearAllSchedulingData();
+
+                    trigger =
+                        TriggerBuilder.Create()
+                                      .ForJob(jobKey)
+                                      .WithCronSchedule("0 0 5 ? * *", x => x.InTimeZone(expectedTimeZone))
+                                      .Build();
+                    jobDetail = JobBuilder.Create<TestJob>().WithIdentity("test").Build();
+                    jobStore.StoreJobAndTrigger(jobDetail, (IOperableTrigger)trigger);
+                };
+
+            private Because of =
+                () => retrievedCronTrigger = (CronTriggerImpl)jobStore.GetTriggersForJob(jobKey).Single();
+
+            private It should_still_be_configured_for_the_german_time_zone = () => retrievedCronTrigger.TimeZone.ShouldEqual(expectedTimeZone);
+
+            private It should_schedule_the_trigger_next_time_on_5_o_clock_german_local_time = () =>
+                { 
+                    retrievedCronTrigger.Triggered(null);
+                    var nextFireTimeUtc = retrievedCronTrigger.GetNextFireTimeUtc();
+                    nextFireTimeUtc.ShouldEqual(expectedNextFireTime);
+                };
+
+            private static JobStore jobStore;
+
+            private static ITrigger trigger;
+
+            private static IJobDetail jobDetail;
+
+            private static TimeZoneInfo expectedTimeZone;
+
+            private static JobKey jobKey = new JobKey("test");
+
+            private static CronTriggerImpl retrievedCronTrigger;
+
+            private static DateTimeOffset expectedNextFireTime;
+        }
+    }
+}

src/Quartz.Impl.MongoDB.Tests/TriggerSpecs.cs renamed to src/Quartz.Impl.MongoDB.Tests/DailyIntervalTriggerSpecs.cs

@@ -1,27 +1,25 @@
-using Machine.Specifications;
+using System;
+
+using Machine.Specifications;
 namespace Quartz.Impl.MongoDB.Tests
 {
-    using System;
-    using System.Collections.Specialized;
-    using System.Diagnostics;
     using System.Linq;
-    using System.Threading;
-
-    using Common.Logging.Simple;
 
     using Quartz.Spi;
 
-    public class TriggerSpecs
+    public class DailyIntervalTriggerSpecs
     {
         public class When_a_daily_interval_trigger_has_been_stored_in_the_mongo_db
         {
             private Establish context = () =>
                 {
                     jobStore = new JobStore();
                     jobStore.ClearAllSchedulingData();
+                    
+                    germanTimeZone = TimeZoneInfo.FindSystemTimeZoneById("W. Europe Standard Time");
                     trigger = TriggerBuilder.Create()
                         .ForJob(new JobKey("test"))
-                        .WithDailyTimeIntervalSchedule(x => x.OnEveryDay().StartingDailyAt(new TimeOfDay(10, 10)))
+                        .WithDailyTimeIntervalSchedule(x => x.InTimeZone(germanTimeZone).OnEveryDay().StartingDailyAt(new TimeOfDay(10, 10)))
                         .Build();
                     jobDetail = JobBuilder.Create<TestJob>().WithIdentity("test").Build();
                 };
@@ -34,19 +32,19 @@ public class When_a_daily_interval_trigger_has_been_stored_in_the_mongo_db
                     triggersForJob.Count.ShouldEqual(1);
                 };
 
+            private It should_retrieve_the_correct_time_zone = () =>
+                {
+                    var trigger = (IDailyTimeIntervalTrigger)jobStore.GetTriggersForJob(new JobKey("test")).Single();
+                    trigger.TimeZone.ShouldEqual(germanTimeZone);
+                };
+
             private static JobStore jobStore;
 
             private static ITrigger trigger;
 
             private static IJobDetail jobDetail;
-        }
-    }
 
-    public class TestJob: IJob
-    {
-        public void Execute(IJobExecutionContext context)
-        {
-            throw new NotImplementedException();
+            private static TimeZoneInfo germanTimeZone;
         }
     }
 }

src/Quartz.Impl.MongoDB.Tests/Quartz.Impl.MongoDB.Tests.csproj

@@ -55,8 +55,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TriggerSpecs.cs" />
+    <Compile Include="CronTriggerSpecs.cs" />
+    <Compile Include="DailyIntervalTriggerSpecs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestJob.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

src/Quartz.Impl.MongoDB.Tests/TestJob.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Quartz.Impl.MongoDB.Tests
+{
+    public class TestJob: IJob
+    {
+        public void Execute(IJobExecutionContext context)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Quartz.Impl.MongoDB/JobStore.cs

@@ -27,6 +27,8 @@
 using System.Text;
 using System.Threading;
 
+using AutoScout24.SMP.BackgroundServices.SmpJobs.Infrastructure.Quartz;
+
 using Common.Logging;
 
 using Quartz.Collection;
@@ -165,6 +167,7 @@ static JobStore()
                 cm.AutoMap();
                 cm.MapField("nextFireTimeUtc");
                 cm.MapField("previousFireTimeUtc");
+                cm.MapField(x => x.TimeZone).SetSerializer(new TimeZoneInfoSerializer());
                 cm.SetIgnoreExtraElements(true);
             });
 
@@ -174,6 +177,7 @@ static JobStore()
                 cm.MapField("complete");
                 cm.MapField("nextFireTimeUtc");
                 cm.MapField("previousFireTimeUtc");
+                cm.MapField(x => x.TimeZone).SetSerializer(new TimeZoneInfoSerializer());
                 cm.SetIgnoreExtraElements(true);
             });
 

src/Quartz.Impl.MongoDB/Quartz.Impl.MongoDB.csproj

@@ -68,6 +68,7 @@
     <Compile Include="IdOrKeyConvention.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SetSerializer.cs" />
+    <Compile Include="TimeZoneInfoSerializer.cs" />
     <Compile Include="TriggerKeySerializer.cs" />
   </ItemGroup>
   <ItemGroup>

src/Quartz.Impl.MongoDB/TimeZoneInfoSerializer.cs

@@ -0,0 +1,37 @@
+using System;
+
+using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization;
+
+namespace AutoScout24.SMP.BackgroundServices.SmpJobs.Infrastructure.Quartz
+{
+    public class TimeZoneInfoSerializer : IBsonSerializer
+    {
+        public object Deserialize(BsonReader bsonReader, Type nominalType, IBsonSerializationOptions options)
+        {
+            return Deserialize(bsonReader);
+        }
+
+        public object Deserialize(BsonReader bsonReader, Type nominalType, Type actualType, IBsonSerializationOptions options)
+        {
+            return Deserialize(bsonReader);
+        }
+
+        private static object Deserialize(BsonReader bsonReader)
+        {
+            var timeZoneId = bsonReader.ReadString();
+            return TimeZoneInfo.FindSystemTimeZoneById(timeZoneId);
+        }
+
+        public IBsonSerializationOptions GetDefaultSerializationOptions()
+        {
+            return null;
+        }
+
+        public void Serialize(BsonWriter bsonWriter, Type nominalType, object value, IBsonSerializationOptions options)
+        {
+            var timeZoneInfo = (TimeZoneInfo)value;
+            bsonWriter.WriteString(timeZoneInfo.Id);
+        }
+    }
+}