revised error msgs to return json objects instead of strings

Author: jakewmeyer

app.js

@@ -6,6 +6,7 @@ const compression = require("compression")
 const helmet = require("helmet")
 const config = require("./config.json")
 const MongoClient = require("mongodb")
+const endpointError = {error: "No Endpoint Found"}
 const app = express()
 
 const home  = require("./routes/v1-home")
@@ -37,7 +38,7 @@ app.use((req, res, next) => {
 
 // 404 Error Handler
 app.use((req, res) => {
-  res.status(404).json("No Endpoint Found")
+  res.status(404).end(JSON.stringify(endpointError, null, 2))
 })
 
 MongoClient.connect(config.url, (err, database) => {

routes/v1-launches.js

@@ -2,6 +2,7 @@
 
 const express = require("express")
 const v1 = express.Router()
+const error = {error: "No Matches Found"}
 
 // Get most recent launch
 v1.get("/latest", (req, res) => {
@@ -22,7 +23,7 @@ v1.get("/", (req, res) => {
     global.db.collection("launch").find({"launch_year": `${year}`}, {"_id": 0 }).sort({"flight_number": -1})
       .toArray((err, doc) => {
         if (doc.length == 0) {
-          res.end("No Matches Found")
+          res.end(JSON.stringify(error, null, 2))
         }
         res.end(JSON.stringify(doc, null, 2))
       })
@@ -31,7 +32,7 @@ v1.get("/", (req, res) => {
       .sort({"flight_number": 1})
       .toArray((err, doc) => {
         if (doc.length == 0) {
-          res.end("No Matches Found")
+          res.end(JSON.stringify(error, null, 2))
         }
         res.end(JSON.stringify(doc, null, 2))
       })
@@ -40,7 +41,7 @@ v1.get("/", (req, res) => {
       .sort({"flight_number": 1})
       .toArray((err, doc) => {
         if (doc.length == 0) {
-          res.end("No Matches Found")
+          res.end(JSON.stringify(error, null, 2))
         }
         res.end(JSON.stringify(doc, null, 2))
       })
@@ -60,7 +61,7 @@ v1.get("/cores/:core", (req, res) => {
     .toArray((err, doc) => {
       if (err) return console.log(err)
       if (doc.length == 0) {
-        res.end("No Matches Found")
+        res.end(JSON.stringify(error, null, 2))
       }
       res.end(JSON.stringify(doc, null, 2))
     })
@@ -73,7 +74,7 @@ v1.get("/caps/:cap", (req, res) => {
     .toArray((err, doc) => {
       if (err) return console.log(err)
       if (doc.length == 0) {
-        res.end("No Matches Found")
+        res.end(JSON.stringify(error, null, 2))
       }
       res.end(JSON.stringify(doc, null, 2))
     })

routes/v1-launchpad.js

@@ -2,6 +2,7 @@
 
 const express = require("express")
 const v1 = express.Router()
+const error = {error: "No Matches Found"}
 
 // Get all launchpads
 v1.get("/", (req, res) => {
@@ -15,7 +16,7 @@ v1.get("/:pad", (req, res) => {
   const id = req.params.pad
   global.db.collection("launchpad").find({"id": `${id}`}, {"_id": 0 }).toArray((err, doc) => {
     if (doc.length == 0) {
-      res.end("No Matches Found")
+      res.end(JSON.stringify(error, null, 2))
     }
     res.end(JSON.stringify(doc[0], null, 2))
   })

routes/v1-parts.js

@@ -2,6 +2,7 @@
 
 const express = require("express")
 const v1 = express.Router()
+const error = {error: "No Matches Found"}
 
 // Returns all capsule information
 v1.get("/caps", (req, res) => {
@@ -19,7 +20,7 @@ v1.get("/caps/:cap", (req, res) => {
     .toArray((err, doc) => {
       if (err) return console.log(err)
       if (doc.length == 0) {
-        res.end("No Matches Found")
+        res.end(JSON.stringify(error, null, 2))
       }
       res.end(JSON.stringify(doc[0], null, 2))
     })
@@ -41,7 +42,7 @@ v1.get("/cores/:core", (req, res) => {
     .toArray((err, doc) => {
       if (err) return console.log(err)
       if (doc.length == 0) {
-        res.end("No Matches Found")
+        res.end(JSON.stringify(error, null, 2))
       }
       res.end(JSON.stringify(doc[0], null, 2))
     })

routes/v1-upcoming.js

@@ -2,6 +2,7 @@
 
 const express = require("express")
 const v1 = express.Router()
+const error = {error: "No Matches Found"}
 
 // Upcoming launches by date, year, or all
 v1.get("/", (req, res) => {
@@ -12,7 +13,7 @@ v1.get("/", (req, res) => {
     global.db.collection("upcoming").find({"launch_year": `${year}`}, {"_id": 0 }).sort({"flight_number": -1})
       .toArray((err, doc) => {
         if (doc.length == 0) {
-          res.end("No Matches Found")
+          res.end(JSON.stringify(error, null, 2))
         }
         res.end(JSON.stringify(doc, null, 2))
       })
@@ -21,7 +22,7 @@ v1.get("/", (req, res) => {
       .sort({"flight_number": 1})
       .toArray((err, doc) => {
         if (doc.length == 0) {
-          res.end("No Matches Found")
+          res.end(JSON.stringify(error, null, 2))
         }
         res.end(JSON.stringify(doc, null, 2))
       })