Upgrade Neo4j-related backend packages to v5 (#169)

* Upgrade Neo4j-related backend packages to v5 --------- Signed-off-by: Angelica Ochoa <15623749+ao508@users.noreply.github.com> Co-authored-by: Quan Nguyen <86090707+qu8n@users.noreply.github.com>
mskcc · Nov 13, 2024 · d9c2b5b · d9c2b5b
1 parent d1dba02
commit d9c2b5b
Show file tree

Hide file tree

Showing 5 changed files with 28,373 additions and 43,814 deletions.
diff --git a/graphql-server/package.json b/graphql-server/package.json
@@ -17,8 +17,8 @@
     "@apollo/client": "^3.7.4",
     "@graphql-tools/merge": "^9.0.1",
     "@graphql-tools/schema": "^10.0.2",
-    "@neo4j/graphql": "^3.5.1",
-    "@neo4j/graphql-ogm": "^3.9.0",
+    "@neo4j/graphql": "^5.6.2",
+    "@neo4j/graphql-ogm": "^5.6.2",
     "@neo4j/introspector": "^1.0.1",
     "@types/node": "^18.11.17",
     "apollo-datasource-rest": "^3.7.0",
@@ -32,7 +32,7 @@
     "https": "^1.0.0",
     "morgan": "^1.10.0",
     "nats": "^2.7.1",
-    "neo4j-driver": "^4.4.6",
+    "neo4j-driver": "^5.8.0",
     "node-cache": "^5.1.2",
     "openid-client": "^5.6.1",
     "oracledb": "^6.1.0",

diff --git a/graphql-server/src/schemas/neo4j.ts b/graphql-server/src/schemas/neo4j.ts
@@ -65,14 +65,25 @@ export async function buildNeo4jDbSchema() {
     }
   `;
 
-  const ogm = new OGM({ typeDefs: extendedTypeDefs, driver: neo4jDriver });
+  const features = {
+    filters: {
+      String: {
+        MATCHES: true,
+      },
+    },
+  };
+
+  const ogm = new OGM({
+    typeDefs: extendedTypeDefs,
+    driver: neo4jDriver,
+    features,
+  });
   const neoSchema = new Neo4jGraphQL({
     typeDefs: extendedTypeDefs,
     driver: neo4jDriver,
-    config: {
-      skipValidateTypeDefs: true,
-    },
+    validate: false,
     resolvers: buildResolvers(ogm, client),
+    features,
   });
 
   await ogm.init();

diff --git a/graphql-server/src/utils/oncotree.ts b/graphql-server/src/utils/oncotree.ts
@@ -2,7 +2,7 @@ import fetch from "node-fetch";
 import NodeCache from "node-cache";
 import { props } from "./constants";
 import { InputMaybe, SampleWhere } from "../generated/graphql";
-import { GraphQLWhereArg } from "@neo4j/graphql";
+import { GraphQLWhereArg } from "@neo4j/graphql/dist/types";
 import { neo4jDriver } from "./servers";
 
 /**