Merge pull request #6236 from neo4j/6224-subscriptions-filters-not-working-when-using-new-operators

fix new operators on subscription filters

Author: angrykoala

.changeset/wicked-cars-switch.md

@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": patch
+---
+
+Fix bug with some filters not properly working on subscriptions.

packages/graphql/src/schema/resolvers/subscriptions/where/filters/filter-by-properties.ts

@@ -59,10 +59,20 @@ export function filterByProperties<T>({
                 return false;
             }
             const fieldMeta = attributes.get(fieldName);
-            const checkFilterPasses = getFilteringFn(operator, operatorMapOverrides);
+            if (operator) {
+                // Deprecated operators
+                const checkFilterPasses = getFilteringFn(operator, operatorMapOverrides);
 
-            if (!checkFilterPasses(receivedValue, v, fieldMeta)) {
-                return false;
+                if (!checkFilterPasses(receivedValue, v, fieldMeta)) {
+                    return false;
+                }
+            } else {
+                for (const [op, value] of Object.entries(v as Record<string, any>)) {
+                    const checkFilterPasses = getFilteringFn(op, operatorMapOverrides);
+                    if (!checkFilterPasses(receivedValue, value, fieldMeta)) {
+                        return false;
+                    }
+                }
             }
         }
     }
@@ -86,7 +96,7 @@ function shouldParseAsInt(attributeAdapter: AttributeAdapter | undefined, value:
     return false;
 }
 
-const operatorMapOverrides = {
+let operatorMapOverrides: Record<string, (received: any, filtered: any, fieldMeta?: any) => boolean> = {
     INCLUDES: (received: [string | number], filtered: string | number, fieldMeta: AttributeAdapter | undefined) => {
         if (shouldParseAsInt(fieldMeta, filtered)) {
             const filteredAsNeo4jInteger = int(filtered);
@@ -116,3 +126,9 @@ const operatorMapOverrides = {
         return !filtered.some((v) => v === received);
     },
 };
+
+operatorMapOverrides = {
+    ...operatorMapOverrides,
+    includes: operatorMapOverrides.INCLUDES!,
+    in: operatorMapOverrides.IN!,
+};

packages/graphql/src/schema/resolvers/subscriptions/where/utils/get-filtering-fn.ts

@@ -19,7 +19,7 @@
 
 import type { AttributeAdapter } from "../../../../../schema-model/attribute/model-adapters/AttributeAdapter";
 
-type ComparatorFn<T> = (received: T, filtered: T, fieldMeta?: AttributeAdapter | undefined) => boolean;
+type ComparatorFn<T> = (received: T, filtered: T, fieldMeta?: AttributeAdapter) => boolean;
 
 const legacyOperatorCheckMap = {
     EQ: (received: string, filtered: string) => received == filtered,

packages/graphql/src/schema/resolvers/subscriptions/where/utils/parse-filter-property.ts

@@ -23,12 +23,5 @@ export function parseFilterProperty(key: string): { fieldName: string; operator:
     // eslint-disable-next-line prefer-const
     let { fieldName, operator } = parseWhereField(key);
 
-    // These conversions are only temporary necessary until the the _NOT operator exists, after that we can just return the output of parseWhereField
-    if (operator === "EQ") {
-        operator = undefined;
-    }
-
     return { fieldName, operator };
 }
-
-