Skip to content

Commit d7956f0

Browse files
jakewmeyerjakewmeyer
committed
shortened request variable name in query builders for readability
1 parent 7a7c4b6 commit d7956f0

File tree

7 files changed

+127
-127
lines changed

7 files changed

+127
-127
lines changed

‎src/builders/capsule-query.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11

22
/**
33
* Builds Mongo query for capsule data endpoints from querystrings
4-
* @param {Object} request The Koa context object to access querystrings
4+
* @param {Object} req The Koa context object to access querystrings
55
* @return {Object} Mongo compatible query object
66
*/
77

8-
module.exports = (request) => {
8+
module.exports = (req) => {
99
const query = {};
1010

11-
if (request.query.capsule_serial) {
12-
query.capsule_serial = request.query.capsule_serial;
11+
if (req.query.capsule_serial) {
12+
query.capsule_serial = req.query.capsule_serial;
1313
}
14-
if (request.query.capsule_id) {
15-
query.capsule_id = request.query.capsule_id;
14+
if (req.query.capsule_id) {
15+
query.capsule_id = req.query.capsule_id;
1616
}
17-
if (request.query.status) {
18-
query.status = request.query.status;
17+
if (req.query.status) {
18+
query.status = req.query.status;
1919
}
20-
if (request.query.original_launch) {
21-
query.original_launch = request.query.original_launch;
20+
if (req.query.original_launch) {
21+
query.original_launch = req.query.original_launch;
2222
}
23-
if (request.query.missions) {
24-
query.missions = request.query.missions;
23+
if (req.query.missions) {
24+
query.missions = req.query.missions;
2525
}
26-
if (request.query.landings) {
27-
query.landings = parseInt(request.query.landings, 10);
26+
if (req.query.landings) {
27+
query.landings = parseInt(req.query.landings, 10);
2828
}
29-
if (request.query.type) {
30-
query.type = request.query.type;
29+
if (req.query.type) {
30+
query.type = req.query.type;
3131
}
3232
return query;
3333
};

‎src/builders/core-query.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11

22
/**
33
* Builds Mongo query for core data endpoints from querystrings
4-
* @param {Object} request The Koa context object to access querystrings
4+
* @param {Object} req The Koa context object to access querystrings
55
* @return {Object} Mongo compatible query object
66
*/
77

8-
module.exports = (request) => {
8+
module.exports = (req) => {
99
const query = {};
1010

11-
if (request.query.core_serial) {
12-
query.core_serial = request.query.core_serial;
11+
if (req.query.core_serial) {
12+
query.core_serial = req.query.core_serial;
1313
}
14-
if (request.query.block) {
15-
query.block = parseInt(request.query.block, 10);
14+
if (req.query.block) {
15+
query.block = parseInt(req.query.block, 10);
1616
}
17-
if (request.query.status) {
18-
query.status = request.query.status;
17+
if (req.query.status) {
18+
query.status = req.query.status;
1919
}
20-
if (request.query.original_launch) {
21-
query.original_launch = request.query.original_launch;
20+
if (req.query.original_launch) {
21+
query.original_launch = req.query.original_launch;
2222
}
23-
if (request.query.missions) {
24-
query.missions = request.query.missions;
23+
if (req.query.missions) {
24+
query.missions = req.query.missions;
2525
}
26-
if (request.query.rtls_attempt) {
27-
query.rtls_attempt = (request.query.rtls_attempt === 'true');
26+
if (req.query.rtls_attempt) {
27+
query.rtls_attempt = (req.query.rtls_attempt === 'true');
2828
}
29-
if (request.query.rtls_landings) {
30-
query.rtls_landings = parseInt(request.query.rtls_landings, 10);
29+
if (req.query.rtls_landings) {
30+
query.rtls_landings = parseInt(req.query.rtls_landings, 10);
3131
}
32-
if (request.query.asds_attempt) {
33-
query.asds_attempt = (request.query.asds_attempt === 'true');
32+
if (req.query.asds_attempt) {
33+
query.asds_attempt = (req.query.asds_attempt === 'true');
3434
}
35-
if (request.query.asds_landings) {
36-
query.asds_landings = parseInt(request.query.asds_landings, 10);
35+
if (req.query.asds_landings) {
36+
query.asds_landings = parseInt(req.query.asds_landings, 10);
3737
}
38-
if (request.query.water_landing) {
39-
query.water_landing = (request.query.water_landing === 'true');
38+
if (req.query.water_landing) {
39+
query.water_landing = (req.query.water_landing === 'true');
4040
}
4141
return query;
4242
};

‎src/builders/history-query.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11

22
/**
33
* Builds Mongo query for history endpints
4-
* @param {Object} request The Koa context object to access querystrings
4+
* @param {Object} req The Koa context object to access querystrings
55
* @return {Object} Mongo compatible query object
66
*/
77

8-
module.exports = (request) => {
8+
module.exports = (req) => {
99
const query = {};
1010

1111
// Allow date range comparisons using a veriety of date formats
12-
if (request.query.start && (request.query.final || request.query.end)) {
12+
if (req.query.start && (req.query.final || req.query.end)) {
1313
let startParsed;
1414
let endParsed;
1515
const re = /^[0-9]*$/; // Matches any string of consecutive numbers ex. 1520314380
16-
if (re.test(request.query.start && (request.query.final || request.query.end))) {
16+
if (re.test(req.query.start && (req.query.final || req.query.end))) {
1717
// If the date is unix, it is converted to a compatible date constructor param
18-
startParsed = new Date(request.query.start * 1000);
19-
endParsed = new Date(request.query.final * 1000 || request.query.end * 1000);
18+
startParsed = new Date(req.query.start * 1000);
19+
endParsed = new Date(req.query.final * 1000 || req.query.end * 1000);
2020
} else {
2121
// If not unix, a date is created from the input
22-
startParsed = new Date(request.query.start);
23-
endParsed = new Date(request.query.final || request.query.end);
22+
startParsed = new Date(req.query.start);
23+
endParsed = new Date(req.query.final || req.query.end);
2424
}
2525
try {
2626
query.event_date_utc = { $gte: startParsed.toISOString(), $lte: endParsed.toISOString() };
2727
} catch (e) {
2828
console.log(e);
2929
}
3030
}
31-
if (request.query.flight_number) {
32-
query.flight_number = parseInt(request.query.flight_number, 10);
31+
if (req.query.flight_number) {
32+
query.flight_number = parseInt(req.query.flight_number, 10);
3333
}
3434
return query;
3535
};

‎src/builders/history-sort.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ const lowerCase = require('lower-case');
44

55
/**
66
* Builds Mongo sort object to set document order for SpaceX history endpoint
7-
* @param {Object} request The Koa context object to access querystrings
7+
* @param {Object} req The Koa context object to access querystrings
88
* @return {Object} Mongo compatible sort object
99
*/
1010

11-
module.exports = (request) => {
11+
module.exports = (req) => {
1212
const query = {};
1313

14-
if (lowerCase(request.query.order) === 'asc') {
14+
if (lowerCase(req.query.order) === 'asc') {
1515
query.event_date_utc = 1;
16-
} else if (lowerCase(request.query.order) === 'desc') {
16+
} else if (lowerCase(req.query.order) === 'desc') {
1717
query.event_date_utc = -1;
1818
} else {
1919
query.flight_number = 1;

‎src/builders/launch-query.js‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,124 +4,124 @@ const ObjectId = require('mongodb').ObjectID;
44

55
/**
66
* Builds Mongo query for past/upcoming launch endpoints from querystrings
7-
* @param {Object} request The Koa context object to access querystrings
7+
* @param {Object} req The Koa context object to access querystrings
88
* @return {Object} Mongo compatible query object
99
*/
1010

11-
module.exports = (request) => {
11+
module.exports = (req) => {
1212
const query = {};
1313

14-
if (request.query.flight_id) {
14+
if (req.query.flight_id) {
1515
// Mongo _id field requires underscore dangle
1616
// eslint-disable-next-line no-underscore-dangle
17-
query._id = ObjectId(request.query.flight_id);
17+
query._id = ObjectId(req.query.flight_id);
1818
}
1919
// Allow date range comparisons using a veriety of date formats
20-
if (request.query.start && (request.query.final || request.query.end)) {
20+
if (req.query.start && (req.query.final || req.query.end)) {
2121
let startParsed;
2222
let endParsed;
2323
const re = /^[0-9]*$/; // Matches any string of consecutive numbers ex. 1520314380
24-
if (re.test(request.query.start && (request.query.final || request.query.end))) {
24+
if (re.test(req.query.start && (req.query.final || req.query.end))) {
2525
// If the date is unix, it is converted to a compatible date constructor param
26-
startParsed = new Date(request.query.start * 1000);
27-
endParsed = new Date(request.query.final * 1000 || request.query.end * 1000);
26+
startParsed = new Date(req.query.start * 1000);
27+
endParsed = new Date(req.query.final * 1000 || req.query.end * 1000);
2828
} else {
2929
// If not unix, a date is created from the input
30-
startParsed = new Date(request.query.start);
31-
endParsed = new Date(request.query.final || request.query.end);
30+
startParsed = new Date(req.query.start);
31+
endParsed = new Date(req.query.final || req.query.end);
3232
}
3333
try {
3434
query.launch_date_utc = { $gte: startParsed.toISOString(), $lte: endParsed.toISOString() };
3535
} catch (e) {
3636
console.log(e);
3737
}
3838
}
39-
if (request.query.flight_number) {
40-
query.flight_number = parseInt(request.query.flight_number, 10);
39+
if (req.query.flight_number) {
40+
query.flight_number = parseInt(req.query.flight_number, 10);
4141
}
42-
if (request.query.launch_year) {
43-
query.launch_year = request.query.launch_year;
42+
if (req.query.launch_year) {
43+
query.launch_year = req.query.launch_year;
4444
}
45-
if (request.query.launch_date_utc) {
46-
query.launch_date_utc = request.query.launch_date_utc;
45+
if (req.query.launch_date_utc) {
46+
query.launch_date_utc = req.query.launch_date_utc;
4747
}
48-
if (request.query.launch_date_local) {
49-
query.launch_date_local = request.query.launch_date_local;
48+
if (req.query.launch_date_local) {
49+
query.launch_date_local = req.query.launch_date_local;
5050
}
51-
if (request.query.rocket_id) {
52-
query['rocket.rocket_id'] = request.query.rocket_id;
51+
if (req.query.rocket_id) {
52+
query['rocket.rocket_id'] = req.query.rocket_id;
5353
}
54-
if (request.query.rocket_name) {
55-
query['rocket.rocket_name'] = request.query.rocket_name;
54+
if (req.query.rocket_name) {
55+
query['rocket.rocket_name'] = req.query.rocket_name;
5656
}
57-
if (request.query.rocket_type) {
58-
query['rocket.rocket_type'] = request.query.rocket_type;
57+
if (req.query.rocket_type) {
58+
query['rocket.rocket_type'] = req.query.rocket_type;
5959
}
60-
if (request.query.core_serial) {
61-
query['rocket.first_stage.cores.core_serial'] = request.query.core_serial;
60+
if (req.query.core_serial) {
61+
query['rocket.first_stage.cores.core_serial'] = req.query.core_serial;
6262
}
63-
if (request.query.cap_serial) {
64-
query['rocket.second_stage.payloads.cap_serial'] = request.query.cap_serial;
63+
if (req.query.cap_serial) {
64+
query['rocket.second_stage.payloads.cap_serial'] = req.query.cap_serial;
6565
}
66-
if (request.query.core_flight) {
67-
query['rocket.first_stage.cores.flight'] = parseInt(request.query.core_flight, 10);
66+
if (req.query.core_flight) {
67+
query['rocket.first_stage.cores.flight'] = parseInt(req.query.core_flight, 10);
6868
}
69-
if (request.query.block) {
70-
query['rocket.first_stage.cores.block'] = parseInt(request.query.block, 10);
69+
if (req.query.block) {
70+
query['rocket.first_stage.cores.block'] = parseInt(req.query.block, 10);
7171
}
72-
if (request.query.second_stage_block) {
73-
query['rocket.second_stage.block'] = parseInt(request.query.second_stage_block, 10);
72+
if (req.query.second_stage_block) {
73+
query['rocket.second_stage.block'] = parseInt(req.query.second_stage_block, 10);
7474
}
75-
if (request.query.core_reuse) {
76-
query['reuse.core'] = (request.query.core_reuse === 'true');
75+
if (req.query.core_reuse) {
76+
query['reuse.core'] = (req.query.core_reuse === 'true');
7777
}
78-
if (request.query.side_core1_reuse) {
79-
query['reuse.side_core1'] = (request.query.side_core1_reuse === 'true');
78+
if (req.query.side_core1_reuse) {
79+
query['reuse.side_core1'] = (req.query.side_core1_reuse === 'true');
8080
}
81-
if (request.query.side_core2_reuse) {
82-
query['reuse.side_core2'] = (request.query.side_core2_reuse === 'true');
81+
if (req.query.side_core2_reuse) {
82+
query['reuse.side_core2'] = (req.query.side_core2_reuse === 'true');
8383
}
84-
if (request.query.fairings_reuse) {
85-
query['reuse.fairings'] = (request.query.fairings_reuse === 'true');
84+
if (req.query.fairings_reuse) {
85+
query['reuse.fairings'] = (req.query.fairings_reuse === 'true');
8686
}
87-
if (request.query.capsule_reuse) {
88-
query['reuse.capsule'] = (request.query.capsule_reuse === 'true');
87+
if (req.query.capsule_reuse) {
88+
query['reuse.capsule'] = (req.query.capsule_reuse === 'true');
8989
}
90-
if (request.query.site_id) {
91-
query['launch_site.site_id'] = request.query.site_id;
90+
if (req.query.site_id) {
91+
query['launch_site.site_id'] = req.query.site_id;
9292
}
93-
if (request.query.site_name) {
94-
query['launch_site.site_name'] = request.query.site_name;
93+
if (req.query.site_name) {
94+
query['launch_site.site_name'] = req.query.site_name;
9595
}
96-
if (request.query.site_name_long) {
97-
query['launch_site.site_name_long'] = request.query.site_name_long;
96+
if (req.query.site_name_long) {
97+
query['launch_site.site_name_long'] = req.query.site_name_long;
9898
}
99-
if (request.query.payload_id) {
100-
query['rocket.second_stage.payloads.payload_id'] = request.query.payload_id;
99+
if (req.query.payload_id) {
100+
query['rocket.second_stage.payloads.payload_id'] = req.query.payload_id;
101101
}
102-
if (request.query.customer) {
103-
query['rocket.second_stage.payloads.customers'] = request.query.customer;
102+
if (req.query.customer) {
103+
query['rocket.second_stage.payloads.customers'] = req.query.customer;
104104
}
105-
if (request.query.payload_type) {
106-
query['rocket.second_stage.payloads.payload_type'] = request.query.payload_type;
105+
if (req.query.payload_type) {
106+
query['rocket.second_stage.payloads.payload_type'] = req.query.payload_type;
107107
}
108-
if (request.query.orbit) {
109-
query['rocket.second_stage.payloads.orbit'] = request.query.orbit;
108+
if (req.query.orbit) {
109+
query['rocket.second_stage.payloads.orbit'] = req.query.orbit;
110110
}
111-
if (request.query.launch_success) {
112-
query.launch_success = (request.query.launch_success === 'true');
111+
if (req.query.launch_success) {
112+
query.launch_success = (req.query.launch_success === 'true');
113113
}
114-
if (request.query.reused) {
115-
query['rocket.first_stage.cores.reused'] = (request.query.reused === 'true');
114+
if (req.query.reused) {
115+
query['rocket.first_stage.cores.reused'] = (req.query.reused === 'true');
116116
}
117-
if (request.query.land_success) {
118-
query['rocket.first_stage.cores.land_success'] = (request.query.land_success === 'true');
117+
if (req.query.land_success) {
118+
query['rocket.first_stage.cores.land_success'] = (req.query.land_success === 'true');
119119
}
120-
if (request.query.landing_type) {
121-
query['rocket.first_stage.cores.landing_type'] = request.query.landing_type;
120+
if (req.query.landing_type) {
121+
query['rocket.first_stage.cores.landing_type'] = req.query.landing_type;
122122
}
123-
if (request.query.landing_vehicle) {
124-
query['rocket.first_stage.cores.landing_vehicle'] = request.query.landing_vehicle;
123+
if (req.query.landing_vehicle) {
124+
query['rocket.first_stage.cores.landing_vehicle'] = req.query.landing_vehicle;
125125
}
126126
return query;
127127
};

‎src/builders/launch-sort.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ const lowerCase = require('lower-case');
44

55
/**
66
* Builds Mongo sort object to set document order
7-
* @param {Object} request The Koa context object to access querystrings
7+
* @param {Object} req The Koa context object to access querystrings
88
* @return {Object} Mongo compatible sort object
99
*/
1010

11-
module.exports = (request) => {
11+
module.exports = (req) => {
1212
const query = {};
1313

14-
if (lowerCase(request.query.order) === 'asc') {
14+
if (lowerCase(req.query.order) === 'asc') {
1515
query.flight_number = 1;
16-
} else if (lowerCase(request.query.order) === 'desc') {
16+
} else if (lowerCase(req.query.order) === 'desc') {
1717
query.flight_number = -1;
1818
} else {
1919
query.flight_number = 1;

0 commit comments

Comments
 (0)