From dcf7f7158003bca8292cdffe9d29f0e217fc1f2a Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Sun, 14 Jun 2020 21:05:20 +0300
Subject: [PATCH] upd

---
 server/models/Category.js             |  1 -
 server/models/Todo.js                 |  1 -
 server/resolvers/categoryResolvers.js |  5 ++---
 server/resolvers/todoResolvers.js     |  3 +--
 server/server.js                      | 12 +++++++++++-
 server/typeDefs/mutation.js           |  6 +++---
 server/typeDefs/types/categoryType.js |  1 -
 server/typeDefs/types/todoType.js     |  1 -
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/server/models/Category.js b/server/models/Category.js
index a59d1c8..9a11959 100644
--- a/server/models/Category.js
+++ b/server/models/Category.js
@@ -2,7 +2,6 @@ const mongoose = require('mongoose')
 
 const categorySchema = new mongoose.Schema({
   title: String,
-  description: String,
   createdAt: String,
   updatedAt: String,
 })
diff --git a/server/models/Todo.js b/server/models/Todo.js
index 7be3e8e..f85665e 100644
--- a/server/models/Todo.js
+++ b/server/models/Todo.js
@@ -5,7 +5,6 @@ const todoSchema = mongoose.Schema({
   description: String,
   createdAt: String,
   updatedAt: String,
-  status: String,
   deadline: String,
   categoryId: String,
 })
diff --git a/server/resolvers/categoryResolvers.js b/server/resolvers/categoryResolvers.js
index fa2a1dd..41a67a2 100644
--- a/server/resolvers/categoryResolvers.js
+++ b/server/resolvers/categoryResolvers.js
@@ -6,10 +6,9 @@ const categoryResolvers = {
     category: (_, { id }) => Category.findById(id),
   },
   Mutation: {
-    createCategory: (_, { title, description }) => {
+    createCategory: (_, { title }) => {
       const category = new Category({
         title,
-        description,
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
       })
@@ -19,7 +18,7 @@ const categoryResolvers = {
       const deletedCategory = await Category.findByIdAndRemove(id)
       return deletedCategory
     },
-    updateCategory: (_, { id, title, description }) => Category.findByIdAndUpdate(id, { $set: { title, description, updatedAt: new Date().toISOString() } }, { new: true })
+    updateCategory: (_, { id, title }) => Category.findByIdAndUpdate(id, { $set: { title, updatedAt: new Date().toISOString() } }, { new: true })
   },
   Category: {
     todos: ({ id }) => Todo.find({ categoryId: id }),
diff --git a/server/resolvers/todoResolvers.js b/server/resolvers/todoResolvers.js
index 61d7d21..e1adb95 100644
--- a/server/resolvers/todoResolvers.js
+++ b/server/resolvers/todoResolvers.js
@@ -12,7 +12,6 @@ const todoResolvers = {
         description,
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
-        status: 'open',
         deadline,
         categoryId,
       })
@@ -22,7 +21,7 @@ const todoResolvers = {
       const deletedTodo = await Todo.findByIdAndRemove(id)
       return deletedTodo
     },
-    updateTodo: (_, { id, title, description, status, deadline, categoryId }) => Todo.findByIdAndUpdate(id, { $set: { title, description, updatedAt: new Date().toISOString(), status, deadline, categoryId } }, { new: true }),
+    updateTodo: (_, { id, title, description, deadline, categoryId }) => Todo.findByIdAndUpdate(id, { $set: { title, description, updatedAt: new Date().toISOString(), deadline, categoryId } }, { new: true }),
   },
   Todo: {
     category: ({ categoryId }) => Category.findById(categoryId),
diff --git a/server/server.js b/server/server.js
index d7e0b22..10fec67 100644
--- a/server/server.js
+++ b/server/server.js
@@ -8,7 +8,17 @@ const port = config.get('port')
 
 const startServer = async () => {
   try {
-    const server = new ApolloServer({ typeDefs, resolvers })
+    const server = new ApolloServer({
+      typeDefs,
+      resolvers,
+      // context: (integrationContext) => {
+      //   const query = integrationContext.req.query.query || integrationContext.req.body.query || '';
+      //   console.log(query.length)
+      //   if (query.length > 500) {
+      //     throw new Error('Query too large');
+      //   }
+      // },
+    });
     await mongoose.connect(config.get('db'), {
       useNewUrlParser: true,
       useUnifiedTopology: true,
diff --git a/server/typeDefs/mutation.js b/server/typeDefs/mutation.js
index bf93cd6..5ad78bb 100644
--- a/server/typeDefs/mutation.js
+++ b/server/typeDefs/mutation.js
@@ -5,12 +5,12 @@ const mutation = gql`
     # Todo mutations
     createTodo(title: String! description: String! deadline: String! categoryId: String!): Todo
     deleteTodo(id: ID!): Todo
-    updateTodo(id: ID! title: String! description: String! status: String! deadline: String! categoryId: String!): Todo
+    updateTodo(id: ID! title: String! description: String! deadline: String! categoryId: String!): Todo
 
     # Category mutations
-    createCategory(title: String! description: String!): Category
+    createCategory(title: String!): Category
     deleteCategory(id: ID!): Category
-    updateCategory(id: ID! title: String! description: String!): Category
+    updateCategory(id: ID! title: String!): Category
   }
 `
 
diff --git a/server/typeDefs/types/categoryType.js b/server/typeDefs/types/categoryType.js
index 50384ec..5a39b66 100644
--- a/server/typeDefs/types/categoryType.js
+++ b/server/typeDefs/types/categoryType.js
@@ -4,7 +4,6 @@ const categoryType = gql`
   type Category {
     id: ID
     title: String
-    description: String
     createdAt: String
     updatedAt: String
     todos: [Todo]
diff --git a/server/typeDefs/types/todoType.js b/server/typeDefs/types/todoType.js
index 61d6706..69b4f92 100644
--- a/server/typeDefs/types/todoType.js
+++ b/server/typeDefs/types/todoType.js
@@ -7,7 +7,6 @@ const todoType = gql`
     description: String
     createdAt: String
     updatedAt: String
-    status: String
     deadline: String
     categoryId: String
     category: Category