Merge pull request #206 from CKCobra/HolidayDateChange

Updates to support date changes in the Holiday API
Speedygeek · Mar 13, 2016 · 43fa744 · 43fa744
2 parents dd7e09f + 8ff22fc
commit 43fa744
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/Tests/ScheduleTests.cs b/src/Tests/ScheduleTests.cs
@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using ZendeskApi_v2;
@@ -94,7 +95,7 @@ public void CanUpdateIntervals()
             Assert.True(api.Schedules.DeleteSchedule(res.Schedule.Id.Value));
         }
 
-[Test]
+        [Test]
         public void CanCreateUpdateAndDeleteHoliday()
         {
             var res = api.Schedules.CreateSchedule(new Schedule()
@@ -106,13 +107,13 @@ public void CanCreateUpdateAndDeleteHoliday()
             var res2 = api.Schedules.CreateHoliday(res.Schedule.Id.Value, new Holiday()
             {
                 Name      = "Test Holiday",
-                StartDate = 35,
-                EndDate   = 35
+                StartDate = DateTimeOffset.Parse("2016-02-05"),
+                EndDate   = DateTimeOffset.Parse("2016-02-05")
             });
 
             Assert.Greater(res2.Holiday.Id, 0);
 
-            res2.Holiday.EndDate = 36;
+            res2.Holiday.EndDate = DateTimeOffset.Parse("2016-02-06");
             var update           = api.Schedules.UpdateHoliday(res.Schedule.Id.Value, res2.Holiday);
             Assert.AreEqual(update.Holiday.Name, res2.Holiday.Name);
             Assert.AreEqual(update.Holiday.EndDate, res2.Holiday.EndDate);

diff --git a/src/ZendeskApi_v2/Models/Schedules/Holiday.cs b/src/ZendeskApi_v2/Models/Schedules/Holiday.cs
@@ -1,4 +1,7 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using ZendeskApi_v2.Serialization;
 
 namespace ZendeskApi_v2.Models.Schedules
 {
@@ -11,9 +14,11 @@ public class Holiday
         public string Name { get; set; }
 
         [JsonProperty("start_date")]
-        public int? StartDate { get; set; }
+        [JsonConverter(typeof(IsoDateTimeConverter))]
+        public DateTimeOffset? StartDate { get; set; }
 
         [JsonProperty("end_date")]
-        public int? EndDate { get; set; }
+        [JsonConverter(typeof(IsoDateTimeConverter))]
+        public DateTimeOffset? EndDate { get; set; }
     }
 }