From a4cfa4409258e12b054c9ec9b607b77a4dcc5df8 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Wed, 4 Oct 2023 16:32:42 +0545
Subject: [PATCH 1/6] inital commit for adding whatsapp support

---
 src/Plivo/Resource/Message/Message.cs         |  23 +-
 .../Resource/Message/MessageInterface.cs      | 221 +++++++++++++++++-
 .../Plivo.Test/Mocks/messageGetResponse.json  |   5 +-
 .../Plivo.Test/Mocks/messageListResponse.json | 100 ++++++--
 4 files changed, 315 insertions(+), 34 deletions(-)

diff --git a/src/Plivo/Resource/Message/Message.cs b/src/Plivo/Resource/Message/Message.cs
index 74114420..dfb1f4ca 100755
--- a/src/Plivo/Resource/Message/Message.cs
+++ b/src/Plivo/Resource/Message/Message.cs
@@ -160,6 +160,24 @@ public class Message : Resource
         /// <value> DLT Template Category.</value>
         public string DltTemplateCategory { get; set; }
 
+        /// <summary>
+        /// Gets or sets the conversation id.
+        /// </summary>
+        /// <value>The conversation id.</value>
+        public string ConversationID { get; set; }
+
+        /// <summary>
+        /// Gets or sets the conversation origin.
+        /// </summary>
+        /// <value>The conversation origin.</value>
+        public string ConversationOrigin { get; set; }
+
+        /// <summary>
+        /// Gets or sets the conversation expiration timestamp.
+        /// </summary>
+        /// <value>The conversation expiration timestamp.</value>
+        public string ConversationExpirationTimestamp { get; set; }
+
         public override string ToString()
         {
             return "\n" +
@@ -188,7 +206,10 @@ public override string ToString()
                    "ReplacedSender: " + ReplacedSender + "\n" +
                    "DLTEntityID: " + DltEntityId + "\n" +
                    "DLTTemplateID: " + DltTemplateId + "\n" +
-                   "DLTTemplateCategory: " + DltTemplateCategory + "\n";
+                   "DLTTemplateCategory: " + DltTemplateCategory + "\n" +
+                   "ConversationID: " + ConversationID + "\n" +
+                   "ConversationOrigin: " + ConversationOrigin + "\n" +
+                   "ConversationExpirationTimestamp: " + ConversationExpirationTimestamp + "\n";
         }
         #region ListMedia
         /// <summary>
diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
index 321e5530..7489c509 100755
--- a/src/Plivo/Resource/Message/MessageInterface.cs
+++ b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -4,6 +4,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Plivo.Client;
+using Newtonsoft.Json;
 
 
 namespace Plivo.Resource.Message
@@ -41,16 +42,43 @@ public MessageInterface(HttpClient client) : base(client)
         /// <param name="dlt_entity_id">dlt_entity_id</param>
         /// <param name="dlt_template_id">dlt_template_id</param>
         /// <param name="dlt_template_category">dlt_template_category</param>
