added dynamic queries to cap and core endpoints

Author: jakewmeyer

.eslintrc.json

@@ -25,7 +25,8 @@
         ],
         "linebreak-style": [
             "error",
-            "unix"
+            "unix",
+            "windows"
         ],
         "quotes": [
             "error",

utilities/capsule-query.js

@@ -0,0 +1,27 @@
+/**
+ * Returns capsule query object from optional querystring inputs 
+*/
+
+exports.capsuleQuery = (req) => {
+  let query = {}
+  
+  if (req.query.capsule_serial) {
+    query.capsule_serial = req.query.capsule_serial
+  }
+  if (req.query.status) {
+    query.status = req.query.status
+  }
+  if (req.query.original_launch) {
+    query.original_launch = req.query.original_launch
+  }
+  if (req.query.missions) {
+    query.missions = req.query.missions
+  }
+  if (req.query.landings) {
+    query.landings = parseInt(req.query.landings)
+  }
+  if (req.query.type) {
+    query.type = req.query.type
+  }
+  return query
+}

utilities/core-query.js

@@ -0,0 +1,36 @@
+/**
+ * Returns core query object from optional querystring inputs 
+*/
+
+exports.coreQuery = (req) => {
+  let query = {}
+  
+  if (req.query.core_serial) {
+    query.core_serial = req.query.core_serial
+  }
+  if (req.query.status) {
+    query.status = req.query.status
+  }
+  if (req.query.original_launch) {
+    query.original_launch = req.query.original_launch
+  }
+  if (req.query.missions) {
+    query.missions = req.query.missions
+  }
+  if (req.query.rtls_attempt) {
+    query.rtls_attempt = Boolean(req.query.rtls_attempt)
+  }
+  if (req.query.rtls_landings) {
+    query.rtls_landings = parseInt(req.query.rtls_landings)
+  }
+  if (req.query.asds_attempt) {
+    query.asds_attempt = Boolean(req.query.asds_attempt)
+  }
+  if (req.query.asds_landings) {
+    query.asds_landings = parseInt(req.query.asds_landings)
+  }
+  if (req.query.water_landing) {
+    query.water_landing = Boolean(req.query.water_landing)
+  }
+  return query
+}

utilities/launch-query.js

@@ -1,8 +1,8 @@
 /**
- * Returns query object from optional querystring inputs 
+ * Returns launch query object from optional querystring inputs 
 */
 
-exports.queryBuilder = (req) => {
+exports.launchQuery = (req) => {
   let query = {}
 
   if (req.query.start && req.query.final) {

v2-routes/v2-launches.js

@@ -15,9 +15,9 @@ v2.get("/latest", (req, res, next) => {
     })
 })
 
-// All past launches filtered by any query string
+// All past launches filtered by any querystring
 v2.get("/", (req, res, next) => {
-  let query = launch.queryBuilder(req)
+  let query = launch.launchQuery(req)
   global.db.collection("launch").find(query,{"_id": 0 }).sort({"flight_number": 1})
     .toArray((err, doc) => {
       if (err) {

v2-routes/v2-parts.js

@@ -2,11 +2,14 @@
 
 const express = require("express")
 const v2 = express.Router()
+const cores = require("../utilities/core-query")
+const caps = require("../utilities/capsule-query")
 const error = {error: "No results found"}
 
 // Returns all capsule information
 v2.get("/caps", (req, res, next) => {
-  global.db.collection("capsule").find({},{"_id": 0}).sort({"capsule_serial": 1})
+  let query = caps.capsuleQuery(req)
+  global.db.collection("capsule").find(query,{"_id": 0}).sort({"capsule_serial": 1})
     .toArray((err, doc) => {
       if (err) {
         return next(err)
@@ -33,7 +36,8 @@ v2.get("/caps/:cap", (req, res, next) => {
 
 // Returns all core information
 v2.get("/cores", (req, res, next) => {
-  global.db.collection("core").find({},{"_id": 0}).sort({"core_serial": 1})
+  let query = cores.coreQuery(req)
+  global.db.collection("core").find(query,{"_id": 0}).sort({"core_serial": 1})
     .toArray((err, doc) => {
       if (err) {
         return next(err)

v2-routes/v2-upcoming.js

@@ -2,32 +2,18 @@
 
 const express = require("express")
 const v2 = express.Router()
+const launch = require("../utilities/launch-query")
 
 // Upcoming launches by date, year, or all
 v2.get("/", (req, res, next) => {
-  const year = req.query.year
-  const start = req.query.start
-  const final = req.query.final
-  if (year) {
-    global.db.collection("upcoming").find({"launch_year": `${year}`}, {"_id": 0 }).sort({"flight_number": -1})
-      .toArray((err, doc) => {
-        res.json(doc)
-      })
-  } else if (start && final) {
-    global.db.collection("upcoming").find({ "launch_date_utc": {"$gte": `${start}T00:00:00Z`, "$lte": `${final}T00:00:00Z`}}, {"_id": 0 })
-      .sort({"flight_number": 1})
-      .toArray((err, doc) => {
-        res.json(doc)
-      })
-  } else {
-    global.db.collection("upcoming").find({},{"_id": 0 }).sort({"flight_number": 1})
-      .toArray((err, doc) => {
-        if (err) {
-          return next(err)
-        }
-        res.json(doc)
-      })
-  }
+  let query = launch.launchQuery(req)
+  global.db.collection("upcoming").find(query,{"_id": 0 }).sort({"flight_number": 1})
+    .toArray((err, doc) => {
+      if (err) {
+        return next(err)
+      }
+      res.json(doc)
+    })
 })
 
 module.exports = v2