node 20 updates

__test__/backend.test.js

@@ -1,7 +1,6 @@
 import { isSqlite } from "../src/server/models/";
 import { resolvers } from "../src/server/api/schema";
-import { schema } from "../src/api/schema";
-import { assignmentRequiredOrAdminRole } from "../src/server/api/errors";
+import { schema as apiSchema } from "../src/api/schema";
 import { graphql } from "graphql";
 
 console.log("This is an intentional error");
@@ -28,12 +27,11 @@ import {
   createInvite as helperCreateInvite,
   runGql
 } from "./test_helpers";
-import { makeExecutableSchema } from "graphql-tools";
-
+import { makeExecutableSchema } from "@graphql-tools/schema";
 import { editUserMutation } from "../src/containers/UserEdit.jsx";
 
-const mySchema = makeExecutableSchema({
-  typeDefs: schema,
+const schema = makeExecutableSchema({
+  typeDefs: apiSchema,
   resolvers,
   allowUndefinedInResolve: true
 });
@@ -97,9 +95,14 @@ async function createInvite() {
       id
     }
   }`;
-  const context = getContext();
+  const contextValue = getContext();
   try {
-    const invite = await graphql(mySchema, inviteQuery, rootValue, context);
+    const invite = await graphql({
+      schema,
+      source: inviteQuery,
+      rootValue,
+      contextValue
+    });
     return invite;
   } catch (err) {
     console.error("Error creating invite");
@@ -108,7 +111,7 @@ async function createInvite() {
 }
 
 async function createOrganization(user, name, userId, inviteId) {
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
   const orgQuery = `mutation createOrganization($name: String!, $userId: String!, $inviteId: String!) {
     createOrganization(name: $name, userId: $userId, inviteId: $inviteId) {
@@ -121,20 +124,20 @@ async function createOrganization(user, name, userId, inviteId) {
     }
   }`;
 
-  const variables = {
+  const variableValues = {
     userId,
     name,
     inviteId
   };
 
   try {
-    const org = await graphql(
-      mySchema,
-      orgQuery,
+    const org = await graphql({
+      schema,
+      source: orgQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue,
+      variableValues
+    });
     return org;
   } catch (err) {
     console.error("Error creating organization");
@@ -143,15 +146,15 @@ async function createOrganization(user, name, userId, inviteId) {
 }
 
 async function createCampaign(user, title, description, organizationId) {
-  const context = getContext({ user });
+  const contextValue = getContext({ user });
 
   const campaignQuery = `mutation createCampaign($input: CampaignInput!) {
     createCampaign(campaign: $input) {
       id
       title
     }
   }`;
-  const variables = {
+  const variableValues = {
     input: {
       title,
       description,
@@ -160,13 +163,13 @@ async function createCampaign(user, title, description, organizationId) {
   };
 
   try {
-    const campaign = await graphql(
-      mySchema,
-      campaignQuery,
+    const campaign = await graphql({
+      schema,
+      source: campaignQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue,
+      variableValues
+    });
     return campaign;
   } catch (err) {
     console.error("Error creating campaign");
@@ -192,8 +195,13 @@ describe("graphql test suite", () => {
         id
       }
     }`;
-    const context = getContext();
-    const result = await graphql(mySchema, query, rootValue, context);
+    const contextValue = getContext();
+    const result = await graphql({
+      schema,
+      source: query,
+      rootValue,
+      contextValue
+    });
     const data = result;
 
     expect(typeof data.currentUser).toEqual("undefined");
@@ -206,8 +214,13 @@ describe("graphql test suite", () => {
         email
       }
     }`;
-    const context = getContext({ user: testAdminUser });
-    const result = await graphql(mySchema, query, rootValue, context);
+    const contextValue = getContext({ user: testAdminUser });
+    const result = await graphql({
+      schema,
+      source: query,
+      rootValue,
+      contextValue
+    });
     const { data } = result;
 
     expect(data.currentUser.email).toBe("testuser@example.com");
@@ -301,29 +314,29 @@ describe("graphql test suite", () => {
         }
       }
     }`;
-    const context = getContext({ user: testAdminUser });
+    const contextValue = getContext({ user: testAdminUser });
     const updateCampaign = Object.assign({}, testCampaign.data.createCampaign);
     const campaignId = updateCampaign.id;
     testTexterUser = await helperCreateTexter(testOrganization);
 
     updateCampaign.texters = [
       {
-        id: testTexterUser.id
+        id: testTexterUser.id.toString()
       }
     ];
     delete updateCampaign.id;
     delete updateCampaign.contacts;
-    const variables = {
+    const variableValues = {
       campaignId,
       campaign: updateCampaign
     };
-    const result = await graphql(
-      mySchema,
-      campaignEditQuery,
+    const result = await graphql({
+      schema,
+      source: campaignEditQuery,
       rootValue,
-      context,
-      variables
-    );
+      contextValue,
+      variableValues
+    });
 
     expect(result.data.editCampaign.texters.length).toBe(1);
     expect(result.data.editCampaign.texters[0].assignment.contactsCount).toBe(

__test__/components/AssignmentSummary.test.js

@@ -5,7 +5,7 @@ import React from "react";
 import { mount } from "enzyme";
 import { StyleSheetTestUtils } from "aphrodite";
 import each from "jest-each";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import ApolloClientSingleton from "../../src/network/apollo-client-singleton";
 import { AssignmentSummaryBase as AssignmentSummary } from "../../src/components/AssignmentSummary";
 import Badge from "@material-ui/core/Badge";

__test__/components/IncomingMessageList/ConversationPreviewModal.test.js

@@ -3,15 +3,12 @@
  */
 import React from "react";
 import { mount } from "enzyme";
-import ConversationPreviewModal, {
-  InnerConversationPreviewModal
-} from "../../../src/components/IncomingMessageList/ConversationPreviewModal";
+import { InnerConversationPreviewModal } from "../../../src/components/IncomingMessageList/ConversationPreviewModal";
 import { prepareDataTableData } from "../../../src/components/IncomingMessageList";
 
 import ReactTestUtils from "react-dom/test-utils";
-import { createMemoryHistory } from "react-router";
 import ApolloClientSingleton from "../../../src/network/apollo-client-singleton";
-import { ApolloProvider } from "react-apollo";
+import { ApolloProvider } from "@apollo/client";
 import Dialog from "@material-ui/core/Dialog";
 
 import { r } from "../../../src/server/models";

__test__/extensions/message-handlers/profanity-tagger.test.js

@@ -63,10 +63,10 @@ describe("Message Hanlder: profanity-tagger", () => {
 
     // SEND
     await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "brass shoe eddie homonym",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
     // a little stupidly updating messageservice_sid is necessary
     // because it's not await'd
@@ -127,10 +127,10 @@ describe("Message Hanlder: profanity-tagger", () => {
 
     // Confirm texter catch
     await sendMessage(c.testContacts[0].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[0].cell,
       text: "Some fakeslur message",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
     const text1 = await r
       .knex("tag_campaign_contact")
@@ -147,10 +147,10 @@ describe("Message Hanlder: profanity-tagger", () => {
 
     // Confirm texter no-match
     await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "brass shoe eddie homonym",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
     const text2 = await r
       .knex("tag_campaign_contact")
@@ -167,10 +167,10 @@ describe("Message Hanlder: profanity-tagger", () => {
 
     // Confirm texter no-match
     await sendMessage(c.testContacts[1].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[1].cell,
       text: "fakeslur is one too many slurs",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
     user = await cacheableData.user.userHasRole(
       c.testTexterUser,
@@ -210,10 +210,10 @@ describe("Message Hanlder: profanity-tagger", () => {
 
     // Confirm texter catch
     await sendMessage(c.testContacts[0].id, c.testTexterUser, {
-      userId: c.testTexterUser.id,
+      userId: c.testTexterUser.id.toString(),
       contactNumber: c.testContacts[0].cell,
       text: "Some fakeslur message",
-      assignmentId: c.assignmentId
+      assignmentId: c.assignmentId.toString()
     });
     const text1 = await r
       .knex("tag_campaign_contact")

__test__/lib.test.js

@@ -2,7 +2,7 @@ import { resolvers } from "../src/server/api/schema";
 import { schema } from "../src/api/schema";
 import twilio from "../src/extensions/service-vendors/twilio";
 import { getConfig, hasConfig } from "../src/server/api/lib/config";
-import { makeExecutableSchema } from "graphql-tools";
+import { makeExecutableSchema } from "@graphql-tools/schema";
 
 const mySchema = makeExecutableSchema({
   typeDefs: schema,