Manage 404 errors

Author: sebprunier

api/doc/api_data.js

@@ -305,6 +305,19 @@ define({ "api": [
         }
       ]
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"
@@ -328,6 +341,19 @@ define({ "api": [
         ]
       }
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"
@@ -376,6 +402,19 @@ define({ "api": [
         }
       ]
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"

api/doc/api_data.json

@@ -305,6 +305,19 @@
         }
       ]
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"
@@ -328,6 +341,19 @@
         ]
       }
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"
@@ -376,6 +402,19 @@
         }
       ]
     },
+    "error": {
+      "fields": {
+        "Error 4xx": [
+          {
+            "group": "Error 4xx",
+            "type": "String",
+            "optional": false,
+            "field": "404",
+            "description": "<p>Not found - No wine corresponding to given 'id'</p>"
+          }
+        ]
+      }
+    },
     "version": "0.0.0",
     "filename": "src/server.js",
     "groupTitle": "Wines"

api/doc/api_project.js

@@ -8,7 +8,7 @@ define({
   "apidoc": "0.2.0",
   "generator": {
     "name": "apidoc",
-    "time": "2016-03-13T20:50:54.459Z",
+    "time": "2016-03-13T21:01:05.404Z",
     "url": "http://apidocjs.com",
     "version": "0.15.1"
   }

api/doc/api_project.json

@@ -8,7 +8,7 @@
   "apidoc": "0.2.0",
   "generator": {
     "name": "apidoc",
-    "time": "2016-03-13T20:50:54.459Z",
+    "time": "2016-03-13T21:01:05.404Z",
     "url": "http://apidocjs.com",
     "version": "0.15.1"
   }

api/src/server.js

@@ -26,7 +26,7 @@ ChampagneWines.forEach(byId);
 LoireWines.forEach(byId);
 
 // Likes and Comments
-var Likes = [];
+var Likes = ["chevrol-bel-air"];
 var Comments = {
   "chevrol-bel-air": [{
     "date": new Date(),
@@ -140,10 +140,17 @@ app.get('/api/wines/:id', function (req, res) {
  * @apiGroup Wines
  *
  * @apiParam {String} id the id of the wine
+ *
+ * @apiError {String} 404 Not found - No wine corresponding to given 'id'
  */
 app.get('/api/wines/:id/image', function (req, res) {
-  // TODO what if image does not exists ?
-  res.sendFile(__dirname + '/data/images/' + req.params.id + '.png');
+  var id = req.params.id;
+  if (!WinesById[id]) {
+    res.sendStatus(404);
+  } else {
+    // TODO what if image does not exists ?
+    res.sendFile(__dirname + '/data/images/' + req.params.id + '.png');
+  }
 });
 
 /**
@@ -162,9 +169,16 @@ app.get('/api/wines/:id/image', function (req, res) {
  *     {
  *       "like": false
  *     }
+ *
+ * @apiError {String} 404 Not found - No wine corresponding to given 'id'
  */
 app.get('/api/wines/:id/like', function (req, res) {
-  res.send({like: Likes.indexOf(req.params.id) >= 0});
+  var id = req.params.id;
+  if (!WinesById[id]) {
+    res.sendStatus(404);
+  } else {
+    res.send({like: Likes.indexOf(req.params.id) >= 0});
+  }
 });
 
 /**
@@ -189,9 +203,16 @@ app.get('/api/wines/:id/like', function (req, res) {
  *         content: "J'ai bu le millésime 2009, parfait après une heure en carafe !"
  *       }
  *     ]
+ *
+ * @apiError {String} 404 Not found - No wine corresponding to given 'id'
  */
 app.get('/api/wines/:id/comments', function (req, res) {
-  res.send(Comments[req.params.id] || []);
+  var id = req.params.id;
+  if (!WinesById[id]) {
+    res.sendStatus(404);
+  } else {
+    res.send(Comments[req.params.id] || []);
+  }
 });
 
 /**