Fix 7.x branch (#5896)

neo4j · Dec 16, 2024 · aa29046 · aa29046
1 parent c880a3c
commit aa29046
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 1,213 deletions.
diff --git a/packages/graphql/src/translate/queryAST/ast/selection/RelationshipSelection.ts b/packages/graphql/src/translate/queryAST/ast/selection/RelationshipSelection.ts
@@ -26,17 +26,15 @@ import type { QueryASTContext } from "../QueryASTContext";
 import { EntitySelection, type SelectionClause } from "./EntitySelection";
 
 export class RelationshipSelection extends EntitySelection {
-    protected relationship: RelationshipAdapter;
+    private relationship: RelationshipAdapter;
     // Overrides relationship target for composite entities
     private targetOverride: ConcreteEntityAdapter | undefined;
     private alias: string | undefined;
-    private directed?: boolean;
     private optional: boolean;
 
     constructor({
         relationship,
         alias,
-        directed,
         targetOverride,
         optional,
     }: {
@@ -49,7 +47,6 @@ export class RelationshipSelection extends EntitySelection {
         super();
         this.relationship = relationship;
         this.alias = alias;
-        this.directed = directed;
         this.targetOverride = targetOverride;
         this.optional = optional ?? false;
     }
@@ -64,7 +61,7 @@ export class RelationshipSelection extends EntitySelection {
         const relationshipTarget = this.targetOverride ?? this.relationship.target;
         const targetNode = createNode(this.alias);
         const labels = getEntityLabels(relationshipTarget, context.neo4jGraphQLContext);
-        const relDirection = this.getRelationshipDirection();
+        const relDirection = this.relationship.getCypherDirection();
 
         const pattern = new Cypher.Pattern(context.target)
             .related(relVar, { direction: relDirection, type: this.relationship.type })
@@ -81,15 +78,4 @@ export class RelationshipSelection extends EntitySelection {
             selection: match,
         };
     }
-
-    protected getRelationshipDirection(): "left" | "right" | "undirected" {
-        return this.relationship.getCypherDirection(this.directed);
-    }
-}
-
-/** Enforces direction on the relationship selection, regardless of direction configuration **/
-export class DirectedRelationshipSelection extends RelationshipSelection {
-    protected getRelationshipDirection(): "left" | "right" {
-        return this.relationship.cypherDirectionFromRelDirection();
-    }
 }
diff --git a/packages/graphql/src/translate/queryAST/factory/Operations/AggregateFactory.ts b/packages/graphql/src/translate/queryAST/factory/Operations/AggregateFactory.ts
@@ -66,7 +66,6 @@ export class AggregateFactory {
 
                 const selection = new RelationshipSelection({
                     relationship: entityOrRel,
-                    directed: Boolean(resolveTree.args?.directed ?? true),
                 });
 
                 const operation = new AggregationOperation({

diff --git a/packages/graphql/src/translate/queryAST/factory/Operations/ConnectionFactory.ts b/packages/graphql/src/translate/queryAST/factory/Operations/ConnectionFactory.ts
@@ -68,7 +68,6 @@ export class ConnectionFactory {
         resolveTree: ResolveTree;
         context: Neo4jGraphQLTranslationContext;
     }): CompositeConnectionReadOperation {
-        const directed = resolveTree.args.directed as boolean | undefined;
         const resolveTreeWhere: Record<string, any> = this.queryASTFactory.operationsFactory.getWhereArgs(resolveTree);
 
         let nodeWhere: Record<string, any>;
@@ -85,7 +84,6 @@ export class ConnectionFactory {
             if (relationship) {
                 selection = new RelationshipSelection({
                     relationship,
-                    directed,
                     targetOverride: concreteEntity,
                 });
                 resolveTreeEdgeFields = this.parseConnectionFields({
@@ -165,7 +163,6 @@ export class ConnectionFactory {
         if (relationship) {
             selection = new RelationshipSelection({
                 relationship,
-                directed: resolveTree.args.directed as boolean | undefined,
             });
             resolveTreeEdgeFields = this.parseConnectionFields({
                 entityOrRel: relationship,
@@ -199,9 +196,8 @@ export class ConnectionFactory {
         });
     }
 
-    // eslint-disable-next-line @typescript-eslint/comma-dangle
     private hydrateConnectionOperationsASTWithSort<
-        T extends ConnectionReadOperation | CompositeConnectionReadOperation
+        T extends ConnectionReadOperation | CompositeConnectionReadOperation,
     >({
         entityOrRel,
         resolveTree,

diff --git a/packages/graphql/src/translate/queryAST/factory/Operations/DeleteFactory.ts b/packages/graphql/src/translate/queryAST/factory/Operations/DeleteFactory.ts
@@ -27,7 +27,7 @@ import { checkEntityAuthentication } from "../../../authorization/check-authenti
 import type { Filter } from "../../ast/filters/Filter";
 import { DeleteOperation } from "../../ast/operations/DeleteOperation";
 import { NodeSelection } from "../../ast/selection/NodeSelection";
-import { DirectedRelationshipSelection } from "../../ast/selection/RelationshipSelection";
+import { RelationshipSelection } from "../../ast/selection/RelationshipSelection";
 import { getConcreteEntities } from "../../utils/get-concrete-entities";
 import { isInterfaceEntity } from "../../utils/is-interface-entity";
 import { isUnionEntity } from "../../utils/is-union-entity";
@@ -204,7 +204,7 @@ export class DeleteFactory {
             context,
         });
 
-        const selection = new DirectedRelationshipSelection({
+        const selection = new RelationshipSelection({
             relationship,
             optional: true,
             targetOverride: target,

diff --git a/packages/graphql/src/translate/queryAST/factory/Operations/ReadFactory.ts b/packages/graphql/src/translate/queryAST/factory/Operations/ReadFactory.ts
@@ -75,7 +75,6 @@ export class ReadFactory {
             if (relationship) {
                 selection = new RelationshipSelection({
                     relationship,
-                    directed: Boolean(resolveTree.args?.directed ?? true),
                 });
             } else {
                 selection = new NodeSelection({
@@ -105,7 +104,6 @@ export class ReadFactory {
                 if (relationship) {
                     selection = new RelationshipSelection({
                         relationship,
-                        directed: Boolean(resolveTree.args?.directed ?? true),
                         targetOverride: concreteEntity,
                     });
                 } else {