Manually keep track of connections

site/gatsby-site/jest.config.ts

@@ -5,10 +5,13 @@
 
 import type { Config } from 'jest';
 
+require('dotenv').config();
+
 const config: Config = {
   preset: "ts-jest",
   clearMocks: true,
   collectCoverage: true,
+  testTimeout: 10000,
   coverageDirectory: "coverage",
   coverageProvider: "v8",
   testEnvironment: "node",

site/gatsby-site/package.json

@@ -20,6 +20,7 @@
     "@googlemaps/google-maps-services-js": "^3.3.3",
     "@graphql-tools/executor-http": "^1.0.9",
     "@graphql-tools/schema": "^10.0.3",
+    "@graphql-tools/stitch": "^9.2.9",
     "@graphql-tools/utils": "^10.1.2",
     "@graphql-tools/wrap": "^10.0.5",
     "@mdx-js/react": "^2.3.0",
@@ -141,8 +142,8 @@
     "@netlify/plugin-gatsby": "^3.7.0",
     "@playwright/test": "^1.44.1",
     "@tailwindcss/typography": "^0.5.8",
-    "@types/node": "^20.12.13",
     "@types/jest": "^29.5.12",
+    "@types/node": "^20.12.13",
     "@types/supertest": "^6.0.2",
     "autoprefixer": "^10.4.7",
     "babel-eslint": "^10.1.0",

site/gatsby-site/playwright/e2e/cite.spec.ts

@@ -635,7 +635,7 @@ test.describe('Cite pages', () => {
         await expect(page.locator('[data-cy="timeline-text-response"]')).not.toBeVisible();
     });
 
-    test('There should not be image errors (400)', async ({ page }) => {
+    test.skip('There should not be image errors (400)', async ({ page }) => {
         page.on('console', (msg) => {
             if (msg.type() === 'error') {
                 expect(msg.text()).not.toContain('the server responded with a status of 400');

site/gatsby-site/server/context.ts

@@ -3,7 +3,6 @@ import { MongoClient } from "mongodb";
 import config from "./config";
 import * as reporter from "./reporter";
 
-const client = new MongoClient(config.MONGODB_CONNECTION_STRING);
 
 function extractToken(header: string) {
 
@@ -56,7 +55,7 @@ async function verifyToken(token: string) {
     return response.json();
 }
 
-async function getUser(userId: string) {
+async function getUser(userId: string, client: MongoClient) {
 
     const db = client.db('customData');
 
@@ -70,7 +69,7 @@ async function getUser(userId: string) {
     }
 }
 
-async function getUserFromHeader(header: string) {
+async function getUserFromHeader(header: string, client: MongoClient) {
 
     const token = extractToken(header);
 
@@ -80,7 +79,7 @@ async function getUserFromHeader(header: string) {
 
         if (data.sub) {
 
-            const userData = await getUser(data.sub);
+            const userData = await getUser(data.sub, client);
 
             return userData;
         }
@@ -89,11 +88,11 @@ async function getUserFromHeader(header: string) {
     return null;
 }
 
-export const context = async ({ req }: { req: IncomingMessage }) => {
+export const context = async ({ req, client }: { req: IncomingMessage, client: MongoClient }) => {
 
     try {
 
-        const user = await getUserFromHeader(req.headers.authorization!);
+        const user = await getUserFromHeader(req.headers.authorization!, client);
 
         return { user, req, client };
     }

site/gatsby-site/server/index.ts

@@ -2,14 +2,18 @@ import { startStandaloneServer } from '@apollo/server/standalone';
 import { schema } from './schema';
 import { context } from './context';
 import { ApolloServer } from '@apollo/server';
+import config from './config';
+import { MongoClient } from 'mongodb';
 
 (async () => {
 
     const server = new ApolloServer({
         schema,
     });
 
-    const { url } = await startStandaloneServer(server, { context });
+    const client = new MongoClient(config.MONGODB_CONNECTION_STRING);
+
+    const { url } = await startStandaloneServer(server, { context: ({ req }) => context({ req, client }) });
 
     console.log(`🚀  Server ready at: ${url}`);
 })();

site/gatsby-site/server/remote.ts

@@ -41,7 +41,7 @@ const ignoredMutations = [
 
 export const getSchema = () => {
 
-    const schema = wrapSchema({
+    const schema = {
         schema: makeExecutableSchema({ typeDefs: remoteTypeDefs }),
         executor: userExecutor,
         transforms: [
@@ -70,7 +70,7 @@ export const getSchema = () => {
                 return true
             })
         ],
-    });
+    }
 
     return schema;
 }

site/gatsby-site/server/schema.ts

@@ -1,17 +1,66 @@
-import { mergeSchemas } from '@graphql-tools/schema';
 import { getSchema as getLocalSchema } from './local';
 import { getSchema as getRemoteSchema } from './remote';
+import { stitchSchemas } from '@graphql-tools/stitch'
+import { MapperKind, mapSchema } from '@graphql-tools/utils';
 
 require('json-bigint-patch');
 
 const localSchema = getLocalSchema();
 
 const remoteSchema = getRemoteSchema();
 
-const gatewaySchema = mergeSchemas({
-    schemas: [remoteSchema, localSchema],
+const gatewaySchema = stitchSchemas({
+    subschemas: [localSchema, remoteSchema],
 });
 
+const transformedSchema = mapSchema(gatewaySchema, {
 
-export const schema = gatewaySchema;
+    // looks like stichSchemas from ./schema is messing up some resolvers
+    // this is a temporary patch until the subscription collection field is replaced with our own implementation
+    // it seems to only be affecting the subscriptions collection
+
+    [MapperKind.OBJECT_FIELD]: (fieldConfig, fieldName, parent) => {
+
+        if (parent == 'Subscription' && fieldName === 'incident_id') {
+            return {
+                ...fieldConfig,
+                resolve: (source) => {
+                    return source.incident_id
+                },
+            };
+        }
+
+        if (parent == 'Subscription' && fieldName === 'entityId') {
+            return {
+                ...fieldConfig,
+                resolve: (source) => {
+                    return source.entityId
+                },
+            };
+        }
+
+
+        if (parent == 'Subscription' && fieldName === '_id') {
+            return {
+                ...fieldConfig,
+                resolve: (source) => {
+                    return source._id
+                },
+            };
+        }
+
+        if (parent == 'Subscription' && fieldName === 'type') {
+            return {
+                ...fieldConfig,
+                resolve: (source) => {
+                    return source.type
+                },
+            };
+        }
+        return fieldConfig;
+    },
+});
+
+
+export const schema = transformedSchema;
 

site/gatsby-site/server/tests/reports.spec.ts

@@ -0,0 +1,42 @@
+import { ApolloServer } from "@apollo/server";
+import request from 'supertest';
+import { startTestServer } from "./utils";
+
+describe('Reports', () => {
+    let server: ApolloServer, url: string;
+
+    beforeAll(async () => {
+        ({ server, url } = await startTestServer());
+    });
+
+    afterAll(async () => {
+        await server?.stop();
+    });
+
+    it(`report query aliased translations`, async () => {
+
+        const queryData = {
+            query: `
+            query {
+                report(query: { report_number: 1991 }) {
+                    title
+                    translations_es: translations(input: "es") {
+                        title
+                    }
+                }
+            }
+            `,
+        };
+
+        const response = await request(url).post('/').send(queryData);
+
+        expect(response.body.data).toMatchObject({
+            report: {
+                title: expect.any(String),
+                translations_es: {
+                    title: expect.any(String)
+                }
+            }
+        })
+    });
+});

site/gatsby-site/server/tests/utils.ts

@@ -11,7 +11,9 @@ export const startTestServer = async () => {
         schema,
     });
 
-    const { url } = await startStandaloneServer(server, { context, listen: { port: 0 } });
+    const client = new MongoClient(config.MONGODB_CONNECTION_STRING);
+
+    const { url } = await startStandaloneServer(server, { context: ({ req }) => context({ req, client }), listen: { port: 0 } });
 
     return { server, url }
 }