Add missing validation for LabProp

Author: IoannisPanagiotas

algorithms-compute-business-facade/src/main/java/org/neo4j/gds/community/CommunityComputeBusinessFacade.java

@@ -39,6 +39,7 @@
 import org.neo4j.gds.core.loading.GraphStoreCatalogService;
 import org.neo4j.gds.core.loading.validation.CompoundGraphStoreValidationsBuilder;
 import org.neo4j.gds.core.loading.validation.NoAlgorithmValidation;
+import org.neo4j.gds.core.loading.validation.NodePropertyAllExistsGraphStoreValidation;
 import org.neo4j.gds.core.loading.validation.NodePropertyAnyExistsGraphStoreValidation;
 import org.neo4j.gds.core.loading.validation.NodePropertyTypeGraphStoreValidation;
 import org.neo4j.gds.core.loading.validation.SeedPropertyGraphStoreValidation;
@@ -322,7 +323,10 @@ public <TR> CompletableFuture<TR> labelPropagation(
             graphName,
             graphParameters,
             relationshipProperty,
-            SeedPropertyGraphStoreValidation.create(parameters.seedProperty()),
+            new CompoundGraphStoreValidationsBuilder()
+                .withGraphStoreValidation(SeedPropertyGraphStoreValidation.create(parameters.seedProperty()))
+                .withGraphStoreValidation(new NodePropertyAllExistsGraphStoreValidation(parameters.nodeWeightProperty()))
+                .build(),
             Optional.empty(),
             user,
             databaseId

core/src/main/java/org/neo4j/gds/core/loading/validation/NodePropertyAllExistsGraphStoreValidation.java

@@ -22,9 +22,12 @@
 import org.neo4j.gds.NodeLabel;
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.api.GraphStore;
-import org.neo4j.gds.utils.StringFormatting;
+import org.neo4j.gds.utils.StringJoining;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
+
+import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
 public class NodePropertyAllExistsGraphStoreValidation extends GraphStoreValidation {
 
@@ -45,13 +48,23 @@ void validatePropertyExists(
         GraphStore graphStore,
         Collection<NodeLabel> selectedLabels
     ) {
-        if (!graphStore.nodePropertyKeys(selectedLabels).contains(nodeProperty)) {
-            throw new IllegalArgumentException(
-                StringFormatting.formatWithLocale(
-                    "Node property [%s] not found in the graph.",
-                    nodeProperty
-                )
-            );
+        if (nodeProperty!=null){
+        if (!graphStore.hasNodeProperty(selectedLabels, nodeProperty)) {
+            var labelsWithMissingProperty = selectedLabels
+                .stream()
+                .filter(label -> !graphStore.nodePropertyKeys(label).contains(nodeProperty))
+                .map(NodeLabel::name)
+                .collect(Collectors.toList());
+
+            throw new IllegalArgumentException(formatWithLocale(
+                "Node property `%s` is not present for all requested labels. Requested labels: %s. Labels without the property key: %s. Properties available on all requested labels: %s",
+                nodeProperty,
+                StringJoining.join(selectedLabels.stream().map(NodeLabel::name)),
+                StringJoining.join(labelsWithMissingProperty),
+                StringJoining.join(graphStore.nodePropertyKeys(selectedLabels))
+            ));
         }
+        }
+
     }
 }

core/src/test/java/org/neo4j/gds/core/loading/validation/NodePropertyAllExistsGraphStoreValidationTest.java

@@ -29,6 +29,7 @@
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -39,6 +40,7 @@ class NodePropertyAllExistsGraphStoreValidationTest {
     void shouldNotThrowForExistingProperty() {
         var graphStore = mock(GraphStore.class);
         var collectionString = Set.of("p");
+        when(graphStore.hasNodeProperty(ArgumentMatchers.anyCollection(),anyString())).thenReturn(true);
         when(graphStore.nodePropertyKeys(ArgumentMatchers.any(NodeLabel.class))).thenReturn(collectionString);
         doCallRealMethod().when(graphStore).nodePropertyKeys(anySet());
 
@@ -57,6 +59,8 @@ void shouldThrowForNonexistingPropertyInSomeLabels() {
 
         var nodeLabel1 = NodeLabel.of("Node");
         var nodeLabel2 = NodeLabel.of("Node1");
+        when(graphStore.hasNodeProperty(ArgumentMatchers.anyCollection(),anyString())).thenReturn(false);
+
         when(graphStore.nodePropertyKeys(ArgumentMatchers.eq(nodeLabel1))).thenReturn(collectionString1);
         when(graphStore.nodePropertyKeys(ArgumentMatchers.eq(nodeLabel2))).thenReturn(collectionString2);
         doCallRealMethod().when(graphStore).nodePropertyKeys(anySet());
@@ -66,7 +70,7 @@ void shouldThrowForNonexistingPropertyInSomeLabels() {
             graphStore,
             Set.of(nodeLabel1,nodeLabel2)
         )).hasMessageContaining(
-            "Node property [p] not found in the graph"
+            "Node property `p` is not present for all requested labels. Requested labels: ['Node', 'Node1']. Labels without the property key: ['Node']"
         );
     }
 
@@ -77,6 +81,7 @@ void shouldThrowForNonexistingPropertyInEveryLabel() {
 
         var nodeLabel1 = NodeLabel.of("Node");
         var nodeLabel2 = NodeLabel.of("Node1");
+        when(graphStore.hasNodeProperty(ArgumentMatchers.anyCollection(),anyString())).thenReturn(false);
         when(graphStore.nodePropertyKeys(ArgumentMatchers.eq(nodeLabel1))).thenReturn(collectionString);
         when(graphStore.nodePropertyKeys(ArgumentMatchers.eq(nodeLabel2))).thenReturn(collectionString);
         doCallRealMethod().when(graphStore).nodePropertyKeys(anySet());
@@ -86,7 +91,7 @@ void shouldThrowForNonexistingPropertyInEveryLabel() {
             graphStore,
             Set.of(nodeLabel1,nodeLabel2)
         )).hasMessageContaining(
-            "Node property [p] not found in the graph"
+            "Node property `p` is not present for all requested labels. Requested labels: ['Node', 'Node1']. Labels without the property key: ['Node', 'Node1']"
         );
     }