wip test_tx_run of testkit

Author: p123-stack

src/Common/ResponseHelper.php

@@ -13,14 +13,17 @@
 
 namespace Laudis\Neo4j\TestkitBackend\Handlers;
 
+use Exception;
 use Laudis\Neo4j\Contracts\SessionInterface;
 use Laudis\Neo4j\Contracts\TransactionInterface;
 use Laudis\Neo4j\Databags\SummarizedResult;
 use Laudis\Neo4j\Databags\TransactionConfiguration;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Exception\TransactionException;
 use Laudis\Neo4j\TestkitBackend\Contracts\RequestHandlerInterface;
 use Laudis\Neo4j\TestkitBackend\MainRepository;
 use Laudis\Neo4j\TestkitBackend\Requests\SessionRunRequest;
+use Laudis\Neo4j\TestkitBackend\Requests\TransactionRunRequest;
 use Laudis\Neo4j\TestkitBackend\Responses\DriverErrorResponse;
 use Laudis\Neo4j\TestkitBackend\Responses\ResultResponse;
 use Laudis\Neo4j\Types\AbstractCypherObject;
@@ -47,7 +50,7 @@ public function __construct(MainRepository $repository, LoggerInterface $logger)
         $this->logger = $logger;
     }
 
-    public function handle($request): ResultResponse
+    public function handle($request): ResultResponse|DriverErrorResponse
     {
         $session = $this->getRunner($request);
         $id = Uuid::v4();
@@ -77,16 +80,24 @@ public function handle($request): ResultResponse
 
             $this->repository->addRecords($id, $result);
 
-            return new ResultResponse($id, $result->isEmpty() ? [] : $result->first()->keys());
+            return new ResultResponse($id, $result->keys());
         } catch (Neo4jException $exception) {
-            $this->logger->debug($exception->__toString());
-            $this->repository->addRecords($id, new DriverErrorResponse(
-                $this->getId($request),
-                $exception
-            ));
-
-            return new ResultResponse($id, []);
-        } // NOTE: all other exceptions will be caught in the Backend
+            if ($request instanceof SessionRunRequest) {
+                return new DriverErrorResponse($request->getSessionId(), $exception);
+            }
+            if ($request instanceof TransactionRunRequest) {
+                return new DriverErrorResponse($request->getTxId(), $exception);
+            }
+
+            throw new Exception('Unhandled neo4j exception for run request of type: '.get_class($request));
+        } catch (TransactionException $exception) {
+            if ($request instanceof TransactionRunRequest) {
+                return new DriverErrorResponse($request->getTxId(), $exception);
+            }
+
+            throw new Exception('Unhandled neo4j exception for run request of type: '.get_class($request));
+        }
+        // NOTE: all other exceptions will be caught in the Backend
     }
 
     /**

src/Exception/ClientException.php renamed to src/Exception/TransactionException.php

@@ -21,6 +21,9 @@
 use Laudis\Neo4j\TestkitBackend\Requests\SessionBeginTransactionRequest;
 use Laudis\Neo4j\TestkitBackend\Responses\DriverErrorResponse;
 use Laudis\Neo4j\TestkitBackend\Responses\TransactionResponse;
+use Laudis\Neo4j\Types\AbstractCypherObject;
+use Laudis\Neo4j\Types\CypherList;
+use Laudis\Neo4j\Types\CypherMap;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Uid\Uuid;
 
@@ -52,7 +55,14 @@ public function handle($request): TestkitResponseInterface
         }
 
         if ($request->getTxMeta()) {
-            $config = $config->withMetaData($request->getTxMeta());
+            $metaData = $request->getTxMeta();
+            $actualMeta = [];
+            if ($metaData !== null) {
+                foreach ($metaData as $key => $meta) {
+                    $actualMeta[$key] = $this->decodeToValue($meta);
+                }
+            }
+            $config = $config->withMetaData($actualMeta);
         }
 
         // TODO - Create beginReadTransaction and beginWriteTransaction
@@ -70,4 +80,45 @@ public function handle($request): TestkitResponseInterface
 
         return new TransactionResponse($id);
     }
+
+    /**
+     * @param array{name: string, data: array{value: iterable|scalar|null}} $param
+     *
+     * @return scalar|AbstractCypherObject|iterable|null
+     */
+    private function decodeToValue(array $param)
+    {
+        $value = $param['data']['value'];
+        if (is_iterable($value)) {
+            if ($param['name'] === 'CypherMap') {
+                /** @psalm-suppress MixedArgumentTypeCoercion */
+                $map = [];
+                /**
+                 * @var numeric $k
+                 * @var mixed   $v
+                 */
+                foreach ($value as $k => $v) {
+                    /** @psalm-suppress MixedArgument */
+                    $map[(string) $k] = $this->decodeToValue($v);
+                }
+
+                return new CypherMap($map);
+            }
+
+            if ($param['name'] === 'CypherList') {
+                $list = [];
+                /**
+                 * @var mixed $v
+                 */
+                foreach ($value as $v) {
+                    /** @psalm-suppress MixedArgument */
+                    $list[] = $this->decodeToValue($v);
+                }
+
+                return new CypherList($list);
+            }
+        }
+
+        return $value;
+    }
 }

testkit-backend/bookmarkHolder

@@ -15,13 +15,15 @@
 
 use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Exception\TransactionException;
 use Laudis\Neo4j\TestkitBackend\Contracts\RequestHandlerInterface;
 use Laudis\Neo4j\TestkitBackend\Contracts\TestkitResponseInterface;
 use Laudis\Neo4j\TestkitBackend\MainRepository;
 use Laudis\Neo4j\TestkitBackend\Requests\TransactionCommitRequest;
 use Laudis\Neo4j\TestkitBackend\Responses\BackendErrorResponse;
 use Laudis\Neo4j\TestkitBackend\Responses\DriverErrorResponse;
 use Laudis\Neo4j\TestkitBackend\Responses\TransactionResponse;
+use Throwable;
 
 /**
  * @implements RequestHandlerInterface<TransactionCommitRequest>
@@ -48,7 +50,7 @@ public function handle($request): TestkitResponseInterface
 
         try {
             $tsx->commit();
-        } catch (Neo4jException $e) {
+        } catch (Neo4jException|TransactionException $e) {
             return new DriverErrorResponse($request->getTxId(), $e);
         }
 

testkit-backend/bookmarkHolder,

@@ -15,6 +15,7 @@
 
 use Laudis\Neo4j\Contracts\TransactionInterface;
 use Laudis\Neo4j\Exception\Neo4jException;
+use Laudis\Neo4j\Exception\TransactionException;
 use Laudis\Neo4j\TestkitBackend\Contracts\RequestHandlerInterface;
 use Laudis\Neo4j\TestkitBackend\Contracts\TestkitResponseInterface;
 use Laudis\Neo4j\TestkitBackend\MainRepository;
@@ -48,7 +49,7 @@ public function handle($request): TestkitResponseInterface
 
         try {
             $tsx->rollback();
-        } catch (Neo4jException $e) {
+        } catch (Neo4jException|TransactionException $e) {
             return new DriverErrorResponse($request->getTxId(), $e);
         }