Browse Source

moved helper functions outside of setup scope

pull/782/head
Stephen Hess 8 years ago
parent
commit
73ef71d863
  1. 2
      controller/place.js
  2. 2
      controller/search.js

2
controller/place.js

@ -6,7 +6,6 @@ const retry = require('retry');
const mgetService = require('../service/mget'); const mgetService = require('../service/mget');
const logger = require('pelias-logger').get('api'); const logger = require('pelias-logger').get('api');
function setup( apiConfig, esclient ){
function requestHasErrors(request) { function requestHasErrors(request) {
return _.get(request, 'errors', []).length > 0; return _.get(request, 'errors', []).length > 0;
} }
@ -15,6 +14,7 @@ function setup( apiConfig, esclient ){
return _.get(err, 'status') === 408; return _.get(err, 'status') === 408;
} }
function setup( apiConfig, esclient ){
function controller( req, res, next ){ function controller( req, res, next ){
// do not run controller when a request validation error has occurred. // do not run controller when a request validation error has occurred.
if (requestHasErrors(req)){ if (requestHasErrors(req)){

2
controller/search.js

@ -7,7 +7,6 @@ const logger = require('pelias-logger').get('api');
const logging = require( '../helper/logging' ); const logging = require( '../helper/logging' );
const retry = require('retry'); const retry = require('retry');
function setup( apiConfig, esclient, query ){
function requestHasErrors(request) { function requestHasErrors(request) {
return _.get(request, 'errors', []).length > 0; return _.get(request, 'errors', []).length > 0;
} }
@ -20,6 +19,7 @@ function setup( apiConfig, esclient, query ){
return _.get(err, 'status') === 408; return _.get(err, 'status') === 408;
} }
function setup( apiConfig, esclient, query ){
function controller( req, res, next ){ function controller( req, res, next ){
// do not run controller when a request // do not run controller when a request
// validation error has occurred. // validation error has occurred.

Loading…
Cancel
Save