Merge pull request #65 from nixonsam/fix_subaccount_create_response

Fix subaccount create response
plivo · Jul 5, 2018 · 51a29ca · 51a29ca
2 parents 96bc753 + 6de145e
commit 51a29ca
Show file tree

Hide file tree

Showing 22 changed files with 132 additions and 59 deletions.
diff --git a/src/Plivo/Resources/Account/AccountInterface.php b/src/Plivo/Resources/Account/AccountInterface.php
@@ -74,6 +74,9 @@ public function update($name, $city, $address) {
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']
+            );
     }
 }
diff --git a/src/Plivo/Resources/Application/ApplicationCreateResponse.php b/src/Plivo/Resources/Application/ApplicationCreateResponse.php
@@ -22,9 +22,9 @@ class ApplicationCreateResponse extends ResponseUpdate
      * @param $message
      * @param $appId
      */
-    public function __construct($message, $appId)
+    public function __construct($apiId, $appId, $message)
     {
-        parent::__construct($message);
+        parent::__construct($apiId, $message);
         $this->appId = $appId;
     }
 

diff --git a/src/Plivo/Resources/Application/ApplicationInterface.php b/src/Plivo/Resources/Application/ApplicationInterface.php
@@ -69,9 +69,8 @@ public function create(
 
         return new ApplicationCreateResponse(
             $responseContents['api_id'],
-            $responseContents['message'],
-            $responseContents['app_id']
-        );
+            $responseContents['app_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -105,7 +104,9 @@ public function update($appId, array $optionalArgs = [])
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
-            $responseContents['message']);
+            $responseContents['api_id'],
+            $responseContents['message']
+        );
     }
 
     /**

diff --git a/src/Plivo/Resources/Call/CallCreateResponse.php b/src/Plivo/Resources/Call/CallCreateResponse.php
@@ -18,9 +18,9 @@ class CallCreateResponse extends ResponseUpdate
      * @param $message
      * @param $requestUuid
      */
-    public function __construct($message, $requestUuid)
+    public function __construct($apiId, $message, $requestUuid )
     {
-        parent::__construct($message);
+        parent::__construct($apiId, $message);
         $this->requestUuid = $requestUuid;
     }
 

diff --git a/src/Plivo/Resources/Call/CallInterface.php b/src/Plivo/Resources/Call/CallInterface.php
@@ -95,8 +95,10 @@ public function create($from, array $to, $answerUrl, $answerMethod,
         $responseContents = $response->getContent();
 
         return new CallCreateResponse(
+            $responseContents['api_id'],
             $responseContents['message'],
-            $responseContents['request_uuid']);
+            $responseContents['request_uuid']
+        );
     }
 
     /**
@@ -301,7 +303,9 @@ public function transfer($liveCallUuid, array $optionalArgs = [])
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
-            $responseContents['message']);
+            $responseContents['api_id'],
+            $responseContents['message']
+        );
     }
 
     /**
@@ -378,9 +382,11 @@ public function startRecording($liveCallUuid, array $optionalArgs = [])
         $responseContents = $response->getContent();
 
         return new CallRecording(
-            $responseContents['message'],
             $responseContents['url'],
-            $responseContents['recording_id']);
+            $responseContents['api_id'],
+            $responseContents['recording_id'],
+            $responseContents['message']
+        );
     }
 
     /**
@@ -460,7 +466,9 @@ public function startPlaying($liveCallUuid, array $urls, array $optionalArgs = [
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
-            $responseContents['message']);
+            $responseContents['api_id'],
+            $responseContents['message']
+        );
     }
 
     /**
@@ -536,7 +544,9 @@ public function startSpeaking($liveCallUuid, $text, array $optionalArgs = [])
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
-            $responseContents['message']);
+            $responseContents['api_id'],
+            $responseContents['message']
+        );
     }
 
     /**
@@ -590,7 +600,9 @@ public function dtmf($liveCallUuid, $digits, $leg = null)
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
-            $responseContents['message']);
+            $responseContents['api_id'],
+            $responseContents['message']
+        );
     }
 
     /**

diff --git a/src/Plivo/Resources/Call/CallRecording.php b/src/Plivo/Resources/Call/CallRecording.php
@@ -20,11 +20,21 @@ class CallRecording extends ResponseUpdate
      * @param string $url
      * @param string $recordingId
      */
-    public function __construct($message, $url, $recordingId)
+    public function __construct($url, $apiID, $recordingId, $message)
     {
-        parent::__construct($message);
+        parent::__construct($apiID, $message);
 
         $this->url = $url;
         $this->recordingId = $recordingId;
     }
+
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    public function getRecordingId()
+    {
+        return $this->recordingId;
+    }
 }
diff --git a/src/Plivo/Resources/Conference/ConferenceInterface.php b/src/Plivo/Resources/Conference/ConferenceInterface.php
@@ -142,7 +142,9 @@ public function kickMember($conferenceName, $memberId)
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -163,7 +165,9 @@ public function muteMember($conferenceName, array $memberId)
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -204,7 +208,9 @@ public function startPlaying($conferenceName, array $memberId, $url)
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -249,7 +255,9 @@ public function startSpeaking($conferenceName, array $memberId, $text, array $op
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -289,7 +297,9 @@ public function makeDeaf($conferenceName, array $memberId)
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -346,9 +356,11 @@ public function startRecording($conferenceName, $optionalArgs = [])
         $responseContents = $response->getContent();
 
         return new ConferenceRecording(
+            $responseContents['api_id'],
             $responseContents['message'],
-            $responseContents['url'],
-            $responseContents['recording_id']);
+            $responseContents['recording_id'],
+            $responseContents['url']
+            );
     }
 
     /**

diff --git a/src/Plivo/Resources/Conference/ConferenceRecording.php b/src/Plivo/Resources/Conference/ConferenceRecording.php
@@ -26,9 +26,9 @@ class ConferenceRecording extends ResponseUpdate
      * @param $url
      * @param $recordingId
      */
