Rewrote deserializeTodo and clarified action names

GeorgeSapkin · GeorgeSapkin · commit a29e0f91225d · 2018-03-10T22:06:24.000+01:00
diff --git a/week3/README.md b/week3/README.md
@@ -59,19 +59,19 @@ middleware that automatically parses JSON from request body.
 There are 4 [CRUD](https://en.wikipedia.org/wiki/Create%2C_read%2C_update_and_delete)
 actions:
 
-- Create (`POST /todos`)
+#### `createTodo` (`POST /todos`)
 
   Creates a new to-do
 
-- Read (`GET /todos`)
+#### `readTodos` (`GET /todos`)
 
   Reads and lists all to-dos
 
-- Update (`PUT /todos/:id`)
+#### `updateTodo` (`PUT /todos/:id`)
 
   Updates the description of a to-do with ID `:id`
 
-- Delete (`DELETE /todos/:id`)
+#### `deleteTodo` (`DELETE /todos/:id`)
 
   Deletes a to-do with ID `:id`
 
@@ -92,7 +92,8 @@ Note that for these actions, the client must add the following header:
 
 - `Content-Type`: `application/json`
 
-In Postman, make sure to add this header, and set the Body type to _Raw_.
+In Postman, make sure to add this header, and set the Body type to _raw_ and
+_JSON (application/json)_.
 
 ## UUIDs
 
diff --git a/week3/homework/README.md b/week3/homework/README.md
@@ -5,9 +5,9 @@
 Read through the code from the lecture, make sure you understand the flow of the
 program.
 
-Add three more actions and update your `README.md` to reflect your new actions.
+Add three more actions:
 
-### `clear` (`DELETE /todos`)
+### `clearTodos` (`DELETE /todos`)
 
 Clears the list of to-dos
 
diff --git a/week3/lecture/src/actions/create.js b/week3/lecture/src/actions/create.js
diff --git a/week3/lecture/src/actions/createTodo.js b/week3/lecture/src/actions/createTodo.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const deserializeTodo = require('./deserializeTodo');
+
+function createTodo(todo, request, response) {
+  deserializeTodo(request, response)
+    .then(({ description }) => todo.create(description))
+    .then(todo => {
+      response.status(201);
+      response.json({ todo });
+    })
+    .catch(({ message }) => {
+      response.status(500);
+      response.json({ error: message });
+    });
+};
+
+module.exports = createTodo;
diff --git a/week3/lecture/src/actions/delete.js b/week3/lecture/src/actions/delete.js
diff --git a/week3/lecture/src/actions/deleteTodo.js b/week3/lecture/src/actions/deleteTodo.js
@@ -0,0 +1,17 @@
+'use strict';
+
+function deleteTodo(todo, request, response) {
+  const id = request.params.id;
+
+  todo.delete_(id)
+    .then(() => {
+      response.status(204);
+      response.end();
+    })
+    .catch(({ message }) => {
+      response.status(500);
+      response.json({ error: message });
+    });
+};
+
+module.exports = deleteTodo;
diff --git a/week3/lecture/src/actions/deserializeTodo.js b/week3/lecture/src/actions/deserializeTodo.js
@@ -1,25 +1,15 @@
 'use strict';
 
-function setError(response, error) {
-  response.status(400);
-  response.json({ error });
-  response.end();
-}
-
-function deserializeTodo(request, response) {
+async function deserializeTodo(request) {
   const { todo } = request.body;
-  if (todo == null) {
-    setError(response, 'Specify a to-do');
-    return null;
-  }
+  if (todo == null)
+    throw new Error('todo not set');
 
   if (todo.description != null)
     todo.description = todo.description.trim();
 
-  if (todo.description == null || todo.description.length === 0) {
-    setError(response, 'Specify a description');
-    return null;
-  }
+  if (todo.description == null || todo.description.length === 0)
+    throw new Error('description not set');
 
   return todo;
 };
diff --git a/week3/lecture/src/actions/index.js b/week3/lecture/src/actions/index.js
@@ -2,8 +2,8 @@
 
 // CRUD actions
 module.exports = {
-  create:  require('./create'),
-  read:    require('./read'),
-  update:  require('./update'),
-  delete_: require('./delete')
+  createTodo: require('./createTodo'),
+  readTodos:  require('./readTodos'),
+  updateTodo: require('./updateTodo'),
+  deleteTodo: require('./deleteTodo')
 };
diff --git a/week3/lecture/src/actions/read.js b/week3/lecture/src/actions/read.js
diff --git a/week3/lecture/src/actions/readTodos.js b/week3/lecture/src/actions/readTodos.js
@@ -0,0 +1,15 @@
+'use strict';
+
+function readTodos(todo, request, response) {
+  todo.read()
+    .then(todos => {
+      response.json({ todos });
+      response.end();
+    })
+    .catch(({ message }) => {
+      response.status(500);
+      response.json({ error: message });
+    });
+};
+
+module.exports = readTodos;
diff --git a/week3/lecture/src/actions/update.js b/week3/lecture/src/actions/update.js
diff --git a/week3/lecture/src/actions/updateTodo.js b/week3/lecture/src/actions/updateTodo.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const deserializeTodo = require('./deserializeTodo');
+
+function updateTodo(todo, request, response) {
+  deserializeTodo(request, response)
+    .then(({ description }) => {
+      const id = request.params.id;
+      return todo.update(id, description);
+    })
+    .then(todo => {
+      response.status(200);
+      response.json({ todo });
+    })
+    .catch(({ message, code }) => {
+      response.status(code === 'not-found' ? 404 : 500);
+      response.json({ error: message });
+    });
+};
+
+module.exports = updateTodo;
diff --git a/week3/lecture/src/index.js b/week3/lecture/src/index.js
@@ -5,29 +5,28 @@ const Express    = require('express');
 
 // import our CRUD actions
 const {
-  create,
-  read,
-  update,
-  // delete is a JavaScript keyword, using delete_ instead
-  delete_
+  createTodo,
+  readTodos,
+  updateTodo,
+  deleteTodo
 } = require('./actions');
 
 const Todo = require('./todo');
 
-const FILENAME = 'todos.json';
-
-const PORT = 3000;
+const FILENAME  = 'todos.json';
+const PORT      = 3000;
+const TODO_SLUG = 'todos';
 
 const todo = new Todo(FILENAME);
 
 const app = Express();
 
 app.use(bodyParser.json());
 
-app.post('/todos',       create.bind(null, todo));
-app.get('/todos',        read.bind(null, todo));
-app.put('/todos/:id',    update.bind(null, todo));
-app.delete('/todos/:id', delete_.bind(null, todo));
+app.post(`/${TODO_SLUG}`,       createTodo.bind(null, todo));
+app.get(`/${TODO_SLUG}`,        readTodos.bind(null, todo));
+app.put(`/${TODO_SLUG}/:id`,    updateTodo.bind(null, todo));
+app.delete(`/${TODO_SLUG}/:id`, deleteTodo.bind(null, todo));
 
 app.listen(PORT, error => {
   if (error)
