Refactor recurrence class

Author: ethanhann

src/InEngine.Core/Scheduling/Recurrence.cs

@@ -14,97 +14,108 @@ public TriggerBuilder MakeTriggerBuilder(AbstractCommand command)
         {
             return TriggerBuilder
                 .Create()
-                .WithIdentity($"{command.Name}:job:{command.ScheduleId}", command.SchedulerGroup);
+                .WithIdentity($"{command.Name}:job:{command.ScheduleId}", command.SchedulerGroup);            
         }
 
-        public void EverySecond()
+        public ITrigger MakeTrigger(AbstractCommand command, Action<DailyTimeIntervalScheduleBuilder> action)
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInSeconds(1).RepeatForever())
+            return MakeTriggerBuilder(command)
+                .WithDailyTimeIntervalSchedule(action)
                 .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
         }
 
-        public void EveryMinute()
+        public ITrigger MakeTrigger(AbstractCommand command, string cronExpression)
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInMinutes(1).RepeatForever())
+            return MakeTriggerBuilder(command)
+                .WithCronSchedule(cronExpression)
                 .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
         }
 
-        public void EveryFiveMinutes()
+        public ITrigger MakeTrigger(AbstractCommand command, Action<SimpleScheduleBuilder> action)
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInMinutes(5).RepeatForever())
+            return MakeTriggerBuilder(command)
+                .WithSimpleSchedule(action)
                 .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+        }
+
+        public void EverySecond()
+        {
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInSeconds(1).RepeatForever())
+            );
+        }
+
+        public void EveryMinute()
+        {
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInMinutes(1).RepeatForever())
+            );
+        }
+
+        public void EveryFiveMinutes()
+        {
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInMinutes(5).RepeatForever())
+            );
         }
 
         public void EveryTenMinutes()
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInMinutes(10).RepeatForever())
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInMinutes(10).RepeatForever())
+            );
         }
 
         public void EveryFifteenMinutes()
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInMinutes(15).RepeatForever())
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInMinutes(15).RepeatForever())
+            );
         }
 
         public void EveryThirtyMinutes()
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInMinutes(30).RepeatForever())
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInMinutes(30).RepeatForever())
+            );
         }
 
         public void Hourly()
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInHours(1).RepeatForever())
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInHours(1).RepeatForever())
+            );
         }
 
         public void HourlyAt(int minutesAfterTheHour)
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithCronSchedule($"0 {minutesAfterTheHour} * * * ?")
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, $"0 {minutesAfterTheHour} * * * ?")
+            );
         }
 
         public void Daily()
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithSimpleSchedule(x => x.WithIntervalInHours(24).RepeatForever())
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail,
+                MakeTrigger(Command, x => x.WithIntervalInHours(24).RepeatForever())
+            );
         }
 
         public void DailyAt(TimeOfDay timeOfDay)
         {
-            var trigger = MakeTriggerBuilder(Command)
-                .StartNow()
-                .WithDailyTimeIntervalSchedule(x => x.StartingDailyAt(timeOfDay))
-                .Build();
-            Scheduler.ScheduleJob(JobDetail, trigger);
+            Scheduler.ScheduleJob(
+                JobDetail, 
+                MakeTrigger(Command, x => x.StartingDailyAt(timeOfDay))
+            );
         }
     }
 }