wip clean up statements

Syndesi · Syndesi · commit 46c3b69f1525 · 2022-11-06T18:51:05.000+01:00
diff --git a/src/EventListener/OpenCypher/SimilarNodeQueueCreateToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarNodeQueueCreateToStatementEventListener.php
@@ -7,12 +7,12 @@
 use Laudis\Neo4j\Databags\Statement;
 use Psr\Log\LoggerInterface;
 use Syndesi\CypherDataStructures\Contract\NodeInterface;
-use Syndesi\CypherDataStructures\Contract\PropertyNameInterface;
 use Syndesi\CypherDataStructures\Helper\ToCypherHelper;
 use Syndesi\CypherEntityManager\Contract\OnActionCypherElementToStatementEventListenerInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueStatementInterface;
 use Syndesi\CypherEntityManager\Event\ActionCypherElementToStatementEvent;
+use Syndesi\CypherEntityManager\Helper\StructureHelper;
 use Syndesi\CypherEntityManager\Type\ActionType;
 
 class SimilarNodeQueueCreateToStatementEventListener implements OnActionCypherElementToStatementEventListenerInterface, SimilarNodeQueueStatementInterface
@@ -50,33 +50,13 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
             if (!$firstNode) {
                 $firstNode = $node;
             }
-            $properties = [];
-            $identifiers = [];
-            /** @var PropertyNameInterface $property */
-            foreach ($node->getProperties() as $property) {
-                if ($node->hasIdentifier($property)) {
-                    $identifiers[$property->getPropertyName()] = $node->getIdentifier($property);
-                    continue;
-                }
-                $properties[$property->getPropertyName()] = $node->getProperty($property);
-            }
             $batch[] = [
-                'identifier' => $identifiers,
-                'property' => $properties,
+                'identifier' => StructureHelper::getIdentifiersFromElementAsArray($node),
+                'property' => StructureHelper::getPropertiesFromElementAsArray($node),
             ];
         }
         if (!$firstNode) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
-        }
-        $identifiers = [];
-        /** @var PropertyNameInterface $identifier */
-        foreach ($firstNode->getIdentifiers() as $identifier) {
-            $identifiers[] = sprintf(
-                "%s: row.identifier.%s",
-                $identifier->getPropertyName(),
-                $identifier->getPropertyName(),
-            );
+            return StructureHelper::getEmptyStatement();
         }
 
         return new Statement(
@@ -85,7 +65,7 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
                 "CREATE (n%s {%s})\n".
                 "SET n += row.property",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
-                join(', ', $identifiers)
+                StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row.identifier')
             ),
             [
                 'batch' => $batch,
diff --git a/src/EventListener/OpenCypher/SimilarNodeQueueDeleteToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarNodeQueueDeleteToStatementEventListener.php
@@ -7,12 +7,12 @@
 use Laudis\Neo4j\Databags\Statement;
 use Psr\Log\LoggerInterface;
 use Syndesi\CypherDataStructures\Contract\NodeInterface;
-use Syndesi\CypherDataStructures\Contract\PropertyNameInterface;
 use Syndesi\CypherDataStructures\Helper\ToCypherHelper;
 use Syndesi\CypherEntityManager\Contract\OnActionCypherElementToStatementEventListenerInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueStatementInterface;
 use Syndesi\CypherEntityManager\Event\ActionCypherElementToStatementEvent;
+use Syndesi\CypherEntityManager\Helper\StructureHelper;
 use Syndesi\CypherEntityManager\Type\ActionType;
 
 class SimilarNodeQueueDeleteToStatementEventListener implements OnActionCypherElementToStatementEventListenerInterface, SimilarNodeQueueStatementInterface
@@ -50,28 +50,10 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
             if (!$firstNode) {
                 $firstNode = $node;
             }
-            $identifiers = [];
-            /** @var PropertyNameInterface $property */
-            foreach ($node->getProperties() as $property) {
-                if ($node->hasIdentifier($property)) {
-                    $identifiers[$property->getPropertyName()] = $node->getIdentifier($property);
-                    continue;
-                }
-            }
-            $batch[] = $identifiers;
+            $batch[] = StructureHelper::getIdentifiersFromElementAsArray($node);
         }
         if (!$firstNode) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
