[skip ci] Upgrade Apollo Server

graphql/index.ts

@@ -1,4 +1,6 @@
-import { ApolloServer, gql } from "apollo-server";
+import { ApolloServer } from "@apollo/server";
+import { startStandaloneServer } from "@apollo/server/standalone";
+import gql from "graphql-tag";
 import GraphQLJSON, { GraphQLJSONObject } from "graphql-type-json";
 import macros from "../utils/macros";
 
@@ -61,12 +63,13 @@ const server = new ApolloServer({
     searchResolvers,
     termInfoResolvers,
   ],
-  debug: true,
+  // debug: true,
 });
 
 if (require.main === module) {
-  server
-    .listen()
+  startStandaloneServer(server, {
+    listen: { port: 3000 },
+  })
     .then(({ url }) => {
       macros.log(`ready at ${url}`);
       return;

graphql/resolvers/major.ts

@@ -1,13 +1,17 @@
-import { UserInputError } from "apollo-server";
 import prisma from "../../services/prisma";
 import { Major as PrismaMajor } from "@prisma/client";
+import { GraphQLError } from "graphql";
 
 const noResultsError = (recordType): never => {
-  throw new UserInputError(`${recordType} not found!`);
+  throw new GraphQLError(`${recordType} not found!`, {
+    extensions: {
+      code: "BAD_USER_INPUT",
+    },
+  });
 };
 
 const getLatestMajorOccurrence = async (
-  majorId: string
+  majorId: string,
 ): Promise<PrismaMajor> => {
   const majors: PrismaMajor[] = await prisma.major.findMany({
     where: { majorId: majorId },

graphql/tests/class.test.seq.ts

@@ -2,8 +2,8 @@
  * This file is part of Search NEU and licensed under AGPL3.
  * See the license file in the root folder for details.
  */
-import { gql } from "apollo-server";
-import { GraphQLResponse } from "apollo-server-core";
+import gql from "graphql-tag";
+import { GraphQLResponse } from "@apollo/server";
 import { DocumentNode, GraphQLError } from "graphql";
 import prisma from "../../services/prisma";
 import server from "../index";
@@ -164,11 +164,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`
-      )
+        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`,
+      ),
     );
   });
 
@@ -187,10 +191,13 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors).toBeUndefined();
+    expect(res.body.singleResult.errors).toBeUndefined();
     // This doesn't throw an error - it just omits any classes for which we have no data
-    expect(res?.data).toEqual({
+    expect(res.body.singleResult.data).toEqual({
       bulkClasses: [],
     });
   });
@@ -207,12 +214,15 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`
-      )
+        `We couldn't find any occurrences of a class with subject 'CS' and class ID '2510'`,
+      ),
     );
   });
 
@@ -229,11 +239,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a course matching the term '202310', subject 'CS', and class ID '2500'"
-      )
+        "We couldn't find a course matching the term '202310', subject 'CS', and class ID '2500'",
+      ),
     );
   });
 
@@ -248,11 +262,15 @@ describe("returns errors for non-existant classes", () => {
       `,
     });
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a course matching the hash 'neu.edu/202310/CS/2500'"
-      )
+        "We couldn't find a course matching the hash 'neu.edu/202310/CS/2500'",
+      ),
     );
   });
 
@@ -266,12 +284,15 @@ describe("returns errors for non-existant classes", () => {
         }
       `,
     });
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
 
-    expect(res?.errors?.length).toBe(1);
-    expect(res?.errors?.[0]).toEqual(
+    expect(res.body.singleResult.errors.length).toBe(1);
+    expect(res.body.singleResult.errors?.[0]).toEqual(
       new GraphQLError(
-        "We couldn't find a section matching the hash 'neu.edu/201830/CS/2500/123456'"
-      )
+        "We couldn't find a section matching the hash 'neu.edu/201830/CS/2500/123456'",
+      ),
     );
   });
 });

graphql/tests/major.test.seq.ts

