Skip to content

Commit c85f386

Browse files
SrokapSrokap
committed
Routed all db errors to the express error handler
1 parent 285e93e commit c85f386

File tree

6 files changed

+62
-29
lines changed

6 files changed

+62
-29
lines changed

‎routes/v1-home.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ const express = require("express")
44
const v1 = express.Router()
55

66
// Returns API Info
7-
v1.get("/", (req, res) => {
7+
v1.get("/", (req, res, next) => {
88
global.db.collection("home").find({},{"_id": 0 }).toArray((err, doc) => {
9-
if (err) return console.log(err)
9+
if (err) {
10+
return next(err)
11+
}
1012
res.json(doc[0])
1113
})
1214
})

‎routes/v1-info.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ const express = require("express")
44
const v1 = express.Router()
55

66
// Returns company info
7-
v1.get("/", (req, res) => {
7+
v1.get("/", (req, res, next) => {
88
global.db.collection("info").find({},{"_id": 0 }).toArray((err, doc) => {
9-
if (err) return console.log(err)
9+
if (err) {
10+
return next(err)
11+
}
1012
res.json(doc[0])
1113
})
1214
})

‎routes/v1-launches.js‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22

33
const express = require("express")
44
const v1 = express.Router()
5-
const error = {error: "No results found"}
65

76
// Get most recent launch
8-
v1.get("/latest", (req, res) => {
7+
v1.get("/latest", (req, res, next) => {
98
global.db.collection("launch").find({},{"_id": 0 }).sort({"flight_number": -1}).limit(1)
109
.toArray((err, doc) => {
11-
if (err) return console.log(err)
10+
if (err) {
11+
return next(err)
12+
}
1213
res.json(doc)
1314
})
1415
})
1516

1617
// All launches by date, year, or default to all launches
17-
v1.get("/", (req, res) => {
18+
v1.get("/", (req, res, next) => {
1819
const year = req.query.year
1920
const start = req.query.start
2021
const final = req.query.final
@@ -28,7 +29,6 @@ v1.get("/", (req, res) => {
2829
global.db.collection("launch").find({ "launch_date_utc": {"$gte": `${start}T00:00:00Z`, "$lte": `${final}T00:00:00Z`}}, {"_id": 0 })
2930
.sort({"flight_number": 1})
3031
.toArray((err, doc) => {
31-
if (doc.length == 0) {
3232
res.json(doc)
3333
})
3434
} else if (site) {
@@ -40,46 +40,56 @@ v1.get("/", (req, res) => {
4040
} else {
4141
global.db.collection("launch").find({},{"_id": 0 }).sort({"flight_number": 1})
4242
.toArray((err, doc) => {
43-
if (err) return console.log(err)
43+
if (err) {
44+
return next(err)
45+
}
4446
res.json(doc)
4547
})
4648
}
4749
})
4850

4951
// Returns launches by core serial #
50-
v1.get("/cores/:core", (req, res) => {
52+
v1.get("/cores/:core", (req, res, next) => {
5153
const core = req.params.core
5254
global.db.collection("launch").find({"core_serial": `${core}`},{"_id": 0}).sort({"core_serial": 1})
5355
.toArray((err, doc) => {
54-
if (err) return console.log(err)
56+
if (err) {
57+
return next(err)
58+
}
5559
res.json(doc)
5660
})
5761
})
5862

5963
// Returns launches by capsule serial #
60-
v1.get("/caps/:cap", (req, res) => {
64+
v1.get("/caps/:cap", (req, res, next) => {
6165
const cap = req.params.cap
6266
global.db.collection("launch").find({"cap_serial": `${cap}`},{"_id": 0}).sort({"capsule_serial": 1})
6367
.toArray((err, doc) => {
64-
if (err) return console.log(err)
68+
if (err) {
69+
return next(err)
70+
}
6571
res.json(doc)
6672
})
6773
})
6874

6975
// Returns all ASDS launches
70-
v1.get("/asds", (req, res) => {
76+
v1.get("/asds", (req, res, next) => {
7177
global.db.collection("launch").find({"landing_type": "ASDS"},{"_id": 0}).sort({"flight_number": 1})
7278
.toArray((err, doc) => {
73-
if (err) return console.log(err)
79+
if (err) {
80+
return next(err)
81+
}
7482
res.json(doc)
7583
})
7684
})
7785

7886
// Returns all RTLS launches
79-
v1.get("/rtls", (req, res) => {
87+
v1.get("/rtls", (req, res, next) => {
8088
global.db.collection("launch").find({"landing_type": "RTLS"},{"_id": 0}).sort({"flight_number": 1})
8189
.toArray((err, doc) => {
82-
if (err) return console.log(err)
90+
if (err) {
91+
return next(err)
92+
}
8393
res.json(doc)
8494
})
8595
})

‎routes/v1-parts.js‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ const error = {error: "No results found"}
88
v1.get("/caps", (req, res, next) => {
99
global.db.collection("capsule").find({},{"_id": 0}).sort({"capsule_serial": 1})
1010
.toArray((err, doc) => {
11-
if (err) return next(err)
11+
if (err) {
12+
return next(err)
13+
}
1214
res.json(doc)
1315
})
1416
})
@@ -18,7 +20,9 @@ v1.get("/caps/:cap", (req, res, next) => {
1820
const cap = req.params.cap
1921
global.db.collection("capsule").find({"capsule_serial": `${cap}`},{"_id": 0}).sort({"capsule_serial": 1})
2022
.toArray((err, doc) => {
21-
if (err) return next(err)
23+
if (err) {
24+
return next(err)
25+
}
2226
if (doc.length == 0) {
2327
res.status(404)
2428
return res.json(error)
@@ -31,7 +35,9 @@ v1.get("/caps/:cap", (req, res, next) => {
3135
v1.get("/cores", (req, res, next) => {
3236
global.db.collection("core").find({},{"_id": 0}).sort({"core_serial": 1})
3337
.toArray((err, doc) => {
34-
if (err) return next(err)
38+
if (err) {
39+
return next(err)
40+
}
3541
res.json(doc)
3642
})
3743
})
@@ -41,7 +47,9 @@ v1.get("/cores/:core", (req, res, next) => {
4147
const core = req.params.core
4248
global.db.collection("core").find({"core_serial": `${core}`},{"_id": 0}).sort({"core_serial": 1})
4349
.toArray((err, doc) => {
44-
if (err) return next(err)
50+
if (err) {
51+
return next(err)
52+
}
4553
if (doc.length == 0) {
4654
res.status(404)
4755
return res.json(error)

‎routes/v1-upcoming.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const express = require("express")
44
const v1 = express.Router()
5-
const error = {error: "No results found"}
65

76
// Upcoming launches by date, year, or all
87
v1.get("/", (req, res, next) => {
@@ -23,7 +22,9 @@ v1.get("/", (req, res, next) => {
2322
} else {
2423
global.db.collection("upcoming").find({},{"_id": 0 }).sort({"flight_number": 1})
2524
.toArray((err, doc) => {
26-
if (err) return next(err)
25+
if (err) {
26+
return next(err)
27+
}
2728
res.json(doc)
2829
})
2930
}

‎routes/v1-vehicles.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,49 @@ const v1 = express.Router()
66
// Returns all vehicle info
77
v1.get("/", (req, res, next) => {
88
global.db.collection("vehicle").find({},{"_id": 0 }).toArray((err, doc) => {
9-
if (err) return next(err)
9+
if (err) {
10+
return next(err)
11+
}
1012
res.json(doc)
1113
})
1214
})
1315

1416
// Returns Falcon 1 info
1517
v1.get("/falcon1", (req, res, next) => {
1618
global.db.collection("vehicle").find({"id": "falcon1"},{"_id": 0 }).toArray((err, doc) => {
17-
if (err) return next(err)
19+
if (err) {
20+
return next(err)
21+
}
1822
res.json(doc[0])
1923
})
2024
})
2125

2226
// Returns Falcon 9 info
2327
v1.get("/falcon9", (req, res, next) => {
2428
global.db.collection("vehicle").find({"id": "falcon9"},{"_id": 0 }).toArray((err, doc) => {
25-
if (err) return next(err)
29+
if (err) {
30+
return next(err)
31+
}
2632
res.json(doc[0])
2733
})
2834
})
2935

3036
// Returns Falcon Heavy info
3137
v1.get("/falconheavy", (req, res, next) => {
3238
global.db.collection("vehicle").find({"id": "falcon_heavy"},{"_id": 0 }).toArray((err, doc) => {
33-
if (err) return next(err)
39+
if (err) {
40+
return next(err)
41+
}
3442
res.json(doc[0])
3543
})
3644
})
3745

3846
// Returns Dragon info
3947
v1.get("/dragon", (req, res, next) => {
4048
global.db.collection("vehicle").find({"id": "dragon"},{"_id": 0 }).toArray((err, doc) => {
41-
if (err) return next(err)
49+
if (err) {
50+
return next(err)
51+
}
4252
res.json(doc[0])
4353
})
4454
})

0 commit comments

Comments
 (0)