-        }
-        $identifiers = [];
-        /** @var PropertyNameInterface $identifier */
-        foreach ($firstNode->getIdentifiers() as $identifier) {
-            $identifiers[] = sprintf(
-                "%s: row.%s",
-                $identifier->getPropertyName(),
-                $identifier->getPropertyName(),
-            );
+            return StructureHelper::getEmptyStatement();
         }
 
         return new Statement(
@@ -80,7 +62,7 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
                 "MATCH (n%s {%s})\n".
                 "DETACH DELETE n",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
-                join(', ', $identifiers)
+                StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row')
             ),
             [
                 'batch' => $batch,
diff --git a/src/EventListener/OpenCypher/SimilarNodeQueueMergeToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarNodeQueueMergeToStatementEventListener.php
@@ -7,12 +7,12 @@
 use Laudis\Neo4j\Databags\Statement;
 use Psr\Log\LoggerInterface;
 use Syndesi\CypherDataStructures\Contract\NodeInterface;
-use Syndesi\CypherDataStructures\Contract\PropertyNameInterface;
 use Syndesi\CypherDataStructures\Helper\ToCypherHelper;
 use Syndesi\CypherEntityManager\Contract\OnActionCypherElementToStatementEventListenerInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueInterface;
 use Syndesi\CypherEntityManager\Contract\SimilarNodeQueueStatementInterface;
 use Syndesi\CypherEntityManager\Event\ActionCypherElementToStatementEvent;
+use Syndesi\CypherEntityManager\Helper\StructureHelper;
 use Syndesi\CypherEntityManager\Type\ActionType;
 
 class SimilarNodeQueueMergeToStatementEventListener implements OnActionCypherElementToStatementEventListenerInterface, SimilarNodeQueueStatementInterface
@@ -50,33 +50,13 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
             if (!$firstNode) {
                 $firstNode = $node;
             }
-            $properties = [];
-            $identifiers = [];
-            /** @var PropertyNameInterface $property */
-            foreach ($node->getProperties() as $property) {
-                if ($node->hasIdentifier($property)) {
-                    $identifiers[$property->getPropertyName()] = $node->getIdentifier($property);
-                    continue;
-                }
-                $properties[$property->getPropertyName()] = $node->getProperty($property);
-            }
             $batch[] = [
-                'identifier' => $identifiers,
-                'property' => $properties,
+                'identifier' => StructureHelper::getIdentifiersFromElementAsArray($node),
+                'property' => StructureHelper::getPropertiesFromElementAsArray($node),
             ];
         }
         if (!$firstNode) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
-        }
-        $identifiers = [];
-        /** @var PropertyNameInterface $identifier */
-        foreach ($firstNode->getIdentifiers() as $identifier) {
-            $identifiers[] = sprintf(
-                "%s: row.identifier.%s",
-                $identifier->getPropertyName(),
-                $identifier->getPropertyName(),
-            );
+            return StructureHelper::getEmptyStatement();
         }
 
         return new Statement(
@@ -88,7 +68,7 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
                 "ON MATCH\n".
                 "  SET n += row.property",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
-                join(', ', $identifiers)
+                StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row.identifier')
             ),
             [
                 'batch' => $batch,
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueCreateToStatementEventListener.php
@@ -71,8 +71,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             ];
         }
         if (!$firstRelation) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
+            return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
             throw new InvalidArgumentException('start node of relations can not be null');
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueDeleteToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueDeleteToStatementEventListener.php
@@ -70,8 +70,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             ];
         }
         if (!$firstRelation) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
+            return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
             throw new InvalidArgumentException('start node of relations can not be null');
diff --git a/src/EventListener/OpenCypher/SimilarRelationQueueMergeToStatementEventListener.php b/src/EventListener/OpenCypher/SimilarRelationQueueMergeToStatementEventListener.php
@@ -71,8 +71,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa
             ];
         }
         if (!$firstRelation) {
-            // aka empty queue
-            return new Statement("MATCH (n) LIMIT 0", []);
+            return StructureHelper::getEmptyStatement();
         }
         if (!$firstRelationStartNode) {
             throw new InvalidArgumentException('start node of relations can not be null');
diff --git a/src/Helper/StructureHelper.php b/src/Helper/StructureHelper.php
@@ -4,6 +4,7 @@
 
 namespace Syndesi\CypherEntityManager\Helper;
 
+use Laudis\Neo4j\Databags\Statement;
 use Syndesi\CypherDataStructures\Contract\HasIdentifiersInterface;
 use Syndesi\CypherDataStructures\Contract\NodeInterface;
 use Syndesi\CypherDataStructures\Contract\PropertyNameInterface;
@@ -14,6 +15,11 @@
 
 class StructureHelper
 {
+    public static function getEmptyStatement(): Statement
+    {
+        return Statement::create('MATCH (n) LIMIT 0');
+    }
+
     public static function identifierStorageToString(PropertyStorageInterface $identifiers): string
     {
         $internalIdentifiers = [];

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa`
`71`	`71`	`];`
`72`	`72`	`}`
`73`	`73`	`if (!$firstRelation) {`
`74`		`- // aka empty queue`
`75`		`- return new Statement("MATCH (n) LIMIT 0", []);`
	`74`	`+ return StructureHelper::getEmptyStatement();`
`76`	`75`	`}`
`77`	`76`	`if (!$firstRelationStartNode) {`
`78`	`77`	`throw new InvalidArgumentException('start node of relations can not be null');`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,7 @@ public static function similarRelationQueueStatement(SimilarRelationQueueInterfa`
`70`	`70`	`];`
`71`	`71`	`}`
`72`	`72`	`if (!$firstRelation) {`
`73`		`- // aka empty queue`
`74`		`- return new Statement("MATCH (n) LIMIT 0", []);`
	`73`	`+ return StructureHelper::getEmptyStatement();`
`75`	`74`	`}`
`76`	`75`	`if (!$firstRelationStartNode) {`
`77`	`76`	`throw new InvalidArgumentException('start node of relations can not be null');`