tests

4 files changed, 39 insertions, 121 deletions

diff --git a/backend/src/createServer.js b/backend/src/createServer.js
new file mode 100644
index 0000000..57518b2
--- /dev/null
+++ b/backend/src/createServer.js
@@ -0,0 +1,30 @@
+const { GraphQLServer } = require('graphql-yoga');
+const { Prisma } = require('prisma-binding');
+require('dotenv').config();
+
+const Mutation = require('./resolvers/Mutation');
+const Query = require('./resolvers/Query');
+const AuthPayload = require('./resolvers/AuthPayload');
+
+function createServer() {
+  return new GraphQLServer({
+    typeDefs: 'src/schema.graphql',
+    resolvers: {
+      // detail resolvers
+      Mutation,
+      Query,
+      AuthPayload,
+    },
+    context: req => ({
+      ...req,
+      db: new Prisma({
+        typeDefs: 'src/generated/prisma.graphql',
+        endpoint: process.env.PRISMA_ENDPOINT, // the endpoint of the Prisma DB service (value is set in .env)
+        secret: process.env.PRISMA_SECRET, // taken from database/prisma.yml (value is set in .env)
+        debug: false, // log all GraphQL queries & mutations
+      }),
+    }),
+  });
+}
+
+module.exports = createServer;
diff --git a/backend/src/index.js b/backend/src/index.js
index 522fcfe..a37e1f7 100644
--- a/backend/src/index.js
+++ b/backend/src/index.js
@@ -1,36 +1,8 @@
-const { GraphQLServer } = require('graphql-yoga');
-const { Prisma } = require('prisma-binding');
+const createServer = require('./createServer');
 
-const Mutation = require('./resolvers/Mutation');
-const Query = require('./resolvers/Query');
-const AuthPayload = require('./resolvers/AuthPayload');
+const server = createServer();
 
-const server = new GraphQLServer({
-  typeDefs: 'src/schema.graphql',
-  resolvers: {
-    // detail resolvers
-    Mutation,
-    Query,
-    AuthPayload,
-  },
-  context: req => ({
-    ...req,
-    db: new Prisma({
-      typeDefs: 'src/generated/prisma.graphql',
-      endpoint: process.env.PRISMA_ENDPOINT, // the endpoint of the Prisma DB service (value is set in .env)
-      secret: process.env.PRISMA_SECRET, // taken from database/prisma.yml (value is set in .env)
-      debug: false, // log all GraphQL queries & mutations
-    }),
-  }),
-});
-
-// // This is an example of custom express middlware
-// server.express.use((req, res, next) => {
-//   // console.log("Hi I'm middlware");
-//   next();
-// });
-
-server.start(deets => {
+server.start({ port: 4444 }, deets => {
   console.log(`Server is running on http://localhost:${deets.port}`);
 });
 
diff --git a/backend/src/resolvers/Mutation.js b/backend/src/resolvers/Mutation.js
index 6eeab7c..3d9ebb8 100644
--- a/backend/src/resolvers/Mutation.js
+++ b/backend/src/resolvers/Mutation.js
@@ -66,68 +66,6 @@ const mutations = {
     });
   },
 
-  // async createDraft(parent, { title, text }, ctx, info) {
-  //   // const userId = getUserId(ctx);
-  //   const userId = getUserId(ctx);
-  //   return ctx.db.mutation.createPost(
-  //     {
-  //       data: {
-  //         title,
-  //         text,
-  //         isPublished: false,
-  //         author: {
-  //           connect: { id: userId },
-  //         },
-  //       },
-  //     },
-  //     info
-  //   );
-  // },
-
-  // async publish(parent, { id }, ctx, info) {
-  //   const userId = getUserId(ctx);
-  //   const postExists = await ctx.db.exists.Post({
-  //     id,
-  //     author: { id: userId },
-  //   });
-  //   if (!postExists) {
-  //     throw new Error(`Post not found or you're not the author`);
-  //   }
-
-  //   return ctx.db.mutation.updatePost(
-  //     {
-  //       where: { id },
-  //       data: { isPublished: true },
-  //     },
-  //     info
-  //   );
-  // },
-
-  // async deletePost(parent, { id }, ctx, info) {
-  //   const userId = getUserId(ctx);
-  //   const postExists = await ctx.db.exists.Post({
-  //     id,
-  //     author: { id: userId },
-  //   });
-  //   if (!postExists) {
-  //     throw new Error(`Post not found or you're not the author`);
-  //   }
-
-  //   return ctx.db.mutation.deletePost({ where: { id } });
-  // },
-
-  // // Wes Added this brand new one!
-  // async updatePost(parent, args, ctx, info) {
-  //   const updatedPost = await ctx.db.mutation.updatePost({
-  //     where: { id: args.id },
-  //     data: {
-  //       title: args.title,
-  //       text: args.text,
-  //     },
-  //   });
-  //   return updatedPost;
-  // },
-
   // Send password request
   async requestReset(parent, args, ctx, info) {
     // 1. find if there is a user with that email
@@ -307,18 +245,15 @@ const mutations = {
     // 6. Clean up, clear the users cart adn send back { user, order }
     // Delete the users current cart items
     const cartItemIds = user.cart.map(cartItem => cartItem.id);
-    const deletedCartItems = await ctx.db.mutation.deleteManyCartItems({
+    await ctx.db.mutation.deleteManyCartItems({
       where: {
         id_in: cartItemIds,
       },
     });
 
-    console.l('--------ORDER-------------');
-    console.log(order);
-    console.l('--------ORDER-------------');
+    // 5. Send the order back to the client
     return order;
-    // 4. Send an email with their order
-    // 5. Send the order back
+    // 4. TODO: Send an email with their order
   },
   async updateUser(parent, args, ctx, info) {
     const userId = getUserId(ctx);
diff --git a/backend/src/resolvers/Query.js b/backend/src/resolvers/Query.js
index 262517a..2aa4f5c 100644
--- a/backend/src/resolvers/Query.js
+++ b/backend/src/resolvers/Query.js
@@ -8,31 +8,11 @@ const Query = {
   },
 
   itemsConnection: forwardTo('db'),
-  order: forwardTo('db'),
-
-  // feed(parent, args, ctx, info) {
-  //   return ctx.db.query.posts({}, info);
-  // },
-
-  // drafts(parent, args, ctx, info) {
-  //   // const id = getUserId(ctx);
-
-  //   const where = {
-  //     isPublished: false,
-  //     // author: {
-  //     //   id,
-  //     // },
-  //   };
 
-  //   return ctx.db.query.posts({ where }, info);
-  // },
-
-  // post(parent, { id }, ctx, info) {
-  //   return ctx.db.query.post({ where: { id } }, info);
-  // },
+  // TODO: Make sure they own this order before looking it up
+  order: forwardTo('db'),
 
   me(parent, args, ctx, info) {
-    console.l('me!');
     const Authorization = ctx.request.get('Authorization');
     if (!Authorization || Authorization === 'null') {
       console.log('Authorization is null');
@@ -41,6 +21,7 @@ const Query = {
     const id = getUserId(ctx);
     return ctx.db.query.user({ where: { id } }, info);
   },
+
   async orders(parent, args, ctx, info) {
     const userId = getUserId(ctx);
     return ctx.db.query.orders(