Merge pull request #19 from vbaranovskiy-plesk/master

Add permissions node to reseller's get operations

Author: sibprogrammer

src/PleskX/Api/Operator/Reseller.php

@@ -42,16 +42,39 @@ public function delete($field, $value)
      */
     public function get($field, $value)
     {
-        $items = $this->_getItems(Struct\GeneralInfo::class, 'gen-info', $field, $value);
+        $items = $this->getAll($field, $value);
         return reset($items);
     }
 
     /**
+     * @param string $field
+     * @param integer|string $value
      * @return Struct\GeneralInfo[]
      */
-    public function getAll()
+    public function getAll($field = null, $value = null)
     {
-        return $this->_getItems(Struct\GeneralInfo::class, 'gen-info');
+        $packet = $this->_client->getPacket();
+        $getTag = $packet->addChild($this->_wrapperTag)->addChild('get');
+
+        $filterTag = $getTag->addChild('filter');
+        if (!is_null($field)) {
+            $filterTag->addChild($field, $value);
+        }
+
+        $datasetTag = $getTag->addChild('dataset');
+        $datasetTag->addChild('gen-info');
+        $datasetTag->addChild('permissions');
+
+        $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
+
+        $items = [];
+        foreach ($response->xpath('//result') as $xmlResult) {
+            $item = new Struct\GeneralInfo($xmlResult->data);
+            $item->id = (int)$xmlResult->id;
+            $items[] = $item;
+        }
+
+        return $items;
     }
 
 

src/PleskX/Api/Struct/Reseller/GeneralInfo.php

@@ -5,17 +5,28 @@
 
 class GeneralInfo extends \PleskX\Api\Struct
 {
+    /** @var int */
+    public $id;
+
     /** @var string */
     public $personalName;
 
     /** @var string */
     public $login;
 
+    /** @var array */
+    public $permissions;
+
     public function __construct($apiResponse)
     {
-        $this->_initScalarProperties($apiResponse, [
+        $this->_initScalarProperties($apiResponse->{'gen-info'}, [
             ['pname' => 'personalName'],
             'login',
         ]);
+
+        $this->permissions = [];
+        foreach ($apiResponse->permissions->permission as $permissionInfo) {
+            $this->permissions[(string)$permissionInfo->name] = (string)$permissionInfo->value;
+        }
     }
-}
+}

tests/ResellerTest.php

@@ -32,6 +32,7 @@ public function testGet()
         $resellerInfo = static::$_client->reseller()->get('id', $reseller->id);
         $this->assertEquals('John Reseller', $resellerInfo->personalName);
         $this->assertEquals('reseller-unit-test', $resellerInfo->login);
+        $this->assertGreaterThan(0, count($resellerInfo->permissions));
 
         static::$_client->reseller()->delete('id', $reseller->id);
     }