refactor: [breaking] remove obsolete Input from webhooks

Vonage · Mar 14, 2024 · d166b59 · d166b59
1 parent 70428e7
commit d166b59
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 70 deletions.
diff --git a/Vonage.Test/WebhookStructsTest.cs b/Vonage.Test/WebhookStructsTest.cs
@@ -269,30 +269,6 @@ public void TestHumanMachine(string type)
                                           DateTimeStyles.AdjustToUniversal), humanMachineWebhook.TimeStamp);
     }
 
-    [Fact]
-    public void TestInputOld()
-    {
-        var json = @"
-                {
-                    ""from"":""442079460000"", 
-                    ""to"":""447700900000"", 
-                    ""uuid"":""aaaaaaaa-bbbb-cccc-dddd-0123456789ab"",
-                    ""conversation_uuid"":""CON-aaaaaaaa-bbbb-cccc-dddd-0123456789ab"",
-                    ""dtmf"":""42"",
-                    ""timed_out"":""true"",
-                    ""timestamp"":""2020-01-01T12:00:00.000Z""
-                }";
-        var inputWebhook = (Input) EventBase.ParseEvent(json);
-        Assert.Equal("442079460000", inputWebhook.From);
-        Assert.Equal("447700900000", inputWebhook.To);
-        Assert.Equal("42", inputWebhook.Dtmf);
-        Assert.Equal("aaaaaaaa-bbbb-cccc-dddd-0123456789ab", inputWebhook.Uuid);
-        Assert.Equal("CON-aaaaaaaa-bbbb-cccc-dddd-0123456789ab", inputWebhook.ConversationUuid);
-        Assert.Equal(DateTime.ParseExact("2020-01-01T12:00:00.000Z", "yyyy-MM-dd'T'HH:mm:ss.fff'Z'",
-            CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal |
-                                          DateTimeStyles.AdjustToUniversal), inputWebhook.TimeStamp);
-    }
-
     [Fact]
     public void TestNotifications()
     {

diff --git a/Vonage/Voice/EventWebhooks/EventBase.cs b/Vonage/Voice/EventWebhooks/EventBase.cs
@@ -1,6 +1,6 @@
-using Newtonsoft.Json;
+using System;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
 using Vonage.Serialization;
 
 namespace Vonage.Voice.EventWebhooks;
@@ -15,8 +15,7 @@ public class EventBase
 
     public static EventBase ParseEvent(string json)
     {
-        var data = (JObject)JsonConvert.DeserializeObject(json);
-
+        var data = (JObject) JsonConvert.DeserializeObject(json);
         if (data.Property("status") != null)
         {
             return DeserializeStatus(json, data.Property("status"));
@@ -36,7 +35,7 @@ public static EventBase ParseEvent(string json)
         {
             if (data["dtmf"].Type == JTokenType.String)
             {
-                return JsonConvert.DeserializeObject<Input>(json, VonageSerialization.SerializerSettings);
+                return JsonConvert.DeserializeObject<MultiInput>(json, VonageSerialization.SerializerSettings);
             }
 
             return JsonConvert.DeserializeObject<MultiInput>(json, VonageSerialization.SerializerSettings);
@@ -57,7 +56,7 @@ public static EventBase ParseEvent(string json)
 
     private static EventBase DeserializeStatus(string json, JProperty statusProperty)
     {
-        var status = ((string)statusProperty.Value).ToLower();
+        var status = ((string) statusProperty.Value).ToLower();
         switch (status)
         {
             case "started":

diff --git a/Vonage/Voice/EventWebhooks/Input.cs b/Vonage/Voice/EventWebhooks/Input.cs
diff --git a/Vonage/Voice/EventWebhooks/MultiInput.cs b/Vonage/Voice/EventWebhooks/MultiInput.cs
@@ -2,17 +2,44 @@
 
 namespace Vonage.Voice.EventWebhooks;
 
-public class MultiInput : Input
+public class MultiInput : Event
 {
     /// <summary>
     /// Result of Dtmf input
     /// </summary>
     [JsonProperty("dtmf")]
-    public new DtmfResult Dtmf { get; set; }
+    public DtmfResult Dtmf { get; set; }
 
     /// <summary>
     /// Result of the speech recognition
     /// </summary>
     [JsonProperty("speech")]
     public SpeechResult Speech { get; set; }
+
+    /// <summary>
+    ///     The buttons pressed by the user
+    /// </summary>
+    /// <summary>
+    ///     Whether the input action timed out: true if it did, false if not
+    /// </summary>
+    [JsonProperty("timed_out")]
+    public bool TimedOut { get; set; }
+
+    /// <summary>
+    ///     The unique identifier for this conversation
+    /// </summary>
+    [JsonProperty("conversation_uuid")]
+    public string ConversationUuid { get; set; }
+
+    /// <summary>
+    ///     The number the call came from
+    /// </summary>
+    [JsonProperty("from")]
+    public string From { get; set; }
+
+    /// <summary>
+    ///     The number the call was made to
+    /// </summary>
+    [JsonProperty("to")]
+    public string To { get; set; }
 }