Fixes bug when sending statements when opening transaction in http

fixes #49

Author: transistive

src/HttpDriver/RequestFactory.php

@@ -35,9 +35,19 @@ public function __construct(RequestFactoryInterface $factory, StreamFactoryInter
         $this->formatter = $formatter;
     }
 
-    public function openTransaction(RequestData $data): RequestInterface
+    /**
+     * @param iterable<Statement> $statements
+     *
+     * @throws JsonException
+     */
+    public function openTransaction(RequestData $data, iterable $statements): RequestInterface
     {
-        return $this->createRequest($data, 'POST');
+        $body = $this->formatter->prepareBody($statements, $data);
+
+        $request = $this->createRequest($data, 'POST');
+        $request->getBody()->write($body);
+
+        return $request;
     }
 
     public function createRequest(RequestData $data, string $method, string $body = ''): RequestInterface

src/Network/Http/HttpSession.php

@@ -66,7 +66,7 @@ public function run(iterable $statements): Vector
      */
     public function openTransaction(iterable $statements = null): TransactionInterface
     {
-        $request = $this->factory->openTransaction($this->data);
+        $request = $this->factory->openTransaction($this->data, $statements ?? []);
         $response = $this->client->sendRequest($request);
         /** @var array{commit: string} $data */
         $data = $this->interpretResponse($response);

tests/Integration/HttpConsistencyTest.php

@@ -7,6 +7,8 @@
 
 use Laudis\Neo4j\ClientBuilder;
 use Laudis\Neo4j\Contracts\ClientInterface;
+use Laudis\Neo4j\Databags\Statement;
+use Laudis\Neo4j\Network\Bolt\BoltInjections;
 use PHPUnit\Framework\TestCase;
 
 final class HttpConsistencyTest extends TestCase
@@ -17,19 +19,52 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->client = ClientBuilder::create()
-            ->addHttpConnection('default', 'http://neo4j:test@neo4j')
-            ->setDefaultConnection('default')
+            ->addHttpConnection('http', 'http://neo4j:test@neo4j')
+            ->addBoltConnection('bolt', 'bolt://neo4j:test@neo4j')
+            ->addBoltConnection('neo4j', 'bolt://neo4j:test@neo4j', BoltInjections::create()->withAutoRouting(true))
             ->build();
+
+        $this->client->run('MATCH (x) DETACH DELETE x');
     }
 
-    public function testConsistency(): void
+    /**
+     * @dataProvider aliases
+     */
+    public function testConsistency(string $alias): void
     {
-        $res = $this->client->run('MERGE (n:zzz {name: "bbbb"}) RETURN n');
+        $res = $this->client->run('MERGE (n:zzz {name: "bbbb"}) RETURN n', [], $alias);
         self::assertEquals(1, $res->count());
         self::assertEquals(['name' => 'bbbb'], $res->first()->get('n'));
 
-        $res = $this->client->run('MATCH (n:zzz {name: $name}) RETURN n', ['name' => 'bbbb']);
+        $res = $this->client->run('MATCH (n:zzz {name: $name}) RETURN n', ['name' => 'bbbb'], $alias);
         self::assertEquals(1, $res->count());
         self::assertEquals(['name' => 'bbbb'], $res->first()->get('n'));
     }
+
+    /**
+     * @dataProvider aliases
+     */
+    public function testConsistencyTransaction(string $alias): void
+    {
+        $tsx = $this->client->openTransaction([
+            Statement::create('CREATE (n:aaa) SET n.name="aaa" return n')
+        ], $alias);
+
+        $tsx->commit([Statement::create('CREATE (n:bbb) SET n.name="bbb" return n')]);
+
+        $results = $this->client->run('MATCH (n) RETURN n', ['name' => 'bbbb'], $alias);
+
+        self::assertEquals(2, $results->count());
+        self::assertEquals(['name' => 'aaa'], $results->first()->get('n'));
+        self::assertEquals(['name' => 'bbb'], $results->last()->get('n'));
+    }
+
+    public function aliases(): array
+    {
+        return [
+            ['http'],
+            ['bolt'],
+            ['neo4j']
+        ];
+    }
 }