Merge pull request #72 from plivo/trackable_message_option

optional trackable field added
plivo · Oct 1, 2018 · 23ae79f · 23ae79f
2 parents e5eb852 + 627477f
commit 23ae79f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 9 deletions.
diff --git a/src/Plivo/Resource/Message/MessageInterface.cs b/src/Plivo/Resource/Message/MessageInterface.cs
@@ -32,13 +32,18 @@ public MessageInterface(HttpClient client) : base(client)
         /// <param name="url">URL.</param>
         /// <param name="method">Method.</param>
         /// <param name="log">Log.</param>
+        /// <param name="trackable">trackable.</param>
+        /// <param name="powerpackUUID">powerpackUUID</param>
         public MessageCreateResponse Create(
-            string src, List<string> dst, string text, string type = null,
-            string url = null, string method = null, bool? log = null)
+            List<string> dst, string text, string src = null, string type = null,
+            string url = null, string method = null, bool? log = null, bool? trackable = null, string powerpack_uuid = null)
         {
+
             string _dst = string.Join("<", dst);
+            var data = (dynamic)null; 
             var mandatoryParams = new List<string> {""};
-            var data = CreateData(
+            if (src != null && powerpack_uuid == null){
+                data = CreateData(
                 mandatoryParams,
                 new
                 {
@@ -48,11 +53,47 @@ public MessageCreateResponse Create(
                     type,
                     url,
                     method,
-                    log
+                    log,
+                    trackable
+                });
+            } else if (powerpack_uuid != null && src == null){
+                data = CreateData(
+                mandatoryParams,
+                new
+                {
+                    powerpack_uuid,
+                    _dst,
+                    text,
+                    type,
+                    url,
+                    method,
+                    log,
+                    trackable
                 });
+
+
+            } else if ( src != null && powerpack_uuid != null){
+                return getResponseValidation ("Both powerpack_uuid and src cannot be specified. Specify either powerpack_uuid or src in request params to send a message.") ;
+            } else if (src == null && powerpack_uuid == null){
+                return getResponseValidation("Specify either powerpack_uuid or src in request params to send a message.");
+            }
             return Client.Update<MessageCreateResponse>(Uri, data).Object;
         }
 
+          /// <summary>
+        /// validation for src and powerpack id and return the repsonse.
+        /// </summary>
+        /// <returns>The get.</returns>
+        /// <param name="errormessagetext">errormessagetext</param>
+        private MessageCreateResponse getResponseValidation(string errorMessageText){
+
+                MessageCreateResponse notValidResponse = new MessageCreateResponse();
+                notValidResponse.ApiId = null;
+                notValidResponse.Message = errorMessageText;
+                notValidResponse.MessageUuid = new List<string>();
+                return notValidResponse;
+        }
+
         /// <summary>
         /// Get Message with the specified messageUuid.
         /// </summary>
@@ -123,4 +164,4 @@ public ListResponse<Message> List(
             return resources;
         }
     }
-}
+}
diff --git a/tests/Plivo.Test/Resources/TestMessage.cs b/tests/Plivo.Test/Resources/TestMessage.cs
@@ -38,8 +38,8 @@ public void TestMessageCreate()
             Assert.IsEmpty(
                 ComparisonUtilities.Compare(
                     response,
-                    Api.Message.Create("+919999999999", new List<string>() {"+919898989898", "+919090909090"},
-                        "textext")));
+                    Api.Message.Create( new List<string>() {"+919898989898", "+919090909090"},
+                        "textext", "+919999999999")));
             AssertRequest(request);
         }
 

diff --git a/tests_netcore/Plivo.NetCore.Test/Resources/TestMessage.cs b/tests_netcore/Plivo.NetCore.Test/Resources/TestMessage.cs
@@ -37,8 +37,8 @@ public void TestMessageCreate()
             Assert.Empty(
                 ComparisonUtilities.Compare(
                     response,
-                    Api.Message.Create("+919999999999", new List<string>() {"+919898989898", "+919090909090"},
-                        "textext")));
+                    Api.Message.Create(src:"+919999999999", dst:new List<string>() {"+919898989898", "+919090909090"},
+                       text:"textext")));
             AssertRequest(request);
         }