Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions controller/predicates/hasRequestErrors.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:has_request_errors');
const stackTraceLine = require('../../helper/stackTraceLine');

module.exports = (req, res) => {
const has_request_errors = _.get(req, 'errors', []).length > 0;
debugLog.push(req, () => ({
reply: has_request_errors,
stack_trace: stackTraceLine()
reply: has_request_errors
}));
return has_request_errors;
};
4 changes: 1 addition & 3 deletions controller/predicates/hasRequestParameter.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:has_request_parameter');
const stackTraceLine = require('../../helper/stackTraceLine');

// returns true IFF req.clean has a key with the supplied name AND a non-empty value
module.exports = (parameter) => (req, res) => {
const value = _.get(req, ['clean', parameter]);
const has_request_parameter = _.isNumber(value) || !_.isEmpty(value);

debugLog.push(req, () => ({
reply: {[parameter]: has_request_parameter},
stack_trace: stackTraceLine()
reply: {[parameter]: has_request_parameter}
}));

return has_request_parameter;
Expand Down
4 changes: 1 addition & 3 deletions controller/predicates/hasResponseData.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:has_response_data');
const stackTraceLine = require('../../helper/stackTraceLine');

module.exports = (request, response) => {
const has_response_data = _.get(response, 'data', []).length > 0;
debugLog.push(request, () => ({
reply: has_response_data,
stack_trace: stackTraceLine()
reply: has_response_data
}));
return has_response_data;
};
4 changes: 1 addition & 3 deletions controller/predicates/hasResultsAtLayers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:has_results_at_layers');
const stackTraceLine = require('../../helper/stackTraceLine');
// returns a function that returns true if any result.layer is in any of the
// supplied layers using array intersection

Expand All @@ -18,8 +17,7 @@ module.exports = (layers) => {
));

debugLog.push(request, () => ({
reply: {[layers]: has_results_at_layers},
stack_trace: stackTraceLine()
reply: {[layers]: has_results_at_layers}
}));
return has_results_at_layers;
};
Expand Down
4 changes: 1 addition & 3 deletions controller/predicates/isAdminOnlyAnalysis.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_admin_only_analysis');
const stackTraceLine = require('../../helper/stackTraceLine');

module.exports = (request, response) => {
if (!request.clean.hasOwnProperty('parsed_text')) {
Expand All @@ -15,8 +14,7 @@ module.exports = (request, response) => {
});

debugLog.push(request, () => ({
reply: is_admin_only_analysis,
stack_trace: stackTraceLine()
reply: is_admin_only_analysis
}));
return is_admin_only_analysis;
};
4 changes: 1 addition & 3 deletions controller/predicates/isCoarseReverse.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_coarse_reverse');
const non_coarse_layers = ['address', 'street', 'venue'];
const stackTraceLine = require('../../helper/stackTraceLine');

module.exports = (req, res) => {
// returns true if layers is undefined, empty, or contains 'address', 'street', or 'venue'
const is_coarse_reverse = !_.isEmpty(req.clean.layers) &&
_.isEmpty(_.intersection(req.clean.layers, non_coarse_layers));
debugLog.push(req, () => ({
reply: is_coarse_reverse,
stack_trace: stackTraceLine()
reply: is_coarse_reverse
}));
return is_coarse_reverse;
};
4 changes: 1 addition & 3 deletions controller/predicates/isOnlyNonAdminLayers.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_only_non_admin_layers');
const stackTraceLine = require('../../helper/stackTraceLine');

// return true IFF req.clean.layers is empty OR there are non-venue/address/street layers
module.exports = (req, res) => {
const is_only_non_admin_layers = !_.isEmpty(_.get(req, 'clean.layers', [])) &&
_.isEmpty(_.difference(req.clean.layers, ['venue', 'address', 'street']));

debugLog.push(req, () => ({
reply: is_only_non_admin_layers,
stack_trace: stackTraceLine()
reply: is_only_non_admin_layers
}));
return is_only_non_admin_layers;
};
12 changes: 2 additions & 10 deletions controller/predicates/isPeliasParse.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_pelias_parse');
const stackTraceLine = require('../../helper/stackTraceLine');

// returns true IFF req.clean.parser is pelias
module.exports = (req, res) => {
const is_pelias_parse = _.get(req, 'clean.parser') === 'pelias';
debugLog.push(req, () => ({
reply: is_pelias_parse,
stack_trace: stackTraceLine()
}));
return is_pelias_parse;
module.exports = (req) => {
return _.get(req, 'clean.parser') === 'pelias';
};
4 changes: 1 addition & 3 deletions controller/predicates/isRequestLayersAnyAddressRelated.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_request_layers_any_address_related');
const stackTraceLine = require('../../helper/stackTraceLine');

// return true if any layers allowed by the query are related to an address query
// this includes address and street but NOT venue, postalcode, admin, and custom layers
Expand All @@ -20,8 +19,7 @@ module.exports = (req, res) => {
}

debugLog.push(req, () => ({
reply: result,
stack_trace: stackTraceLine()
reply: result
}));

return result;
Expand Down
4 changes: 1 addition & 3 deletions controller/predicates/isRequestSourcesIncludesWhosOnFirst.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_request_sources_includes_whosonfirst');
const stackTraceLine = require('../../helper/stackTraceLine');

// returns true IFF 'whosonfirst' is included in the requested sources
module.exports = (req, res) => {
const is_request_sources_includes_whosonfirst = _.get(req, 'clean.sources', []).includes(
'whosonfirst'
);
debugLog.push(req, () => ({
reply: is_request_sources_includes_whosonfirst,
stack_trace: stackTraceLine()
reply: is_request_sources_includes_whosonfirst
}));
return is_request_sources_includes_whosonfirst;
};
4 changes: 1 addition & 3 deletions controller/predicates/isRequestSourcesOnlyWhosOnFirst.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_request_sources_only_whosonfirst');
const stackTraceLine = require('../../helper/stackTraceLine');

// returns true IFF 'whosonfirst' is the only requested source
module.exports = (req, res) => {
Expand All @@ -10,8 +9,7 @@ module.exports = (req, res) => {
['whosonfirst']
);
debugLog.push(req, () => ({
reply: is_request_sources_only_whosonfirst,
stack_trace: stackTraceLine()
reply: is_request_sources_only_whosonfirst
}));
return is_request_sources_only_whosonfirst;
};
4 changes: 1 addition & 3 deletions controller/predicates/isRequestSourcesUndefined.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
const _ = require('lodash');
const Debug = require('../../helper/debug');
const debugLog = new Debug('controller:predicates:is_request_sources_undefined');
const stackTraceLine = require('../../helper/stackTraceLine');

// returns true IFF there are no requested sources
module.exports = (req, res) => {
const is_request_sources_undefined = _.isEmpty(
_.get(req, 'clean.sources')
);
debugLog.push(req, () => ({
reply: is_request_sources_undefined,
stack_trace: stackTraceLine()
reply: is_request_sources_undefined
}));
return is_request_sources_undefined;
};
11 changes: 0 additions & 11 deletions helper/stackTraceLine.js

This file was deleted.

20 changes: 0 additions & 20 deletions test/unit/helper/stackTraceLine.js

This file was deleted.

1 change: 0 additions & 1 deletion test/unit/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ var tests = [
require('./helper/logging'),
require('./helper/TypeMapping'),
require('./helper/type_mapping'),
require('./helper/stackTraceLine'),
require('./helper/unicode'),
require('./middleware/access_log'),
require('./middleware/accuracy'),
Expand Down