Add fluent schedule and cron expression builder

Cronitor.Tests/Builders/CheckBuilder.cs

@@ -1,13 +1,14 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Cronitor.Constants;
+using Cronitor.Scheduling;
 using Cronitor.Models.Monitors;
 
 namespace Cronitor.Tests.Builders
 {
     public class CheckBuilder
     {
         private readonly string _key = "Key";
-        private readonly string _schedule = "every 60 seconds";
+        private readonly ScheduleExpression _schedule = Schedule.Every(60).Seconds;
         private readonly string _timezone = "Europe/Stockholm";
         private readonly string _url = "https://www.google.se";
 
@@ -35,4 +36,4 @@ public Check Build()
             };
         }
     }
-}
+}

Cronitor.Tests/Builders/HeartbeatBuilder.cs

@@ -1,11 +1,12 @@
-using Cronitor.Models.Monitors;
+using Cronitor.Scheduling;
+using Cronitor.Models.Monitors;
 
 namespace Cronitor.Tests.Builders
 {
     public class HeartbeatBuilder
     {
         private readonly string _key = "Key";
-        private readonly string _schedule = "every 60 seconds";
+        private readonly ScheduleExpression _schedule = Schedule.Every(60).Seconds;
         private readonly string _timezone = "Europe/Stockholm";
 
         public Heartbeat Build()
@@ -16,4 +17,4 @@ public Heartbeat Build()
             };
         }
     }
-}
+}

Cronitor.Tests/Builders/JobBuilder.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Cronitor.Assertions;
 using Cronitor.Models.Monitors;
+using Cronitor.Scheduling;
 
 namespace Cronitor.Tests.Builders
 {
@@ -13,7 +14,7 @@ public class JobBuilder
         private readonly string _group = "Group";
         private readonly string _note = "Note";
         private readonly string _platform = "Platform";
-        private string _schedule = "35 0 * * *";
+        private ScheduleExpression _schedule = Schedule.Cron.Daily(hour: 0, minute: 35);
         private readonly int? _scheduleTolerance = 1;
         private readonly string _timeZone = "Europe/Stockholm";
 
@@ -39,7 +40,7 @@ public JobBuilder Notify(List<string> notify)
             return this;
         }
 
-        public JobBuilder Schedule(string schedule)
+        public JobBuilder WithSchedule(ScheduleExpression schedule)
         {
             _schedule = schedule;
             return this;
@@ -64,4 +65,4 @@ public Job Build()
             };
         }
     }
-}
+}

Cronitor.Tests/MonitorTypeTests.cs

@@ -1,5 +1,6 @@
 using Cronitor.Constants;
 using Cronitor.Models;
+using Cronitor.Scheduling;
 using Cronitor.Models.Monitors;
 using Cronitor.Tests.Helpers;
 using System.Collections.Generic;
@@ -28,7 +29,7 @@ public void ShouldCreateCheckMonitor()
                 Region.Sydney,
                 Region.Virginia
             };
-            const string schedule = "every 60 seconds";
+            var schedule = Schedule.Every(60).Seconds;
             const string timezone = "Europe/Stockholm";
             const string url = "https://www.google.se";
 
@@ -55,7 +56,7 @@ public void ShouldCreateCheckMonitor()
         [Fact]
         public void ShouldCreateHeartbeatMonitor()
         {
-            const string schedule = "every 60 seconds";
+            var schedule = Schedule.Every(60).Seconds;
             const string timezone = "Europe/Stockholm";
 
             var monitor = new Heartbeat(MonitorKey, schedule)
@@ -84,7 +85,7 @@ public void ShouldCreateJobMonitor()
                 "developers",
                 "administrators"
             };
-            const string schedule = "every 60 seconds";
+            var schedule = Schedule.Every(60).Seconds;
             const string timezone = "Europe/Stockholm";
 
             var monitor = new Job(MonitorKey)

Cronitor.Tests/MonitorsClientTests.cs

@@ -133,7 +133,7 @@ public void ShouldExecuteCreateMethod()
             };
             var monitor = Make.Job
                 .Notify(notify)
-                .Schedule("every 60 seconds")
+                .WithSchedule("every 60 seconds")
                 .Build();
             _httpClient.Setup(x => x.SendAsync<CreateMonitorResponse>(It.IsAny<CreateMonitorRequest>())).Returns(Task.FromResult(new CreateMonitorResponse { Monitors = new List<Monitor> { monitor } }));
 

Cronitor.Tests/Requests/CreateMonitorRequestTests.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Cronitor.Assertions;
 using Cronitor.Constants;
+using Cronitor.Scheduling;
 using Cronitor.Models;
 using Cronitor.Requests;
 using Cronitor.Tests.Helpers;
@@ -17,7 +18,7 @@ public async Task ShouldCreateMonitorRequestAsync(string expected)
         {
             var monitor = new Monitor("nightly-backup-job")
                 .With(x => x.Type, MonitorType.Job.ToString())
-                .With(x => x.Schedule, "0 0 * * *")
+                .With(x => x.Schedule, Schedule.Cron.Daily())
                 .With(x => x.Notify, new List<string> { "default" })
                 .With(x => x.Tags, new List<string> { "nightly" })
                 .With(x => x.Assertions, new List<AssertionRule> { Assertion.Metric.Duration.LessThan("15min") })

Cronitor.Tests/Requests/UpdateMonitorRequestTests.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Cronitor.Assertions;
 using Cronitor.Constants;
+using Cronitor.Scheduling;
 using Cronitor.Models;
 using Cronitor.Requests;
 using Cronitor.Tests.Helpers;
@@ -18,7 +19,7 @@ public async Task ShouldCreateUpdateMonitorRequestAsync(string expected)
         {
             var monitor = new Monitor("nightly-backup-job")
                 .With(x => x.Type, MonitorType.Job.ToString())
-                .With(x => x.Schedule, "0 0 * * *")
+                .With(x => x.Schedule, Schedule.Cron.Daily())
                 .With(x => x.Notify, new List<string> { "default" })
                 .With(x => x.Tags, new List<string> { "nightly" })
                 .With(x => x.Assertions, new List<AssertionRule> { Assertion.Metric.Duration.LessThan("15min") })