Fix #376

Author: arutyunyan

src/syntax/entity/SuQLJsonService.php

@@ -4,20 +4,42 @@
 
 abstract class SuQLJsonService extends SuQLService
 {
-    public static function call($method, $params = [])
+    /**
+     * @var string вызываемый rpc метод
+     */
+    private $rpcMethod;
+    /**
+     * Создает экземляр rpc метода
+     * @param string $method
+     * @return static
+     */
+    public static function call($method)
+    {
+        $instance = new static();
+        $instance->rpcMethod = $method;
+        return $instance;
+    }
+    /**
+     * Задает параметры rpc метода
+     * @param array $params
+     * @return \suql\syntax\entity\SuQLService
+     */
+    public function withParams($params)
     {
         $body = [
             'json' => [
                 'jsonrpc' => '2.0',
-                'method' => $method,
+                'method' => $this->rpcMethod,
                 'params' => $params,
                 'id' => uniqid(),
             ],
         ];
 
         return parent::find($body);
     }
-
+    /**
+     * @inheritdoc
+     */
     protected function processContent($content)
     {
         return json_decode($content, true);

src/syntax/entity/SuQLService.php

@@ -51,6 +51,8 @@ public static function find($body = [])
     }
     /**
      * Обработка полученного из сервиса контента
+     * @param string $content
+     * @return mixed
      */
     protected function processContent($content)
     {

tests/suql/JsonServiceTest.php

@@ -3,22 +3,41 @@
 declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
+use suql\db\Container;
+use suql\syntax\Query;
+use test\suql\models\Query26;
 use test\suql\models\Query29;
 
 final class JsonServiceTest extends TestCase
 {
+    public function setUp(): void
+    {
+        // Create a database
+        Container::create(require('config/db-null.php'));
+        Query::create('create database db_test')->setConnection('connection')->exec();
+        Container::add(require('config/db.php'));
+        Query::create('create table table_26(f1 int, f2 int, primary key (f1))')->setConnection('db_test')->exec();
+        Query::create('insert into table_26 (f1, f2) values (1, 1), (2, 2), (3, 3)')->setConnection('db_test')->exec();
+    }
+
+    public function tearDown(): void
+    {
+        // Drop the database
+        Query::create('drop database db_test')->setConnection('db_test')->exec();
+    }
+
     public function testJsonService(): void
     {
-        $actual = Query29::call('generateIntegers', [
+        $actual = Query29::call('generateIntegers')->withParams([
             'apiKey' => '175082e4-b7bb-43cc-a018-df19794bcbb2',
             'n' => 3,
-            'min' => 0,
-            'max' => 9
-        ]);
+            'min' => 1,
+            'max' => 3
+        ])->join(Query26::class)->select(['f2'])->fetchOne();
         foreach ($actual as $number) {
-            $this->assertLessThanOrEqual(9, $number);
-            $this->assertGreaterThanOrEqual(0, $number);
+            $this->assertLessThan(4, $number);
+            $this->assertGreaterThan(0, $number);
         }
-        $this->assertCount(3, $actual);
+        $this->assertLessThan(4, count($actual));
     }
 }

tests/suql/models/Query29.php

@@ -3,13 +3,29 @@
 namespace test\suql\models;
 
 use suql\syntax\entity\SuQLJsonService;
+use test\suql\connections\TestMySQLConnection;
 
 # [Request(uri="https://api.random.org/json-rpc/2/invoke", method="POST")]
 class Query29 extends SuQLJsonService
 {
+    use TestMySQLConnection;
+
     protected function processContent($content)
     {
         $content = json_decode($content, true);
-        return $content['result']['random']['data'];
+        $data = $content['result']['random']['data'];
+        static::$data = [
+            ['f1' => $data[0]],
+            ['f1' => $data[1]],
+            ['f1' => $data[2]],
+        ];
+        return parent::all();
+    }
+
+    public function relations()
+    {
+        return [
+            Query26::class => ['f1' => 'f1'],
+        ];
     }
 }