#1 - Filter Conflict at same object graph depth

Author: colinfindlay

src/main/java/com/arangodb/graphql/context/ArangoFilter.java

@@ -36,6 +36,8 @@ public class ArangoFilter {
 
     private final List values;
 
+    private String edgeCollection;
+
     public ArangoFilter(String key, Object value) {
         this.key = key;
         if (value instanceof Collection) {
@@ -45,6 +47,11 @@ public ArangoFilter(String key, Object value) {
         }
     }
 
+    public ArangoFilter(String key, Object value, String edgeCollection) {
+        this(key, value);
+        this.edgeCollection = edgeCollection;
+    }
+
     public String getKey() {
         return key;
     }
@@ -53,4 +60,7 @@ public List getValues() {
         return values;
     }
 
+    public String getEdgeCollection() {
+        return edgeCollection;
+    }
 }

src/main/java/com/arangodb/graphql/context/ArangoFilterGroup.java

@@ -20,6 +20,9 @@
 
 package com.arangodb.graphql.context;
 
+import com.arangodb.graphql.schema.ArangoEdgeDirective;
+import graphql.schema.SelectedField;
+
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -40,6 +43,15 @@ public ArangoFilterGroup(List<ArangoFilter> filters, int depth) {
         this.depth = depth;
     }
 
+    public ArangoFilterGroup(SelectedField field, int depth){
+        ArangoEdgeDirective edgeDirective = new ArangoEdgeDirective(field.getFieldDefinition());
+        this.filters = field.getArguments().entrySet()
+                .stream()
+                .map(e -> new ArangoFilter(e.getKey(), e.getValue(), edgeDirective.getCollection()))
+                .collect(Collectors.toList());
+        this.depth = depth;
+    }
+
     public ArangoFilterGroup(Map<String, Object> arguments, int depth) {
         this.filters = arguments.entrySet()
                 .stream()

src/main/java/com/arangodb/graphql/context/ArangoTypeDiscriminationFilterFactory.java

@@ -41,6 +41,10 @@ private String discriminator(GraphQLOutputType type){
     }
 
     public ArangoFilter typeFilterFor(GraphQLType type){
+        return typeFilterFor(type, null);
+    }
+
+    public ArangoFilter typeFilterFor(GraphQLType type, String edgeCollection){
         GraphQLType graphQLType = GraphQLTypeUtil.unwrapAll(type);
 
         if(graphQLType instanceof GraphQLObjectType) {
@@ -60,7 +64,7 @@ public ArangoFilter typeFilterFor(GraphQLType type){
                     alias = graphQLType.getName();
                 }
 
-                return new ArangoFilter(discriminator.get(), alias);
+                return new ArangoFilter(discriminator.get(), alias, edgeCollection);
 
             }
 

src/main/java/com/arangodb/graphql/context/SelectedFieldMetadata.java

@@ -56,7 +56,7 @@ public ArangoFilterGroup filterGroup() {
         List<ArangoFilter> filters = new ArrayList<>();
 
         if (selectedField.getArguments().size() > 0) {
-            ArangoFilterGroup argumentGroup = new ArangoFilterGroup(selectedField.getArguments(), depth());
+            ArangoFilterGroup argumentGroup = new ArangoFilterGroup(selectedField, depth());
             filters.addAll(argumentGroup.getFilters());
         }
 
@@ -131,9 +131,10 @@ public List<GraphQLFieldsContainer> fieldContainers() {
     }
 
     private ArangoFilter typeFilter(){
+        ArangoEdgeDirective edgeDirective = new ArangoEdgeDirective(selectedField.getFieldDefinition());
         GraphQLFieldDefinition fieldDefinition = selectedField.getFieldDefinition();
         GraphQLType graphQLType = GraphQLTypeUtil.unwrapAll(fieldDefinition.getType());
         ArangoTypeDiscriminationFilterFactory typeFilterFactory = new ArangoTypeDiscriminationFilterFactory();
-        return typeFilterFactory.typeFilterFor(graphQLType);
+        return typeFilterFactory.typeFilterFor(graphQLType, edgeDirective.getCollection());
     }
 }

src/main/java/com/arangodb/graphql/generator/AbstractFilterGenerator.java

@@ -76,11 +76,22 @@ public String generateAql(ArangoGraphQLContext ctx) {
 
     private String filter(ArangoFilter filter, int depth) {
 
-        String prefix = depth >= 0 ? "p.vertices[" + depth + "]." : "rootVertex.";
+        boolean edgeFilter = depth >=0;
+        String prefix = edgeFilter ? "p.vertices[" + depth + "]." : "rootVertex.";
 
         StringBuilder sb = new StringBuilder();
+        StringBuilder isSameCollection = new StringBuilder();
         sb.append("FILTER (");
 
+        if(edgeFilter){
+            sb.append("(");
+            isSameCollection.append("IS_SAME_COLLECTION( \"");
+            isSameCollection.append(filter.getEdgeCollection());
+            isSameCollection.append("\", p.edges[");
+            isSameCollection.append(depth -1);
+            isSameCollection.append("]._id)");
+        }
+
         Iterator<ArangoFilter> iterator = filter.getValues().iterator();
         while (iterator.hasNext()) {
             Object value = iterator.next();
@@ -98,6 +109,16 @@ private String filter(ArangoFilter filter, int depth) {
         }
         sb.append(")");
 
+        if(edgeFilter) {
+            sb.append(" AND ");
+            sb.append(isSameCollection.toString());
+            sb.append(") ");
+
+            sb.append(" OR (NOT ");
+            sb.append(isSameCollection.toString());
+            sb.append(")");
+        }
+
         return sb.toString();
 
     }

src/test/java/com/arangodb/graphql/generator/TraversalFilterGeneratorTest.java

@@ -61,21 +61,21 @@ public void setUp(){
     public void generateAqlSingleNumericFilter(){
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
-                new ArangoFilter("jersey", 29)
+                new ArangoFilter("jersey", 29, "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29)"));
+        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
     @Test
     public void generateAqlSingleNonNumericFilter(){
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
-                new ArangoFilter("name", "Felix Potvin")
+                new ArangoFilter("name", "Felix Potvin", "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\")"));
+        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\") AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
@@ -85,22 +85,22 @@ public void generateAqlSingleNonNumericFilter(){
     public void generateAqlMultipleNonNumericFilter(){
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
-                new ArangoFilter("name", "Felix Potvin"),
-                new ArangoFilter("jersey", 29)
+                new ArangoFilter("name", "Felix Potvin", "edgeCollectionName"),
+                new ArangoFilter("jersey", 29, "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\")\nFILTER (p.vertices[2].jersey == 29)"));
+        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].name == \"Felix Potvin\")\nFILTER (p.vertices[2].jersey == 29) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }
 
     @Test
     public void generateAqlMultiValueFilter(){
 
         when(filterGroup.getFilters()).thenReturn(Arrays.asList(
-                new ArangoFilter("jersey", Arrays.asList(29, 93))
+                new ArangoFilter("jersey", Arrays.asList(29, 93), "edgeCollectionName")
         ));
 
-        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29 || p.vertices[2].jersey == 93)"));
+        assertThat(generator.generateAql(context), equalTo("FILTER (p.vertices[2].jersey == 29 || p.vertices[2].jersey == 93) AND IS_SAME_COLLECTION( \"edgeCollectionName\", p.edges[1]._id)) OR (NOT IS_SAME_COLLECTION(\"edgeCollectionName\", p.edges[1]._id))"));
 
     }