fix 6917 (#6920)

* add integration test

* fix logical filters not translated in both edge and node

Author: a-alle

packages/graphql/src/translate/queryAST/factory/FilterFactory.ts

@@ -480,6 +480,9 @@ export class FilterFactory {
         relationship?: RelationshipAdapter;
     }): Filter | Filter[] {
         const valueAsArray = asArray(value);
+        if (key === "edge") {
+            return [];
+        }
         if (isLogicalOperator(key)) {
             const nestedFilters = valueAsArray.flatMap((nestedWhere) => {
                 const nestedOfNestedFilters = Object.entries(nestedWhere).flatMap(([nestedKey, nestedValue]) => {
@@ -501,6 +504,16 @@ export class FilterFactory {
                 filters: nestedFilters,
             });
         }
+        if (key === "node") {
+            const key = Object.keys(value)[0] as string;
+            return this.parseEntryFilter({
+                entity,
+                key: Object.keys(value)[0] as string,
+                value: value[key],
+                targetEntity,
+                relationship,
+            });
+        }
         const { fieldName, operator, isConnection, isAggregate } = parseWhereField(key);
         if (isConcreteEntity(entity)) {
             const relationship = entity.findRelationship(fieldName);
@@ -554,7 +567,6 @@ export class FilterFactory {
         if (!operator && !attribute.annotations.cypher?.targetEntity && typeof value === "object") {
             return this.parseGenericFilters(targetEntity ?? entity, fieldName, value, relationship);
         }
-
         return this.createPropertyFilter({
             attribute,
             comparisonValue: value,
@@ -794,6 +806,9 @@ export class FilterFactory {
 
     public createEdgeFilters(relationship: RelationshipAdapter, where: GraphQLWhereArg): Filter[] {
         const filterASTs = Object.entries(where).flatMap(([key, value]): Filter | Filter[] | undefined => {
+            if (key === "node") {
+                return [];
+            }
             if (isLogicalOperator(key)) {
                 const nestedFilters = asArray(value).flatMap((nestedWhere) => {
                     return this.createEdgeFilters(relationship, nestedWhere);
@@ -803,6 +818,9 @@ export class FilterFactory {
                     filters: nestedFilters,
                 });
             }
+            if (key === "edge") {
+                return this.createEdgeFilters(relationship, value);
+            }
             const { fieldName, operator } = parseWhereField(key);
 
             const attribute = relationship.findAttribute(fieldName);

packages/graphql/src/translate/queryAST/factory/Operations/AggregateFactory.ts

@@ -447,10 +447,13 @@ export class AggregateFactory {
                 );
                 operation.addFilters(...nodeFilters, ...edgefilters);
             } else {
-                const nodeFilters = this.queryASTFactory.filterFactory.createNodeFilters(entity, whereArgs.node ?? {}); // Aggregation filters only apply to target node
+                const nodeFilters = this.queryASTFactory.filterFactory.createNodeFilters(
+                    entity,
+                    whereArgs.node ?? whereArgs ?? {}
+                ); // Aggregation filters only apply to target node
                 const edgeFilters = this.queryASTFactory.filterFactory.createEdgeFilters(
                     relationship,
-                    whereArgs.edge ?? {}
+                    whereArgs.edge ?? whereArgs ?? {}
                 ); // Aggregation filters only apply to target node
                 operation.addFilters(...nodeFilters, ...edgeFilters);