dispatch events from a Transaction

Author: ikwattro

src/Client.php

@@ -167,7 +167,7 @@ public function transaction($connectionAlias = null)
         $connection = $this->connectionManager->getConnection($connectionAlias);
         $driverTransaction = $connection->getTransaction();
 
-        return new Transaction($driverTransaction);
+        return new Transaction($driverTransaction, $this->eventDispatcher);
     }
 
     /**

src/Connection/Connection.php

@@ -110,7 +110,8 @@ public function run($statement, $parameters = null, $tag = null)
         $parameters = (array) $parameters;
 
         try {
-            return $this->session->run($statement, $parameters, $tag);
+            $result = $this->session->run($statement, $parameters, $tag);
+            return $result;
         } catch (MessageFailureException $e) {
             $exception = new Neo4jException($e->getMessage());
             $exception->setNeo4jStatusCode($e->getStatusCode());

src/Transaction/Transaction.php

@@ -13,7 +13,12 @@
 
 use GraphAware\Common\Cypher\Statement;
 use GraphAware\Common\Transaction\TransactionInterface;
+use GraphAware\Neo4j\Client\Event\PostRunEvent;
+use GraphAware\Neo4j\Client\Event\PreRunEvent;
+use GraphAware\Neo4j\Client\Neo4jClientEvents;
+use GraphAware\Neo4j\Client\Result\ResultCollection;
 use GraphAware\Neo4j\Client\StackInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Transaction
 {
@@ -27,12 +32,19 @@ class Transaction
      */
     protected $queue = [];
 
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
+
     /**
      * @param TransactionInterface $driverTransaction
+     * @param EventDispatcherInterface $eventDispatcher
      */
-    public function __construct(TransactionInterface $driverTransaction)
+    public function __construct(TransactionInterface $driverTransaction, EventDispatcherInterface $eventDispatcher)
     {
         $this->driverTransaction = $driverTransaction;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -59,8 +71,12 @@ public function run($statement, array $parameters = [], $tag = null)
         if (!$this->driverTransaction->isOpen() && !in_array($this->driverTransaction->status(), ['COMMITED', 'ROLLED_BACK'], true)) {
             $this->driverTransaction->begin();
         }
+        $statement = Statement::create($statement, $parameters, $tag);
+        $this->eventDispatcher->dispatch(Neo4jClientEvents::NEO4J_PRE_RUN, new PreRunEvent([$statement]));
+        $result = $this->driverTransaction->run(Statement::create($statement, $parameters, $tag));
+        $this->eventDispatcher->dispatch(Neo4jClientEvents::NEO4J_POST_RUN, new PostRunEvent(ResultCollection::withResult($result)));
 
-        return $this->driverTransaction->run(Statement::create($statement, $parameters, $tag));
+        return $result;
     }
 
     /**
@@ -90,7 +106,11 @@ public function runStack(StackInterface $stack)
             $sts[] = $statement;
         }
 
-        return $this->driverTransaction->runMultiple($sts);
+        $this->eventDispatcher->dispatch(Neo4jClientEvents::NEO4J_PRE_RUN, new PreRunEvent($stack->statements()));
+        $results = $this->driverTransaction->runMultiple($sts);
+        $this->eventDispatcher->dispatch(Neo4jClientEvents::NEO4J_POST_RUN, new PostRunEvent($results));
+
+        return $results;
     }
 
     public function begin()

tests/Integration/StatisticsIntegrationTest.php

@@ -10,6 +10,7 @@
  */
 
 namespace GraphAware\Neo4j\Client\Tests\Integration;
+use GraphAware\Common\Result\StatementStatisticsInterface;
 
 /**
  * Class StatisticsIntegrationTest.
@@ -52,4 +53,19 @@ public function testRelationshipsDeletedWithHttp()
 
         $this->assertEquals(1, $result->summarize()->updateStatistics()->relationshipsDeleted());
     }
+
+    /**
+     * @group bolt-stats
+     */
+    public function testNodesCreatedWithBolt()
+    {
+        $this->emptyDb();
+        $result = $this->client->run('MATCH (n) RETURN count(n)', [], null, 'bolt');
+        $this->assertInstanceOf(StatementStatisticsInterface::class, $result->summarize()->updateStatistics());
+
+        $tx = $this->client->transaction('bolt');
+        $result = $tx->run('MATCH (n) RETURN count(n)');
+        $tx->commit();
+        $this->assertInstanceOf(StatementStatisticsInterface::class, $result->summarize()->updateStatistics());
+    }
 }