Refactor schema composition

Sashko Stubailo · Sashko Stubailo · commit 00cb43fa0992 · 2016-09-06T12:31:03.000-07:00
diff --git a/api/index.js b/api/index.js
@@ -1,7 +1,6 @@
 import path from 'path';
 import express from 'express';
 import { apolloExpress, graphiqlExpress } from 'apollo-server';
-import { makeExecutableSchema } from 'graphql-tools';
 import bodyParser from 'body-parser';
 
 import {
@@ -10,11 +9,12 @@ import {
 } from './githubKeys';
 
 import { setUpGitHubLogin } from './githubLogin';
-import { schema, resolvers } from './schema';
 import { GitHubConnector } from './github/connector';
 import { Repositories, Users } from './github/models';
 import { Entries, Comments } from './sql/models';
 
+import executableSchema from './schema';
+
 let PORT = 3010;
 if (process.env.PORT) {
   PORT = parseInt(process.env.PORT, 10) + 100;
@@ -27,11 +27,6 @@ app.use(bodyParser.json());
 
 setUpGitHubLogin(app);
 
-const executableSchema = makeExecutableSchema({
-  typeDefs: schema,
-  resolvers,
-});
-
 app.use('/graphql', apolloExpress((req) => {
   // Get the query, the same way express-graphql does it
   // https://github.com/graphql/express-graphql/blob/3fa6e68582d6d933d37fa9e841da5d2aa39261cd/src/index.js#L257
@@ -73,6 +68,17 @@ app.use('/graphql', apolloExpress((req) => {
 
 app.use('/graphiql', graphiqlExpress({
   endpointURL: '/graphql',
+  query: `{
+  feed (type: NEW, limit: 5) {
+    repository {
+      owner { login }
+      name
+    }
+
+    postedBy { login }
+  }
+}
+`,
 }));
 
 // Serve our helpful static landing page. Not used in production.
diff --git a/api/schema.js b/api/schema.js
@@ -1,8 +1,10 @@
 import { merge } from 'lodash';
 import { schema as gitHubSchema, resolvers as gitHubResolvers } from './github/schema';
 import { schema as sqlSchema, resolvers as sqlResolvers } from './sql/schema';
+import { makeExecutableSchema } from 'graphql-tools';
 
 const rootSchema = [`
+
 # To select the sort order of the feed
 enum FeedType {
   HOT
@@ -43,6 +45,7 @@ schema {
   query: Query
   mutation: Mutation
 }
+
 `];
 
 const rootResolvers = {
@@ -116,5 +119,12 @@ const rootResolvers = {
   },
 };
 
-export const schema = [...rootSchema, ...gitHubSchema, ...sqlSchema];
-export const resolvers = merge(rootResolvers, gitHubResolvers, sqlResolvers);
+const schema = [...rootSchema, ...gitHubSchema, ...sqlSchema];
+const resolvers = merge(rootResolvers, gitHubResolvers, sqlResolvers);
+
+const executableSchema = makeExecutableSchema({
+  typeDefs: schema,
+  resolvers,
+});
+
+export default executableSchema;