@@ -1,8 +1,8 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import prisma from "../../services/prisma";
 import server from "../index";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 const query = async (queryBody: {
   query: string | DocumentNode;

graphql/tests/search.test.seq.ts

@@ -1,10 +1,10 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import { mocked } from "jest-mock";
 import searcher from "../../services/searcher";
 import server from "../index";
 import { Course, Requisite, Section } from "../../types/types";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 jest.mock("../../services/searcher");
 
@@ -208,7 +208,12 @@ describe("search resolver", () => {
       10,
       {},
     ]);
-    expect(res.data.search).toEqual({
+
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    expect(res.body.singleResult.data.search).toEqual({
       totalCount: 1,
       pageInfo: { hasNextPage: false },
     });

graphql/typeDefs/class.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/classOccurrence.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type ClassOccurrence {

graphql/typeDefs/employee.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type Employee {

graphql/typeDefs/major.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/majorOccurrence.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   type MajorOccurrence {

graphql/typeDefs/search.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

graphql/typeDefs/termInfo.js

@@ -1,4 +1,4 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 
 const typeDef = gql`
   extend type Query {

package.json

@@ -78,6 +78,7 @@
     "fs-extra": "11.2.0",
     "got": "14.4.2",
     "graphql": "^16.3.0",
+    "graphql-tag": "^2.12.6",
     "graphql-type-json": "^0.3.0",
     "he": "^1.2.0",
     "jsonwebtoken": "^9.0.0",

tests/end_to_end/search.test.git.ts

@@ -1,7 +1,7 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import server from "../../graphql/index";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 async function query(q: DocumentNode): Promise<GraphQLResponse> {
   return await server.executeOperation({ query: q });
@@ -24,6 +24,11 @@ describe("Searching for courses", () => {
               }
           `);
 
+      if (res.body.kind !== "single") {
+        fail("incorrect graphql response kind");
+      }
+
+      // @ts-ignore - added since singleResult is implicitly an unknown
       const result = res.data?.search.nodes ?? [];
       expect(result.length).toBe(1);
       expect(result[0].name).toBe("Fundamentals of Computer Science 1");
@@ -45,6 +50,11 @@ describe("Searching for courses", () => {
               }
           `);
 
+      if (res.body.kind !== "single") {
+        fail("incorrect graphql response kind");
+      }
+
+      // @ts-ignore - added since singleResult is implicitly an unknown
       const result = res.data?.search?.nodes;
       expect(result.length).toBeGreaterThan(0);
     }
@@ -65,6 +75,11 @@ describe("Searching for courses", () => {
               }
           `);
 
+      if (res.body.kind !== "single") {
+        fail("incorrect graphql response kind");
+      }
+
+      // @ts-ignore - added since singleResult is implicitly an unknown
       const result = res.data?.search?.nodes;
       expect(result.length).toBe(0);
     }
@@ -85,6 +100,11 @@ describe("Searching for courses", () => {
       }
     `);
 
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    // @ts-ignore - added since singleResult is implicitly an unknown
     const name = res.data?.search.nodes[0].name;
     expect(name).toMatch(/Fundamentals of Computer Science.*/);
   });
@@ -107,6 +127,11 @@ describe("Searching for professors", () => {
       }
     `);
 
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    // @ts-ignore - added since singleResult is implicitly an unknown
     const obj = res.data?.search.nodes[0];
     expect(obj.firstName).toBe("Matthias");
     expect(obj.lastName).toBe("Felleisen");
@@ -127,6 +152,11 @@ describe("Searching for professors", () => {
       }
     `);
 
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    // @ts-ignore - added since singleResult is implicitly an unknown
     const obj2 = res2.data?.search.nodes[0];
     expect(obj2.name).toBe("Jeff Burds");
   });

tests/end_to_end/setup.test.git.ts

@@ -1,8 +1,8 @@
-import { gql } from "apollo-server";
+import gql from "graphql-tag";
 import prisma from "../../services/prisma";
 import server from "../../graphql/index";
 import { DocumentNode } from "graphql";
-import { GraphQLResponse } from "apollo-server-core";
+import { GraphQLResponse } from "@apollo/server";
 
 const NUM_TERMIDS = 3;
 const NUMS_COURSES = {
@@ -37,7 +37,13 @@ describe("TermID setup", () => {
         }
       }
     `);
-    expect(res.data?.termInfos.length).toBe(NUM_TERMIDS);
+
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    // @ts-ignore - added since singleResult is implicitly an unknown
+    expect(res.body.singleResult.termInfos.length).toBe(NUM_TERMIDS);
   });
 
   test("The termIDs in the database match those in GraphQL", async () => {
@@ -50,6 +56,12 @@ describe("TermID setup", () => {
         }
       }
     `);
+
+    if (res.body.kind !== "single") {
+      fail("incorrect graphql response kind");
+    }
+
+    // @ts-ignore - added since singleResult is implicitly an unknown
     const gqlTermInfos = res.data?.termInfos.map((t) => t.termId).sort();
 
     const dbTermInfos = (
@@ -105,7 +117,13 @@ describe("Course and section setup", () => {
           }
         }
       `);
+
+      if (res.body.kind !== "single") {
+        fail("incorrect graphql response kind");
+      }
+
       // It won't exactly match the number we have, but at least make sure we have SOMETHING
+      // @ts-ignore - added since singleResult is implicitly an unknown
       expect(res.data?.search.totalCount).toBeGreaterThan(0);
     }
   });