remove tests for combined keys, refactor

Author: phryneas

__tests__/__fixtures__/federatedServiceExtendingUser.ts

@@ -8,8 +8,8 @@ const typeDefs = gql`
     empty: ID
   }
 
-  extend type User @key(fields: "id") {
-    id: Int! @external
+  extend type User @key(fields: "nodeId") {
+    nodeId: ID! @external
     firstName: String! @external
     lastName: String! @external
     fullName: String! @requires(fields: "firstName lastName")

__tests__/__snapshots__/schema.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`schema and _service.sdl: _service.sdl 1`] = `
-"type Email implements Node @key(fields: \\"id\\") @key(fields: \\"nodeId\\") {
+"type Email implements Node @key(fields: \\"nodeId\\") {
   \\"A globally unique identifier. Can be used in various places throughout the system to identify this single value.\\"
   nodeId: ID!
   id: Int!
@@ -111,7 +111,7 @@ type Query {
   ): UsersEmail
 }
 
-type User implements Node @key(fields: \\"id\\") @key(fields: \\"nodeId\\") {
+type User implements Node @key(fields: \\"nodeId\\") {
   \\"A globally unique identifier. Can be used in various places throughout the system to identify this single value.\\"
   nodeId: ID!
   id: Int!
@@ -140,7 +140,7 @@ input UserCondition {
   lastName: String
 }
 
-type UsersEmail implements Node @key(fields: \\"userId emailId\\") @key(fields: \\"nodeId\\") {
+type UsersEmail implements Node @key(fields: \\"nodeId\\") {
   \\"A globally unique identifier. Can be used in various places throughout the system to identify this single value.\\"
   nodeId: ID!
   userId: Int!

__tests__/integration.test.ts

@@ -3,9 +3,10 @@ import * as http from "http";
 import { postgraphile } from "postgraphile";
 import { ApolloGateway } from "@apollo/gateway";
 import { startFederatedServiceExtendingUser } from "./__fixtures__/federatedServiceExtendingUser";
-import { ApolloServer } from "apollo-server";
+import { ApolloServer, ServerInfo } from "apollo-server";
 import * as pg from "pg";
 import axios from "axios";
+import { GraphQLSchema } from "graphql";
 
 let pgPool: pg.Pool | null;
 
@@ -51,9 +52,25 @@ function toUrl(
     : `http://${obj.address}:${obj.port}`;
 }
 
-test("federated service", async () => {
+async function withFederatedExternalServices(
+  startExternalServices: {
+    [serviceName: string]: () => ApolloServer | Promise<ApolloServer>;
+  },
+  cb: (_: { serverInfo: ServerInfo; schema: GraphQLSchema }) => Promise<any>
+) {
   const postgraphileServer = await startPostgraphile();
-  const serviceExtendingUser = startFederatedServiceExtendingUser();
+  const externalServices = await Promise.all(
+    Object.entries(startExternalServices).map(
+      async ([name, serviceBuilder]) => {
+        const service = await serviceBuilder();
+        return {
+          name,
+          service,
+          url: toUrl(await service.listen({ port: 0, host: "127.0.0.1" })),
+        };
+      }
+    )
+  );
   let server: ApolloServer | undefined;
 
   try {
@@ -62,48 +79,55 @@ test("federated service", async () => {
         name: "postgraphile",
         url: toUrl(postgraphileServer.address()!) + "/graphql",
       },
-      {
-        name: "serviceExtendingUser",
-        url: toUrl(
-          await serviceExtendingUser.listen({ port: 0, host: "127.0.0.1" })
-        ),
-      },
+      ...externalServices,
     ];
 
     const { schema, executor } = await new ApolloGateway({
       serviceList,
     }).load();
 
-    expect(schema).toMatchSnapshot("federated schema");
-
     server = new ApolloServer({
       schema,
       executor,
     });
 
-    const running = await server.listen({ port: 0, host: "127.0.0.1" });
-
-    debugger;
-    const result = await axios.post(running.url, {
-      query: `{ allUsersList(first: 1) { firstName, lastName, fullName} }`,
-    });
+    const serverInfo = await server.listen({ port: 0, host: "127.0.0.1" });
 
-    expect(result.data).toMatchObject({
-      data: {
-        allUsersList: [
-          {
-            firstName: "alicia",
-            fullName: "alicia keys",
-            lastName: "keys",
-          },
-        ],
-      },
-    });
+    await cb({ serverInfo, schema });
   } finally {
     await postgraphileServer.close();
-    await serviceExtendingUser.stop();
+    for (const external of externalServices) {
+      await external.service.stop();
+    }
     if (server) {
       await server.stop();
     }
   }
+}
+
+test("federated service", async () => {
+  await withFederatedExternalServices(
+    {
+      serviceExteningUser: startFederatedServiceExtendingUser,
+    },
+    async ({ serverInfo, schema }) => {
+      expect(schema).toMatchSnapshot("federated schema");
+
+      const result = await axios.post(serverInfo.url, {
+        query: `{ allUsersList(first: 1) { firstName, lastName, fullName} }`,
+      });
+
+      expect(result.data).toMatchObject({
+        data: {
+          allUsersList: [
+            {
+              firstName: "alicia",
+              fullName: "alicia keys",
+              lastName: "keys",
+            },
+          ],
+        },
+      });
+    }
+  );
 });