-    public function __construct($message, $url, $recordingId)
+    public function __construct($apiId, $message, $recordingId, $url)
     {
-        parent::__construct($message);
+        parent::__construct($apiId, $message);
 
         $this->url = $url;
         $this->recordingId = $recordingId;

diff --git a/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php b/src/Plivo/Resources/Endpoint/EndpointCreateReponse.php
@@ -31,9 +31,9 @@ class EndpointCreateReponse extends ResponseUpdate
      * @param string $alias
      * @param string $endpointId
      */
-    public function __construct($message, $username, $alias, $endpointId)
+    public function __construct($username, $alias, $message, $endpointId, $apiID)
     {
-        parent::__construct($message);
+        parent::__construct($apiID, $message);
         $this->username = $username;
         $this->alias = $alias;
         $this->endpointId = $endpointId;

diff --git a/src/Plivo/Resources/Endpoint/EndpointInterface.php b/src/Plivo/Resources/Endpoint/EndpointInterface.php
@@ -65,10 +65,11 @@ public function create($username, $password, $alias, $appId = null)
         $responseContents = $response->getContent();
 
         return new EndpointCreateReponse(
-            $responseContents['message'],
             $responseContents['username'],
             $responseContents['alias'],
-            $responseContents['endpoint_id']);
+            $responseContents['message'],
+            $responseContents['endpoint_id'],
+            $responseContents['api_id']);
     }
 
     /**
@@ -140,7 +141,9 @@ public function update($endpointId, array $optionalArgs = [])
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**

diff --git a/src/Plivo/Resources/Message/MessageCreateResponse.php b/src/Plivo/Resources/Message/MessageCreateResponse.php
@@ -18,9 +18,9 @@ class MessageCreateResponse extends ResponseUpdate
      * @param $message
      * @param array $messageUuid
      */
-    public function __construct($message, array $messageUuid)
+    public function __construct($message, array $messageUuid, $apiId)
     {
-        parent::__construct($message);
+        parent::__construct($apiId, $message);
         $this->messageUuid = $messageUuid;
     }
 

diff --git a/src/Plivo/Resources/Message/MessageInterface.php b/src/Plivo/Resources/Message/MessageInterface.php
@@ -164,7 +164,9 @@ public function create($src, array $dst, $text,
 
         return new MessageCreateResponse(
             $responseContents['message'],
-            $responseContents['message_uuid']);
+            $responseContents['message_uuid'],
+            $responseContents['api_id']
+        );
     }
 
 }
diff --git a/src/Plivo/Resources/Number/NumberInterface.php b/src/Plivo/Resources/Number/NumberInterface.php
@@ -114,7 +114,9 @@ public function update($number, $optionalArgs = [])
 
         $responseContents = $response->getContent();
 
-        return new ResponseUpdate($responseContents['message']);
+        return new ResponseUpdate(
+            $responseContents['api_id'],
+            $responseContents['message']);
     }
 
     /**
@@ -170,6 +172,7 @@ public function addNumber(
         $responseContents = $response->getContent();
 
         return new ResponseUpdate(
+            $responseContents['api_id'],
             $responseContents['message']);
     }
 }
diff --git a/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php b/src/Plivo/Resources/PhoneNumber/PhoneNumberBuyResponse.php
@@ -22,9 +22,9 @@ class PhoneNumberBuyResponse extends ResponseUpdate
      * @param $numberStatus
      * @param $status
      */
-    public function __construct($message, $number, $numberStatus, $status)
+    public function __construct($apiID, $message, $number, $numberStatus, $status)
     {
-        parent::__construct($message);
+        parent::__construct($apiID, $message);
 
         $this->number = $number;
         $this->numberStatus = $numberStatus;

diff --git a/src/Plivo/Resources/PhoneNumber/PhoneNumberInterface.php b/src/Plivo/Resources/PhoneNumber/PhoneNumberInterface.php
@@ -87,6 +87,7 @@ public function buy($phoneNumber, $appId = null)
         $responseContents = $response->getContent();
 
         return new PhoneNumberBuyResponse(
+            $responseContents['api_id'],
             $responseContents['message'],
             $responseContents['numbers'][0]['number'],
             $responseContents['numbers'][0]['status'],

diff --git a/src/Plivo/Resources/ResponseUpdate.php b/src/Plivo/Resources/ResponseUpdate.php
@@ -2,10 +2,8 @@
 
 namespace Plivo\Resources;
 
-
 use Plivo\Exceptions\PlivoRestException;
 
-
 /**
  * Class ResponseUpdate
  * @package Plivo\Resources
@@ -15,15 +13,21 @@ class ResponseUpdate
     /**
      * @var
      */
-    private $_message;
+    public $_message;
+
+    /**
+     * @var
+     */
+    public $apiId;
 
     /**
      * ResponseUpdate constructor.
      * @param $message
      */
-    public function __construct($message)
+    public function __construct($apiId, $message)
     {
         $this->_message = $message;
+        $this->apiId = $apiId;
     }
 
     /**
@@ -40,15 +44,19 @@ function __get($name)
 
         throw new PlivoRestException('Unknown Response property ' . $name);
     }
-
+    /**
+     * Get the API ID
+     * @return mixed
+     */
+    public function getApiId()
+    {
+        return $this->apiId;
+    }
     /**
      * @return mixed
      */
     public function getMessage()
     {
         return $this->_message;
     }
-
-
-
 }