+        /// <param name="template">template</param>
+        /// <param name="template_json_string">template_json_string</param>
         public MessageCreateResponse Create(
             List<string> dst, string text = null, string src = null, string type = null,
             string url = null, string method = null, bool? log = null, bool? trackable = null,
             string powerpack_uuid = null, string[] media_urls = null, string[] media_ids = null,
-            string dlt_entity_id = null, string dlt_template_id = null, string dlt_template_category = null)
+            string dlt_entity_id = null, string dlt_template_id = null, string dlt_template_category = null, Template template = null, string template_json_string = null)
         {
 
             string _dst = string.Join("<", dst);
             Dictionary<string, object> data = null;
             var mandatoryParams = new List<string> { "" };
+            // Adding validations for whatsapp cases with template passed
+            if (template_json_string != null && template != null)
+            {
+                return getResponseValidation("template parameter is already set.");
+            }
+            else 
+            {
+                if (template_json_string != null)
+                {
+                    var settings = new JsonSerializerSettings{NullValueHandling = NullValueHandling.Ignore};
+                    template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
+                }
+            }
+            if (template != null && (type == null || type != "whatsapp") )
+            {
+                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+            }
+            if (template != null && ( template.Name == null || template.Name.Length == 0))
+            {
+                return getResponseValidation("template name must not be null or empty");
+            }
+            if (template != null && ( template.Language == null || template.Language.Length == 0 ))
+            {
+                return getResponseValidation("template language must not be null or empty");
+            }
             if (src != null && powerpack_uuid == null)
             {
                 data = CreateData(
@@ -69,7 +97,8 @@ public MessageCreateResponse Create(
                     media_ids,
                     dlt_entity_id,
                     dlt_template_id,
-                    dlt_template_category
+                    dlt_template_category,
+                    template
                 });
             }
             else if (powerpack_uuid != null && src == null)
@@ -130,16 +159,44 @@ public MessageCreateResponse Create(
         /// <param name="dlt_entity_id">dlt_entity_id</param>
         /// <param name="dlt_template_id">dlt_template_id</param>
         /// <param name="dlt_template_category">dlt_template_category</param>
+        /// <param name="template">template</param>
+        /// <param name="template_json_string">template_json_string</param>
         public async Task<MessageCreateResponse> CreateAsync(
             List<string> dst, string text = null, string src = null, string type = null,
             string url = null, string method = null, bool? log = null, bool? trackable = null,
             string powerpack_uuid = null, string[] media_urls = null, string[] media_ids = null,
-            string dlt_entity_id = null, string dlt_template_id = null, string dlt_template_category = null)
+            string dlt_entity_id = null, string dlt_template_id = null, string dlt_template_category = null, Template template = null, string template_json_string = null)
         {
 
             string _dst = string.Join("<", dst);
             Dictionary<string, object> data = null;
             var mandatoryParams = new List<string> { "" };
+            // Adding validations for whatsapp cases with template passed
+            // Adding validations for whatsapp cases with template passed
+            if (template_json_string != null && template != null)
+            {
+                return getResponseValidation("template parameter is already set.");
+            }
+            else 
+            {
+                if (template_json_string != null)
+                {
+                    var settings = new JsonSerializerSettings{NullValueHandling = NullValueHandling.Ignore};
+                    template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
+                }
+            }
+            if (template != null && (type == null || type != "whatsapp") )
+            {
+                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+            }
+            if (template != null && ( template.Name == null || template.Name.Length == 0))
+            {
+                return getResponseValidation("template name must not be null or empty");
+            }
+            if (template != null && ( template.Language == null || template.Language.Length == 0 ))
+            {
+                return getResponseValidation("template language must not be null or empty");
+            }
             if (src != null && powerpack_uuid == null)
             {
                 data = CreateData(
@@ -158,7 +215,8 @@ public async Task<MessageCreateResponse> CreateAsync(
                     media_ids,
                     dlt_entity_id,
                     dlt_template_id,
-                    dlt_template_category
+                    dlt_template_category,
+                    template
                 });
             }
             else if (powerpack_uuid != null && src == null)
@@ -221,16 +279,43 @@ public async Task<MessageCreateResponse> CreateAsync(
         /// <param name="dlt_entity_id">dlt_entity_id</param>
         /// <param name="dlt_template_id">dlt_template_id</param>
         /// <param name="dlt_template_category">dlt_template_category</param>
+        /// <param name="template">template</param>
+        /// <param name="template_json_string">template_json_string</param>
         public MessageCreateResponse Create(
             string dst, string text = null, string src = null, string type = null,
             string url = null, string method = null, bool? log = null, bool? trackable = null,
             string powerpack_uuid = null, string[] media_urls = null, string[] media_ids = null,
             uint? message_expiry = null, string dlt_entity_id = null, string dlt_template_id = null,
-            string dlt_template_category = null)
+            string dlt_template_category = null, Template template = null, string template_json_string = null)
         {
             string _dst = dst;
             Dictionary<string, object> data = null;
             var mandatoryParams = new List<string> { "" };
+            // Adding validations for whatsapp cases with template passed
+            if (template_json_string != null && template != null)
+            {
+                return getResponseValidation("template parameter is already set.");
+            }
+            else 
+            {
+                if (template_json_string != null)
+                {
+                    var settings = new JsonSerializerSettings{NullValueHandling = NullValueHandling.Ignore};
+                    template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
+                }
+            }
+            if (template != null && (type == null || type != "whatsapp") )
+            {
+                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+            }
+            if (template != null && ( template.Name == null || template.Name.Length == 0))
+            {
+                return getResponseValidation("template name must not be null or empty");
+            }
+            if (template != null && ( template.Language == null || template.Language.Length == 0 ))
+            {
+                return getResponseValidation("template language must not be null or empty");
+            }
             if (src != null && powerpack_uuid == null)
             {
                 data = CreateData(
@@ -250,7 +335,8 @@ public MessageCreateResponse Create(
                     message_expiry,
                     dlt_entity_id,
                     dlt_template_id,
-                    dlt_template_category
+                    dlt_template_category,
+                    template
                 });
             }
             else if (powerpack_uuid != null && src == null)
@@ -313,16 +399,44 @@ public MessageCreateResponse Create(
         /// <param name="dlt_entity_id">dlt_entity_id</param>
         /// <param name="dlt_template_id">dlt_template_id</param>
         /// <param name="dlt_template_category">dlt_template_category</param>
+        /// <param name="template">template</param>
+        /// <param name="template_json_string">template</param>
         public async Task<MessageCreateResponse> CreateAsync(
             string dst, string text = null, string src = null, string type = null,
             string url = null, string method = null, bool? log = null, bool? trackable = null,
             string powerpack_uuid = null, string[] media_urls = null, string[] media_ids = null,
             uint? message_expiry = null, string dlt_entity_id = null, string dlt_template_id = null,
-            string dlt_template_category = null)
+            string dlt_template_category = null, Template template = null, string template_json_string = null)
         {
             string _dst = dst;
             Dictionary<string, object> data = null;
             var mandatoryParams = new List<string> { "" };
+            // Adding validations for whatsapp cases with template passed
+            // Adding validations for whatsapp cases with template passed
+            if (template_json_string != null && template != null)
+            {
+                return getResponseValidation("template parameter is already set.");
+            }
+            else 
+            {
+                if (template_json_string != null)
+                {
+                    var settings = new JsonSerializerSettings{NullValueHandling = NullValueHandling.Ignore};
+                    template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
+                }
+            }
+            if (template != null && (type == null || type != "whatsapp") )
+            {
+                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+            }
+            if (template != null && ( template.Name == null || template.Name.Length == 0))
+            {
+                return getResponseValidation("template name must not be null or empty");
+            }
+            if (template != null && ( template.Language == null || template.Language.Length == 0 ))
+            {
+                return getResponseValidation("template language must not be null or empty");
+            }
             if (src != null && powerpack_uuid == null)
             {
                 data = CreateData(
@@ -342,7 +456,8 @@ public async Task<MessageCreateResponse> CreateAsync(
                     message_expiry,
                     dlt_entity_id,
                     dlt_template_id,
-                    dlt_template_category
+                    dlt_template_category,
+                    template
                 });
             }
             else if (powerpack_uuid != null && src == null)
@@ -467,6 +582,7 @@ public async Task<ListResponse<MMSMedia>> ListMediaAsync(string messageUuid)
         /// <param name="limit">Limit.</param>
         /// <param name="offset">Offset.</param>
         /// <param name="message_state">MessageState.</param>
+        /// <param name="message_type">MessageType.</param>
         /// <param name="message_direction">MessageDirection.</param>
         /// <param name="message_time__gt">MessageTimeGT.</param>
         /// <param name="message_time__gte">MessageTimeGTE.</param>
@@ -478,11 +594,14 @@ public async Task<ListResponse<MMSMedia>> ListMediaAsync(string messageUuid)
         /// <param name="destination_country_iso2">DestinationCountryIso2.</param>
         /// <param name="tendlc_campaign_id">TendlcCampaignId.</param>
         /// <param name="tendlc_registration_status">TendlcRegistrationStatus.</param>
+        /// <param name="conversation_id">ConversationID.</param>
+        /// <param name="conversation_origin">ConversationOrigin.</param>
         public MessageListResponse<Message> List(
             string subaccount = null,
             uint? limit = null,
             uint? offset = null,
             string message_state = null,
+            string message_type = null,
             string message_direction = null,
             DateTime? message_time__gt = null,
             DateTime? message_time__gte = null,
@@ -493,7 +612,9 @@ public MessageListResponse<Message> List(
             string powerpack_id = null ,
             string tendlc_campaign_id = null,
             string destination_country_iso2 = null,
-            string tendlc_registration_status = null
+            string tendlc_registration_status = null,
+            string conversation_id = null,
+            string conversation_origin = null
             )
         {
             var _message_time__gt = message_time__gt?.ToString("yyyy-MM-dd HH':'mm':'ss''") ?? null;
@@ -509,6 +630,7 @@ public MessageListResponse<Message> List(
                     limit,
                     offset,
                     message_state,
+                    message_type,
                     message_direction,
                     _message_time__gt,
                     _message_time__gte,
@@ -519,7 +641,9 @@ public MessageListResponse<Message> List(
                     powerpack_id,
                     tendlc_campaign_id,
                     destination_country_iso2,
-                    tendlc_registration_status
+                    tendlc_registration_status,
+                    conversation_id,
+                    conversation_origin
                 });
 
             return ExecuteWithExceptionUnwrap(() =>
@@ -539,6 +663,7 @@ public MessageListResponse<Message> List(
         /// <param name="limit">Limit.</param>
         /// <param name="offset">Offset.</param>
         /// <param name="message_state">MessageState.</param>
+        /// <param name="message_type">MessageType.</param>
         /// <param name="message_direction">MessageDirection.</param>
         /// <param name="message_time__gt">MessageTimeGT.</param>
         /// <param name="message_time__gte">MessageTimeGTE.</param>
@@ -550,11 +675,14 @@ public MessageListResponse<Message> List(
         /// <param name="destination_country_iso2">DestinationCountryIso2.</param>
         /// <param name="tendlc_campaign_id">TendlcCampaignID.</param>
         /// <param name="tendlc_registration_status">TendlcRegistrationStatus.</param>
+        /// <param name="conversation_id">ConversationID.</param>
+        /// <param name="conversation_origin">ConversationOrigin.</param>
         public async Task<MessageListResponse<Message>> ListAsync(
             string subaccount = null,
             uint? limit = null,
             uint? offset = null,
             string message_state = null,
+            string message_type = null,
             string message_direction = null,
             DateTime? message_time__gt = null,
             DateTime? message_time__gte = null,
@@ -565,7 +693,9 @@ public async Task<MessageListResponse<Message>> ListAsync(
             string powerpack_id = null,
             string tendlc_campaign_id = null,
             string destination_country_iso2 = null,
-            string tendlc_registration_status = null
+            string tendlc_registration_status = null,
+            string conversation_id = null,
+            string conversation_origin = null
             )
         {
             var _message_time__gt = message_time__gt?.ToString("yyyy-MM-dd HH':'mm':'ss''") ?? null;
@@ -581,6 +711,7 @@ public async Task<MessageListResponse<Message>> ListAsync(
                     limit,
                     offset,
                     message_state,
+                    message_type,
                     message_direction,
                     _message_time__gt,
                     _message_time__gte,
@@ -591,7 +722,9 @@ public async Task<MessageListResponse<Message>> ListAsync(
                     powerpack_id,
                     tendlc_campaign_id,
                     destination_country_iso2,
-                    tendlc_registration_status
+                    tendlc_registration_status,
+                    conversation_id,
+                    conversation_origin
                 });
             var resources = await ListResources<MessageListResponse<Message>>(data);
             resources.Objects.ForEach(
@@ -602,4 +735,68 @@ public async Task<MessageListResponse<Message>> ListAsync(
         }
         #endregion
     }
+
+    public class Template
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("language")]
+        public string Language { get; set; }
+
+        [JsonProperty("components")]
+        public List<Component> Components { get; set; }
+    }
+
+    public class Component
+    {
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("sub_type")]
+        public string SubType { get; set; }
+
+        [JsonProperty("index")]
+        public string Index { get; set; }
+
+        [JsonProperty("parameters")]
+        public List<Parameter> Parameters { get; set; }
+    }
+
+    public class Parameter
+    {
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("text")]
+        public string Text { get; set; }
+
+        [JsonProperty("media")]
+        public string Media { get; set; }
+
+        [JsonProperty("currency")]
+        public Currency Currency { get; set; }
+
+        [JsonProperty("date_time")]
+        public DateTimeValue DateTime { get; set; }
+    }
+
+    public class Currency
+    {
+        [JsonProperty("fallback_value")]
+        public string FallbackValue { get; set; }
+
+        [JsonProperty("currency_code")]
+        public string CurrencyCode { get; set; }
+
+        [JsonProperty("amount_1000")]
+        public int Amount1000 { get; set; }
+    }
+
+    public class DateTimeValue
+    {
+        [JsonProperty("fallback_value")]
+        public string FallbackValue { get; set; }
+    }
+
 }
diff --git a/tests/Plivo.Test/Mocks/messageGetResponse.json b/tests/Plivo.Test/Mocks/messageGetResponse.json
index 8a9c7509..899da280 100755
--- a/tests/Plivo.Test/Mocks/messageGetResponse.json
+++ b/tests/Plivo.Test/Mocks/messageGetResponse.json
@@ -14,5 +14,8 @@
   "units": 1,
   "dlt_entity_id": "1111",
   "dlt_template_id": "2222",
-  "dlt_template_category": "promotional"
+  "dlt_template_category": "promotional",
+  "conversation_id": "",
+  "conversation_origin": "",
+  "conversation_expiration_timestamp": ""
 }
diff --git a/tests/Plivo.Test/Mocks/messageListResponse.json b/tests/Plivo.Test/Mocks/messageListResponse.json
index 27f0618f..cfede378 100755
--- a/tests/Plivo.Test/Mocks/messageListResponse.json
+++ b/tests/Plivo.Test/Mocks/messageListResponse.json
@@ -23,7 +23,10 @@
       "units": 1,
       "dlt_entity_id": "3333",
       "dlt_template_id": "4444",
-      "dlt_template_category": "transactional"
+      "dlt_template_category": "transactional",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -40,7 +43,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -57,7 +63,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -74,7 +83,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -91,7 +103,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -108,7 +123,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -125,7 +143,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -142,7 +163,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -159,7 +183,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -176,7 +203,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -193,7 +223,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -210,7 +243,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -227,7 +263,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -244,7 +283,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -261,7 +303,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": null,
@@ -278,7 +323,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -295,7 +343,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -312,7 +363,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -329,7 +383,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     },
     {
       "error_code": "000",
@@ -346,7 +403,10 @@
       "units": 1,
       "dlt_entity_id": "",
       "dlt_template_id": "",
-      "dlt_template_category": ""
+      "dlt_template_category": "",
+      "conversation_id": "",
+      "conversation_origin": "",
+      "conversation_expiration_timestamp": ""
     }
   ]
 }

From 21cb09560fa7bd82d178e17e7dd51d3253ce64b2 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Fri, 6 Oct 2023 14:39:56 +0545
Subject: [PATCH 2/6] minor update

---
 .../Resource/Message/MessageInterface.cs      | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
index 7489c509..3e5e2ff5 100755
--- a/src/Plivo/Resource/Message/MessageInterface.cs
+++ b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -736,65 +736,114 @@ public async Task<MessageListResponse<Message>> ListAsync(
         #endregion
     }
 
+    // Template structure required for whatsapp messages
     public class Template
     {
+        /// <summary>
+        /// Gets or sets the name of the template.
+        /// </summary>
         [JsonProperty("name")]
         public string Name { get; set; }
 
+        /// <summary>
+        /// Gets or sets the language of the template.
+        /// </summary>
         [JsonProperty("language")]
         public string Language { get; set; }
 
+        /// <summary>
+        /// Gets or sets the list of components in the template.
+        /// </summary>
         [JsonProperty("components")]
         public List<Component> Components { get; set; }
     }
 
     public class Component
     {
+        /// <summary>
+        /// Gets or sets the type of the component.
+        /// </summary>
         [JsonProperty("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the sub-type of the component.
+        /// </summary>
         [JsonProperty("sub_type")]
         public string SubType { get; set; }
 
+        /// <summary>
+        /// Gets or sets the index of the component.
+        /// </summary>
         [JsonProperty("index")]
         public string Index { get; set; }
 
+        /// <summary>
+        /// Gets or sets the list of parameters for the component.
+        /// </summary>
         [JsonProperty("parameters")]
         public List<Parameter> Parameters { get; set; }
     }
 
     public class Parameter
     {
+        /// <summary>
+        /// Gets or sets the type of the parameter.
+        /// </summary>
         [JsonProperty("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Gets or sets the text value of the parameter.
+        /// </summary>
         [JsonProperty("text")]
         public string Text { get; set; }
 
+        /// <summary>
+        /// Gets or sets the media value of the parameter.
+        /// </summary>
         [JsonProperty("media")]
         public string Media { get; set; }
 
+        /// <summary>
+        /// Gets or sets the currency information for the parameter.
+        /// </summary>
         [JsonProperty("currency")]
         public Currency Currency { get; set; }
 
+        /// <summary>
+        /// Gets or sets the date and time value of the parameter.
+        /// </summary>
         [JsonProperty("date_time")]
         public DateTimeValue DateTime { get; set; }
     }
 
     public class Currency
     {
+        /// <summary>
+        /// Gets or sets the fallback value for the currency.
+        /// </summary>
         [JsonProperty("fallback_value")]
         public string FallbackValue { get; set; }
 
+        /// <summary>
+        /// Gets or sets the currency code for the currency.
+        /// </summary>
         [JsonProperty("currency_code")]
         public string CurrencyCode { get; set; }
 
+        /// <summary>
+        /// Gets or sets the amount in 1/1000th units for the currency.
+        /// </summary>
         [JsonProperty("amount_1000")]
         public int Amount1000 { get; set; }
     }
 
     public class DateTimeValue
     {
+        /// <summary>
+        /// Gets or sets the fallback value for the date and time.
+        /// </summary>
         [JsonProperty("fallback_value")]
         public string FallbackValue { get; set; }
     }

From e0dbbf44a4b8087d2eb0bb8fd5e9c5109235fa2b Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 10 Oct 2023 16:25:02 +0545
Subject: [PATCH 3/6] fixed missing conversation id in get and list mdr

---
 src/Plivo/Resource/Message/Message.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Plivo/Resource/Message/Message.cs b/src/Plivo/Resource/Message/Message.cs
index dfb1f4ca..dc9052df 100755
--- a/src/Plivo/Resource/Message/Message.cs
+++ b/src/Plivo/Resource/Message/Message.cs
@@ -164,7 +164,7 @@ public class Message : Resource
         /// Gets or sets the conversation id.
         /// </summary>
         /// <value>The conversation id.</value>
-        public string ConversationID { get; set; }
+        public string ConversationId { get; set; }
 
         /// <summary>
         /// Gets or sets the conversation origin.
@@ -207,7 +207,7 @@ public override string ToString()
                    "DLTEntityID: " + DltEntityId + "\n" +
                    "DLTTemplateID: " + DltTemplateId + "\n" +
                    "DLTTemplateCategory: " + DltTemplateCategory + "\n" +
-                   "ConversationID: " + ConversationID + "\n" +
+                   "ConversationID: " + ConversationId + "\n" +
                    "ConversationOrigin: " + ConversationOrigin + "\n" +
                    "ConversationExpirationTimestamp: " + ConversationExpirationTimestamp + "\n";
         }

From 37b70082f1d899106faca36911cb53973873b3a3 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 10 Oct 2023 17:18:28 +0545
Subject: [PATCH 4/6] message type validations on templated messages

---
 src/Plivo/Resource/Message/MessageInterface.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
index 3e5e2ff5..43e4ec4c 100755
--- a/src/Plivo/Resource/Message/MessageInterface.cs
+++ b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -67,9 +67,9 @@ public MessageCreateResponse Create(
                     template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
                 }
             }
-            if (template != null && (type == null || type != "whatsapp") )
+            if (template != null && type != null && type != "whatsapp")
             {
-                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+                return getResponseValidation("Template paramater is only applicable when type is whatsapp.");
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
@@ -185,9 +185,9 @@ public async Task<MessageCreateResponse> CreateAsync(
                     template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
                 }
             }
-            if (template != null && (type == null || type != "whatsapp") )
+            if (template != null && type != null && type != "whatsapp")
             {
-                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+                return getResponseValidation("Template paramater is only applicable when type is whatsapp.");
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
@@ -304,9 +304,9 @@ public MessageCreateResponse Create(
                     template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
                 }
             }
-            if (template != null && (type == null || type != "whatsapp") )
+            if (template != null && type != null && type != "whatsapp")
             {
-                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+                return getResponseValidation("Template paramater is only applicable when type is whatsapp.");
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
@@ -425,9 +425,9 @@ public async Task<MessageCreateResponse> CreateAsync(
                     template = JsonConvert.DeserializeObject<Template>(template_json_string, settings);
                 }
             }
-            if (template != null && (type == null || type != "whatsapp") )
+            if (template != null && type != null && type != "whatsapp")
             {
-                return getResponseValidation("Specify type as whatsapp in request params to send a templated message.");
+                return getResponseValidation("Template paramater is only applicable when type is whatsapp.");
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {

From ea9b2b7f16161c82b95af3a759696bd71a70cf8b Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Tue, 10 Oct 2023 17:38:34 +0545
Subject: [PATCH 5/6] updsting error message

---
 .../Resource/Message/MessageInterface.cs      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
index 43e4ec4c..fcf189d4 100755
--- a/src/Plivo/Resource/Message/MessageInterface.cs
+++ b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -73,11 +73,11 @@ public MessageCreateResponse Create(
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
-                return getResponseValidation("template name must not be null or empty");
+                return getResponseValidation("Template name must not be null or empty.");
             }
             if (template != null && ( template.Language == null || template.Language.Length == 0 ))
             {
-                return getResponseValidation("template language must not be null or empty");
+                return getResponseValidation("Template language must not be null or empty.");
             }
             if (src != null && powerpack_uuid == null)
             {
@@ -175,7 +175,7 @@ public async Task<MessageCreateResponse> CreateAsync(
             // Adding validations for whatsapp cases with template passed
             if (template_json_string != null && template != null)
             {
-                return getResponseValidation("template parameter is already set.");
+                return getResponseValidation("Template parameter is already set.");
             }
             else 
             {
@@ -191,11 +191,11 @@ public async Task<MessageCreateResponse> CreateAsync(
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
-                return getResponseValidation("template name must not be null or empty");
+                return getResponseValidation("Template name must not be null or empty.");
             }
             if (template != null && ( template.Language == null || template.Language.Length == 0 ))
             {
-                return getResponseValidation("template language must not be null or empty");
+                return getResponseValidation("Template language must not be null or empty.");
             }
             if (src != null && powerpack_uuid == null)
             {
@@ -310,11 +310,11 @@ public MessageCreateResponse Create(
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
-                return getResponseValidation("template name must not be null or empty");
+                return getResponseValidation("Template name must not be null or empty.");
             }
             if (template != null && ( template.Language == null || template.Language.Length == 0 ))
             {
-                return getResponseValidation("template language must not be null or empty");
+                return getResponseValidation("Template language must not be null or empty.");
             }
             if (src != null && powerpack_uuid == null)
             {
@@ -415,7 +415,7 @@ public async Task<MessageCreateResponse> CreateAsync(
             // Adding validations for whatsapp cases with template passed
             if (template_json_string != null && template != null)
             {
-                return getResponseValidation("template parameter is already set.");
+                return getResponseValidation("Template parameter is already set.");
             }
             else 
             {
@@ -431,11 +431,11 @@ public async Task<MessageCreateResponse> CreateAsync(
             }
             if (template != null && ( template.Name == null || template.Name.Length == 0))
             {
-                return getResponseValidation("template name must not be null or empty");
+                return getResponseValidation("Template name must not be null or empty.");
             }
             if (template != null && ( template.Language == null || template.Language.Length == 0 ))
             {
-                return getResponseValidation("template language must not be null or empty");
+                return getResponseValidation("Template language must not be null or empty.");
             }
             if (src != null && powerpack_uuid == null)
             {

From e1a6354865e902e6247b4add5396863b61eee8c2 Mon Sep 17 00:00:00 2001
From: Saurabh Newatiya <saurabh.newatiya@plivo.com>
Date: Fri, 13 Oct 2023 15:09:39 +0545
Subject: [PATCH 6/6] version bump

---
 CHANGELOG.md                                   | 5 +++++
 README.md                                      | 4 ++--
 src/Plivo/Plivo.csproj                         | 2 +-
 src/Plivo/Plivo.nuspec                         | 3 ++-
 src/Plivo/Resource/Message/MessageInterface.cs | 5 ++---
 src/Plivo/Version.cs                           | 2 +-
 version.json                                   | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdfcdfba..d76a5010 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [5.34.0](https://github.com/plivo/plivo-dotnet/tree/v5.34.0) (2023-10-13)
+**Feature - WhatsApp message support**
+- Added new params `template`, `template_json_string` and new message_type `whatsapp` to [send message API](https://www.plivo.com/docs/sms/api/message#send-a-message)
+- Added  new  `message_state` (`read`), `message_type`(`whatsapp`), `conversation_id`, `conversation_origin`, `conversation_expiration_timestamp` in [list all messages API](https://www.plivo.com/docs/sms/api/message#list-all-messages) and [get message details API](https://www.plivo.com/docs/sms/api/message#retrieve-a-message) response
+
 ## [5.33.0](https://github.com/plivo/plivo-dotnet/tree/v5.33.0) (2023-08-25)
 **Feature - Added New Param 'carrier_fees', 'carrier_fees_rate', 'destination_network' in Get Message and List Message APIs**
 - Added new params on message get and list response
diff --git a/README.md b/README.md
index cc82b07b..a4dd8946 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,13 @@ You can install this SDK either by referencing the .dll file or using NuGet.
 Use the following line to install the latest SDK using the NuGet CLI.
 
 ```
-PM> Install-Package Plivo -Version 5.33.0
+PM> Install-Package Plivo -Version 5.34.0
 ```
 
 You can also use the .NET CLI to install this package as follows
 
 ```
-> dotnet add package Plivo --version 5.33.0
+> dotnet add package Plivo --version 5.34.0
 ```
 
 ## Getting started
diff --git a/src/Plivo/Plivo.csproj b/src/Plivo/Plivo.csproj
index 2aad58d0..d6ab36f5 100644
--- a/src/Plivo/Plivo.csproj
+++ b/src/Plivo/Plivo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard1.3</TargetFrameworks>
-    <ReleaseVersion>5.33.0</ReleaseVersion>
+    <ReleaseVersion>5.34.0</ReleaseVersion>
     <Version />
     <Authors>Plivo SDKs Team</Authors>
     <Owners>Plivo Inc.</Owners>
diff --git a/src/Plivo/Plivo.nuspec b/src/Plivo/Plivo.nuspec
index 528ccdbd..53f05444 100644
--- a/src/Plivo/Plivo.nuspec
+++ b/src/Plivo/Plivo.nuspec
@@ -4,7 +4,7 @@
     <summary>A .NET SDK to make voice calls and send SMS using Plivo and to generate Plivo XML</summary>
     <description>A .NET SDK to make voice calls and send SMS using Plivo and to generate Plivo XML</description>
     <id>Plivo</id>
-    <version>5.33.0</version>
+    <version>5.34.0</version>
     <title>Plivo</title>
     <authors>Plivo SDKs Team</authors>
     <owners>Plivo, Inc.</owners>
@@ -12,6 +12,7 @@
     <projectUrl>http://github.com/plivo/plivo-dotnet</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <releaseNotes>
+      * 5.34.0 Added new params `template`, `template_json_string` and message_type `whatsapp`in send message API. Added new `message_state` (`read`), `message_type` (`whatsapp`), `conversation_id`, `conversation_origin`, `conversation_expiration_timestamp` in List Message and Get Message APIs.
       * 5.33.0 Added New Params `DestinationNetwork`, `CarrierFeesRate`, `CarrierFees`.
       * 5.32.0 Added New Params `DLTEntityID`, `DLTTemplateID`, `DLTTemplateCategory`.
       * 5.31.0 Added functionality to start, stop and fetch audio streams
diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
index fcf189d4..f6d68a54 100755
--- a/src/Plivo/Resource/Message/MessageInterface.cs
+++ b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -57,7 +57,7 @@ public MessageCreateResponse Create(
             // Adding validations for whatsapp cases with template passed
             if (template_json_string != null && template != null)
             {
-                return getResponseValidation("template parameter is already set.");
+                return getResponseValidation("Template parameter is already set.");
             }
             else 
             {
@@ -172,7 +172,6 @@ public async Task<MessageCreateResponse> CreateAsync(
             Dictionary<string, object> data = null;
             var mandatoryParams = new List<string> { "" };
             // Adding validations for whatsapp cases with template passed
-            // Adding validations for whatsapp cases with template passed
             if (template_json_string != null && template != null)
             {
                 return getResponseValidation("Template parameter is already set.");
@@ -294,7 +293,7 @@ public MessageCreateResponse Create(
             // Adding validations for whatsapp cases with template passed
             if (template_json_string != null && template != null)
             {
-                return getResponseValidation("template parameter is already set.");
+                return getResponseValidation("Template parameter is already set.");
             }
             else 
             {
diff --git a/src/Plivo/Version.cs b/src/Plivo/Version.cs
index 0d6e9fd7..81568ab7 100644
--- a/src/Plivo/Version.cs
+++ b/src/Plivo/Version.cs
@@ -10,7 +10,7 @@ public class Version
         /// <summary>
         /// DotNet SDK version
         /// </summary>
-        public const string SdkVersion = "5.33.0";
+        public const string SdkVersion = "5.34.0";
         /// <summary>
         /// Plivo API version
         /// </summary>
diff --git a/version.json b/version.json
index b89cd737..43be65cc 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.33.0",
+  "version": "5.34.0",
   "publicReleaseRefSpec": [
     "^refs/heads/master$",
     "^refs/heads/v\\d+(?:\\.\\d+)?$"