Validate nodeProperties against properties in graph

Co-Authored-By: Martin Junghanns <[email protected]>

Author: 2 people

core/src/main/java/org/neo4j/graphalgo/core/loading/GraphStore.java

@@ -180,6 +180,14 @@ public long relationshipPropertyCount() {
             .sum();
     }
 
+    public Set<String> availableRelationshipPropertyKeys() {
+        return relationshipProperties
+            .values()
+            .stream()
+            .flatMap(properties -> properties.keySet().stream())
+            .collect(Collectors.toSet());
+    }
+
     public Set<Pair<String, Optional<String>>> relationshipPropertyKeys() {
         return this.relationshipTypes().stream().flatMap(relType -> {
             if (relationshipProperties.containsKey(relType)) {

proc/src/main/java/org/neo4j/graphalgo/AlgoBaseProc.java

@@ -263,7 +263,7 @@ private void validate(GraphStoreWithConfig graphStoreWithConfig, CONFIG config)
             return;
         }
         if (config instanceof SeedConfig) {
-            Set<String> nodeProperties = graphCreateConfig.nodeProjections().allProperties();
+            Set<String> nodeProperties = graphStore.nodePropertyKeys();
             String seedProperty = ((SeedConfig) config).seedProperty();
             if (seedProperty != null && !nodeProperties.contains(seedProperty)) {
                 throw new IllegalArgumentException(String.format(
@@ -274,7 +274,7 @@ private void validate(GraphStoreWithConfig graphStoreWithConfig, CONFIG config)
             }
         }
         if (config instanceof NodeWeightConfig) {
-            Set<String> properties = new HashSet<>(graphCreateConfig.nodeProjections().allProperties());
+            Set<String> properties = graphStore.nodePropertyKeys();
 
             String weightProperty = ((NodeWeightConfig) config).nodeWeightProperty();
             if (weightProperty != null && !properties.contains(weightProperty)) {
@@ -286,7 +286,7 @@ private void validate(GraphStoreWithConfig graphStoreWithConfig, CONFIG config)
             }
         }
         if (config instanceof RelationshipWeightConfig) {
-            Set<String> properties = new HashSet<>(graphCreateConfig.relationshipProjections().allProperties());
+            Set<String> properties = graphStore.availableRelationshipPropertyKeys();
 
             String weightProperty = ((RelationshipWeightConfig) config).relationshipWeightProperty();
             if (weightProperty != null && !properties.contains(weightProperty)) {

proc/src/test/java/org/neo4j/graphalgo/catalog/GraphMutateProcIntegrationTest.java

@@ -146,9 +146,10 @@ void runPipeline() {
             .explicitCreation(TEST_GRAPH)
             .algo("labelPropagation")
             .mutateMode()
+            .addParameter("nodeWeightProperty", "pageRank")
             .addParameter("mutateProperty", "louvain")
             .yields();
-        String lovainQuery = GdsCypher
+        String louvainQuery = GdsCypher
             .call()
             .explicitCreation(TEST_GRAPH)
             .algo("louvain")
@@ -167,7 +168,7 @@ void runPipeline() {
         runQuery(pageRankQuery);
         runQuery(wccQuery);
         runQuery(labelPropagationQuery);
-        runQuery(lovainQuery);
+        runQuery(louvainQuery);
         runQuery(nodeSimilarityQuery);
 
         assertGraphEquals(EXPECTED_GRAPH, GraphStoreCatalog.get(getUsername(), TEST_GRAPH).graphStore().getUnion());