Merge pull request #226 from oskarhane/fix-driver-datetime-issue

Fix temporal type issues with [email protected]
neo4j · May 28, 2021 · 1591800 · 1591800
2 parents dda2561 + b8c82e0
commit 1591800
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/packages/graphql/src/schema/scalars/DateTime.ts b/packages/graphql/src/schema/scalars/DateTime.ts
@@ -18,15 +18,15 @@
  */
 
 import { GraphQLScalarType } from "graphql";
-import { DateTime as Neo4jDateTime } from "neo4j-driver/lib/temporal-types";
+import neo4j from "neo4j-driver";
 
 export default new GraphQLScalarType({
     name: "DateTime",
     description: "A date and time, represented as an ISO-8601 string",
-    serialize: (value: Neo4jDateTime) => {
+    serialize: (value: typeof neo4j.types.DateTime) => {
         return new Date(value.toString()).toISOString();
     },
     parseValue: (value: string) => {
-        return Neo4jDateTime.fromStandardDate(new Date(value));
+        return neo4j.types.DateTime.fromStandardDate(new Date(value));
     },
 });
diff --git a/packages/graphql/tests/integration/types/datetime.int.test.ts b/packages/graphql/tests/integration/types/datetime.int.test.ts
@@ -18,8 +18,7 @@
  */
 
 import camelCase from "camelcase";
-import { Driver } from "neo4j-driver";
-import { DateTime } from "neo4j-driver/lib/temporal-types";
+import neo4jDriver, { Driver } from "neo4j-driver";
 import { graphql } from "graphql";
 import { generate } from "randomstring";
 import pluralize from "pluralize";
@@ -82,7 +81,10 @@ describe("DateTime", () => {
                     RETURN m {.id, .datetime} as m
                 `);
 
-                const movie: { id: string; datetime: DateTime } = (result.records[0].toObject() as any).m;
+                const movie: {
+                    id: string;
+                    datetime: typeof neo4jDriver.types.DateTime;
+                } = (result.records[0].toObject() as any).m;
 
                 expect(movie.id).toEqual(id);
                 expect(new Date(movie.datetime.toString()).toISOString()).toEqual(date.toISOString());
@@ -135,7 +137,10 @@ describe("DateTime", () => {
                     RETURN m {.id, .datetimes} as m
                 `);
 
-                const movie: { id: string; datetimes: DateTime[] } = (result.records[0].toObject() as any).m;
+                const movie: {
+                    id: string;
+                    datetimes: typeof neo4jDriver.types.DateTime[];
+                } = (result.records[0].toObject() as any).m;
 
                 expect(movie.id).toEqual(id);
 
@@ -178,7 +183,7 @@ describe("DateTime", () => {
                 }
             `;
 
-            const nDateTime = DateTime.fromStandardDate(date);
+            const nDateTime = neo4jDriver.types.DateTime.fromStandardDate(date);
 
             try {
                 await session.run(
@@ -303,7 +308,10 @@ describe("DateTime", () => {
                     RETURN m {.id, .datetime} as m
                 `);
 
-                const movie: { id: string; datetime: DateTime } = (result.records[0].toObject() as any).m;
+                const movie: {
+                    id: string;
+                    datetime: typeof neo4jDriver.types.DateTime;
+                } = (result.records[0].toObject() as any).m;
 
                 expect(movie.id).toEqual(id);
                 expect(new Date(movie.datetime.toString()).toISOString()).toEqual(date.toISOString());