Transaction query run returned in Resultset format

Author: p123-stack

src/Transaction.php

@@ -5,72 +5,75 @@
 use GuzzleHttp\Client;
 use Neo4j\QueryAPI\Exception\Neo4jException;
 use Neo4j\QueryAPI\Results\ResultRow;
+use Neo4j\QueryAPI\Results\ResultSet;
 use Psr\Http\Client\ClientInterface;
-use Psr\Http\Client\RequestExceptionInterface;
 use stdClass;
 
 class Transaction
 {
-
-    public function __construct(private ClientInterface $client, private string $clusterAffinity, private string $transactionId)
-    {
+    public function __construct(
+        private ClientInterface $client,
+        private string $clusterAffinity,
+        private string $transactionId
+    ) {
     }
 
     /**
-     * Create a node in Neo4j with a specified label and properties.
+     * Execute a Cypher query within the transaction.
      *
      * @param string $query The Cypher query to be executed.
-     * @param $parameters
-     * @return array The response data from Neo4j.
+     * @param array $parameters Parameters for the query.
+     * @return ResultSet The result rows in ResultSet format.
+     * @throws Neo4jException If the response structure is invalid.
      */
-    public function run(string $query, array $parameters): array
+    public function run(string $query, array $parameters): ResultSet
     {
-            // Execute the request to the Neo4j server
-            $response = $this->client->post("/db/neo4j/query/v2/tx", [
-                'headers' => [
-                    'neo4j-cluster-affinity' => $this->clusterAffinity,
-                ],
-                'json' => [
+        $response = $this->client->post("/db/neo4j/query/v2/tx/{$this->transactionId}", [
+            'headers' => [
+                'neo4j-cluster-affinity' => $this->clusterAffinity,
+            ],
+            'json' => [
+                'statement' => $query,
+                'parameters' => empty($parameters) ? new stdClass() : $parameters,
+            ],
+        ]);
 
-                            'statement' => $query,
-                            'parameters' => empty($parameters) ? new stdClass() : $parameters, // Pass the parameters array here
+        $responseBody = $response->getBody()->getContents();
+        $data = json_decode($responseBody, true);
 
-                ],
+        if (!isset($data['data']['fields'], $data['data']['values'])) {
+            throw new Neo4jException([
+                'message' => 'Unexpected response structure from Neo4j',
+                'response' => $data,
             ]);
-
-            // Decode the response body
-            $data = json_decode($response->getBody()->getContents(), true);
-
-            // Initialize the OGM (Object Graph Mapping) class
-            $ogm = new OGM();
-
-            // Extract keys (field names) and values (actual data)
-            $keys = $data['results'][0]['columns'];
-            $values = $data['results'][0]['data'];
-
-            // Process each row of the result and map them using OGM
-            $rows = array_map(function ($resultRow) use ($ogm, $keys) {
-                $data = [];
-                foreach ($keys as $index => $key) {
-                    $fieldData = $resultRow['row'][$index] ?? null;
-                    $data[$key] = $ogm->map($fieldData); // Map the field data to the appropriate object format
-                }
-                return new ResultRow($data); // Wrap the mapped data in a ResultRow object
-            }, $values);
-
-            return $rows; // Return the processed rows as an array of ResultRow objects
-
-
+        }
+
+        $keys = $data['data']['fields'];
+        $values = $data['data']['values'];
+
+        if (empty($values)) {
+            return new ResultSet([]);
+        }
+
+        $ogm = new OGM();
+        $rows = array_map(function ($resultRow) use ($ogm, $keys) {
+            $data = [];
+            foreach ($keys as $index => $key) {
+                $fieldData = $resultRow[$index] ?? null;
+                $data[$key] = $ogm->map($fieldData);
+            }
+            return new ResultRow($data);
+        }, $values);
+
+        return new ResultSet($rows);
     }
 
-
-
     public function commit(): void
     {
         $this->client->post("/db/neo4j/query/v2/tx/{$this->transactionId}/commit", [
             'headers' => [
                 'neo4j-cluster-affinity' => $this->clusterAffinity,
-            ]
+            ],
         ]);
     }
 
@@ -79,7 +82,7 @@ public function rollback(): void
         $this->client->delete("/db/neo4j/query/v2/tx/{$this->transactionId}", [
             'headers' => [
                 'neo4j-cluster-affinity' => $this->clusterAffinity,
-            ]
+            ],
         ]);
     }
 }

src/query-api-test.php

@@ -5,15 +5,12 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-
-// Login to the Neo4j instance
 $api = Transaction::login(
     'https://bb79fe35.databases.neo4j.io',
     'neo4j',
     'OXDRMgdWFKMcBRCBrIwXnKkwLgDlmFxipnywT6t_AK0'
 );
 
-// Run a query to fetch results
 $query = 'MATCH (n:Person) RETURN n.name LIMIT 10';
 $results = $api->run($query, []);
 

src/run_neo4j_query.php

@@ -4,7 +4,6 @@
 
 use Neo4j\QueryAPI\Neo4jQueryAPI;
 
-
 $neo4jUrl = 'https://6f72daa1.databases.neo4j.io/';
 $username = 'neo4j';
 $password = '9lWmptqBgxBOz8NVcTJjgs3cHPyYmsy63ui6Spmw1d0';
@@ -15,9 +14,8 @@
 
 $query = 'CREATE (n:Person {name: "Bobby"}) RETURN n';
 
-$response = $transaction->run($query);
+$response = $transaction->run($query, []);
 
 print_r($response);
 
 $transaction->commit();
-

src/runtransaction.php

@@ -47,26 +47,27 @@ public function testTransactionCommit(): void
         $name = (string)mt_rand(1, 100000);
 
         // Create a node within the transaction
-        $tsx->run('CREATE (x:Human {name: $name})', ['name' => $name]);  // Pass the array here
+        $tsx->run("CREATE (x:Human {name: \$name})", ['name' => $name]);
 
         // Validate that the node does not exist in the database before the transaction is committed
-        $results = $this->api->run('MATCH (x:Human {name: $name}) RETURN x', ['name' => $name]);
+        $results = $this->api->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
         $this->assertCount(0, $results);
 
         // Validate that the node exists within the transaction
-        $results = $tsx->run('MATCH (x:Human {name: $name}) RETURN x', ['name' => $name]);
+        $results = $tsx->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
         $this->assertCount(1, $results);
 
         // Commit the transaction
         $tsx->commit();
 
         // Validate that the node now exists in the database
-        $results = $this->api->run('MATCH (x:Human {name: $name}) RETURN x', ['name' => $name]);
-        $this->assertCount(0, $results);
+        $results = $this->api->run("MATCH (x:Human {name: \$name}) RETURN x", ['name' => $name]);
+        $this->assertCount(1, $results); // Updated to expect 1 result
     }
 
 
 
+
     /**
      * @throws GuzzleException
      */