delete meta fixes

neo4j · Mar 8, 2022 · 3bee346 · 3bee346
1 parent 95ad484
commit 3bee346
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 87 deletions.
diff --git a/docs/rfcs/rfc-007-subscriptions.md b/docs/rfcs/rfc-007-subscriptions.md
@@ -172,15 +172,15 @@ class Neo4jGraphQLSubscriptionsPlugin {
     this.events = new EventEmitter();
   }
 
-  abstract public publish(eventMeta: EventMeta);
+  abstract public publish(eventMeta: SubscriptionsEvent);
 }
 ```
 
 The "local" implementation of this will look something like:
 
 ```ts
 class Neo4jGraphQLSubscriptionsLocalPlugin extends Neo4jGraphQLSubscriptionsPlugin {
-  public publish(eventMeta: EventMeta) {
+  public publish(eventMeta: SubscriptionsEvent) {
     this.events.emit(eventMeta);
   }
 }
@@ -192,7 +192,7 @@ And in rough pseudocode, an implementation of this using an AMQP broker would lo
 class Neo4jGraphQLSubscriptionsAMQPPlugin extends Neo4jGraphQLSubscriptionsPlugin {
   private amqpConnection;
 
-  public publish(eventMeta: EventMeta) {
+  public publish(eventMeta: SubscriptionsEvent) {
     amqpConnection.publish(eventMeta);
   }
 

diff --git a/packages/graphql/src/schema/resolvers/create.ts b/packages/graphql/src/schema/resolvers/create.ts
@@ -23,8 +23,7 @@ import { translateCreate } from "../../translate";
 import { Node } from "../../classes";
 import { Context } from "../../types";
 import getNeo4jResolveTree from "../../utils/get-neo4j-resolve-tree";
-import { EventMeta, RawEventMeta } from "../../subscriptions/event-meta";
-import { serializeNeo4jValue } from "../../utils/neo4j-serializers";
+import { publishEventsToPlugin } from "./subscriptions/publish-events-to-plugin";
 
 export default function createResolver({ node }: { node: Node }) {
     async function resolve(_root: any, args: any, _context: unknown, info: GraphQLResolveInfo) {
@@ -44,15 +43,7 @@ export default function createResolver({ node }: { node: Node }) {
         ) as FieldNode;
         const nodeKey = nodeProjection?.alias ? nodeProjection.alias.value : nodeProjection?.name?.value;
 
-        const subscriptionsPlugin = context.plugins?.subscriptions;
-        if (subscriptionsPlugin) {
-            const metaData: RawEventMeta[] = executeResult.records[0]?.meta || [];
-            for (const meta of metaData) {
-                const serializedMeta = serializeEventMeta(meta);
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                subscriptionsPlugin.publish(serializedMeta);
-            }
-        }
+        publishEventsToPlugin(executeResult, context.plugins?.subscriptions);
 
         return {
             info: {
@@ -69,26 +60,3 @@ export default function createResolver({ node }: { node: Node }) {
         args: { input: `[${node.name}CreateInput!]!` },
     };
 }
-
-function serializeProperties(properties: Record<string, any> | undefined): Record<string, any> | undefined {
-    if (!properties) {
-        return undefined;
-    }
-
-    return Object.entries(properties).reduce((serializedProps, [k, v]) => {
-        serializedProps[k] = serializeNeo4jValue(v);
-        return serializedProps;
-    }, {} as Record<string, any>);
-}
-
-function serializeEventMeta(event: RawEventMeta): EventMeta {
-    return {
-        id: serializeNeo4jValue(event.id),
-        timestamp: serializeNeo4jValue(event.timestamp),
-        event: event.event,
-        properties: {
-            old: serializeProperties(event.properties.old),
-            new: serializeProperties(event.properties.new),
-        },
-    } as EventMeta;
-}
diff --git a/packages/graphql/src/schema/resolvers/delete.ts b/packages/graphql/src/schema/resolvers/delete.ts
@@ -23,8 +23,7 @@ import { execute } from "../../utils";
 import { translateDelete } from "../../translate";
 import { Context } from "../../types";
 import { Node } from "../../classes";
-import { EventMeta, RawEventMeta } from "../../subscriptions/event-meta";
-import { serializeNeo4jValue } from "../../utils/neo4j-serializers";
+import { publishEventsToPlugin } from "./subscriptions/publish-events-to-plugin";
 
 export default function deleteResolver({ node }: { node: Node }) {
     async function resolve(_root: any, args: any, _context: unknown, info: GraphQLResolveInfo) {
@@ -38,15 +37,7 @@ export default function deleteResolver({ node }: { node: Node }) {
             context,
         });
 
-        const subscriptionsPlugin = context.plugins?.subscriptions;
-        if (subscriptionsPlugin) {
-            const metaData: RawEventMeta[] = executeResult.records[0]?.meta || [];
-            for (const meta of metaData) {
-                const serializedMeta = serializeEventMeta(meta);
-                // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                subscriptionsPlugin.publish(serializedMeta);
-            }
-        }
+        publishEventsToPlugin(executeResult, context.plugins?.subscriptions);
 
         return { bookmark: executeResult.bookmark, ...executeResult.statistics };
     }
@@ -64,26 +55,3 @@ export default function deleteResolver({ node }: { node: Node }) {
         },
     };
 }
-
-function serializeProperties(properties: Record<string, any> | undefined): Record<string, any> | undefined {
-    if (!properties) {
-        return undefined;
-    }
-
-    return Object.entries(properties).reduce((serializedProps, [k, v]) => {
-        serializedProps[k] = serializeNeo4jValue(v);
-        return serializedProps;
-    }, {} as Record<string, any>);
-}
-
-function serializeEventMeta(event: RawEventMeta): EventMeta {
-    return {
-        id: serializeNeo4jValue(event.id),
-        timestamp: serializeNeo4jValue(event.timestamp),
-        event: event.event,
-        properties: {
-            old: serializeProperties(event.properties.old),
-            new: serializeProperties(event.properties.new),
-        },
-    } as EventMeta;
-}
diff --git a/packages/graphql/src/schema/resolvers/subscriptions/publish-events-to-plugin.ts b/packages/graphql/src/schema/resolvers/subscriptions/publish-events-to-plugin.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ExecuteResult } from "../../../utils/execute";
+import { serializeNeo4jValue } from "../../../utils/neo4j-serializers";
+import { Neo4jGraphQLSubscriptionsPlugin } from "../../../types";
+import { EventMeta, SubscriptionsEvent } from "../../../subscriptions/subscriptions-event";
+
+export function publishEventsToPlugin(
+    executeResult: ExecuteResult,
+    plugin: Neo4jGraphQLSubscriptionsPlugin | undefined
+): void {
+    if (plugin) {
+        const metaData: EventMeta[] = executeResult.records[0]?.meta || [];
+
+        for (const meta of metaData) {
+            const serializedMeta = serializeEvent(meta);
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            plugin.publish(serializedMeta);
+        }
+    }
+}
+
+function serializeEvent(event: EventMeta): SubscriptionsEvent {
+    return {
+        id: serializeNeo4jValue(event.id),
+        timestamp: serializeNeo4jValue(event.timestamp),
+        event: event.event,
+        properties: {
+            old: serializeProperties(event.properties.old),
+            new: serializeProperties(event.properties.new),
+        },
+    } as SubscriptionsEvent;
+}
+
+function serializeProperties(properties: Record<string, any> | undefined): Record<string, any> | undefined {
+    if (!properties) {
+        return undefined;
+    }
+
+    return Object.entries(properties).reduce((serializedProps, [k, v]) => {
+        serializedProps[k] = serializeNeo4jValue(v);
+        return serializedProps;
+    }, {} as Record<string, any>);
+}
diff --git a/...s/graphql/src/subscriptions/event-meta.ts → .../src/subscriptions/subscriptions-event.ts b/...s/graphql/src/subscriptions/event-meta.ts → .../src/subscriptions/subscriptions-event.ts
@@ -19,7 +19,7 @@
 
 import * as neo4j from "neo4j-driver";
 
-export type RawEventMeta = {
+export type EventMeta = {
     event: "create" | "update" | "delete";
     properties: {
         old: Record<string, any>;
@@ -29,7 +29,7 @@ export type RawEventMeta = {
     timestamp: neo4j.Integer | string | number;
 };
 
-export type EventMeta = (
+export type SubscriptionsEvent = (
     | {
           event: "create";
           properties: {

diff --git a/packages/graphql/src/translate/create-delete-and-params.ts b/packages/graphql/src/translate/create-delete-and-params.ts
@@ -23,6 +23,7 @@ import createAuthAndParams from "./create-auth-and-params";
 import createConnectionWhereAndParams from "./where/create-connection-where-and-params";
 import { AUTH_FORBIDDEN_ERROR, META_CYPHER_VARIABLE } from "../constants";
 import { createEventMetaObject } from "./subscriptions/create-event-meta";
+import { filterMetaVariable } from "./subscriptions/filter-meta-variable";
 
 interface Res {
     strs: string[];
@@ -217,7 +218,7 @@ function createDeleteAndParams({
                     if (context.subscriptionsEnabled) {
                         res.strs.push(
                             `WITH ${[
-                                ...withVars.filter((v) => v !== META_CYPHER_VARIABLE),
+                                ...filterMetaVariable(withVars),
                                 nodeToDelete,
                             ]}, REDUCE(m=${META_CYPHER_VARIABLE}, n IN ${nodeToDelete} | m + ${createEventMetaObject({
                                 event: "delete",

diff --git a/packages/graphql/src/translate/subscriptions/create-event-meta.ts b/packages/graphql/src/translate/subscriptions/create-event-meta.ts
@@ -19,18 +19,18 @@
 
 import { META_CYPHER_VARIABLE } from "../../constants";
 
-export type EventMetaType = "create" | "update" | "delete";
+export type SubscriptionsEventType = "create" | "update" | "delete";
 
-export function createEventMeta({ event, nodeVariable }: { event: EventMetaType; nodeVariable: string }): string {
+export function createEventMeta({ event, nodeVariable }: { event: SubscriptionsEventType; nodeVariable: string }): string {
     return `${META_CYPHER_VARIABLE} + ${createEventMetaObject({ event, nodeVariable })} AS ${META_CYPHER_VARIABLE}`;
 }
 
-export function createEventMetaObject({ event, nodeVariable }: { event: EventMetaType; nodeVariable: string }): string {
+export function createEventMetaObject({ event, nodeVariable }: { event: SubscriptionsEventType; nodeVariable: string }): string {
     const properties = createEventMetaProperties({ event, nodeVariable });
     return `{ event: "${event}", id: id(${nodeVariable}), ${properties}, timestamp: timestamp() }`;
 }
 
-function createEventMetaProperties({ event, nodeVariable }: { event: EventMetaType; nodeVariable: string }): string {
+function createEventMetaProperties({ event, nodeVariable }: { event: SubscriptionsEventType; nodeVariable: string }): string {
     let oldProps: string;
     let newProps: string;
 

diff --git a/packages/graphql/src/types.ts b/packages/graphql/src/types.ts
@@ -23,7 +23,7 @@ import { ResolveTree } from "graphql-parse-resolve-info";
 import { Driver, Integer } from "neo4j-driver";
 import { Node, Relationship } from "./classes";
 import { RelationshipQueryDirectionOption } from "./constants";
-import { EventMeta } from "./subscriptions/event-meta";
+import { SubscriptionsEvent } from "./subscriptions/subscriptions-event";
 
 export type DriverConfig = {
     database?: string;
@@ -346,7 +346,7 @@ export interface Neo4jGraphQLAuthPlugin {
 export interface Neo4jGraphQLSubscriptionsPlugin {
     events: EventEmitter;
 
-    publish(eventMeta: EventMeta): Promise<void>;
+    publish(eventMeta: SubscriptionsEvent): Promise<void>;
 }
 
 export interface Neo4jGraphQLPlugins {

diff --git a/packages/graphql/src/utils/execute.ts b/packages/graphql/src/utils/execute.ts
@@ -37,7 +37,7 @@ import environment from "../environment";
 
 const debug = Debug(DEBUG_EXECUTE);
 
-interface ExecuteResult {
+export interface ExecuteResult {
     bookmark: string | null;
     result: QueryResult;
     statistics: Record<string, number>;
@@ -100,9 +100,9 @@ async function execute(input: {
     try {
         debug("%s", `About to execute Cypher:\nCypher:\n${cypher}\nParams:\n${JSON.stringify(input.params, null, 2)}`);
 
-        const result: QueryResult = await session[
-            `${input.defaultAccessMode.toLowerCase()}Transaction`
-        ]((tx: Transaction) => tx.run(cypher, input.params));
+        const result: QueryResult = await session[`${input.defaultAccessMode.toLowerCase()}Transaction`](
+            (tx: Transaction) => tx.run(cypher, input.params)
+        );
 
         const records = result.records.map((r) => r.toObject());
 

diff --git a/packages/graphql/tests/utils/TestSubscriptionPlugin.ts b/packages/graphql/tests/utils/TestSubscriptionPlugin.ts
@@ -17,16 +17,16 @@
  * limitations under the License.
  */
 import EventEmitter from "events";
-import { EventMeta } from "../../src/subscriptions/event-meta";
+import { SubscriptionsEvent } from "../../src/subscriptions/subscriptions-event";
 import { Neo4jGraphQLSubscriptionsPlugin } from "../../src/types";
 
 export class TestSubscriptionsPlugin implements Neo4jGraphQLSubscriptionsPlugin {
     public events: EventEmitter = {} as EventEmitter;
 
-    public eventList: EventMeta[] = [];
+    public eventList: SubscriptionsEvent[] = [];
 
     // eslint-disable-next-line @typescript-eslint/require-await
-    async publish(eventMeta: EventMeta): Promise<void> {
+    async publish(eventMeta: SubscriptionsEvent): Promise<void> {
         this.eventList.push(eventMeta);
     }
 }