From a2848ff6f0010e64e7680e6e6d05a90bc054a5bc Mon Sep 17 00:00:00 2001
From: Lily He <yonglinlilyhe@gmail.com>
Date: Thu, 3 Aug 2017 17:40:39 -0400
Subject: [PATCH] debug messages for controller/search & predicates

---
 controller/predicates/is_admin_only_analysis.js |  7 ++++++-
 controller/predicates/is_coarse_reverse.js      |  8 ++++++--
 controller/search.js                            | 13 +++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/controller/predicates/is_admin_only_analysis.js b/controller/predicates/is_admin_only_analysis.js
index d170f3fc..7ecbd4bb 100644
--- a/controller/predicates/is_admin_only_analysis.js
+++ b/controller/predicates/is_admin_only_analysis.js
@@ -1,13 +1,18 @@
 const _ = require('lodash');
+const Debug = require('../../helper/debug');
+const debugLog = new Debug('controller:predicates:is_admin_only_analysis');
 
 module.exports = (request, response) => {
   if (!request.clean.hasOwnProperty('parsed_text')) {
+    debugLog.push(request, false + '(no parsed_text)');
     return false;
   }
 
   // return true only if all non-admin properties of parsed_text are empty
-  return ['number', 'street', 'query', 'category', 'postalcode'].every((prop) => {
+   const is_admin_only_analysis = ['number', 'street', 'query', 'category', 'postalcode'].every((prop) => {
     return _.isEmpty(request.clean.parsed_text[prop]);
   });
 
+  debugLog.push(request, is_admin_only_analysis);
+  return is_admin_only_analysis;
 };
diff --git a/controller/predicates/is_coarse_reverse.js b/controller/predicates/is_coarse_reverse.js
index e02f90c5..55df78f5 100644
--- a/controller/predicates/is_coarse_reverse.js
+++ b/controller/predicates/is_coarse_reverse.js
@@ -1,9 +1,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'];
 
 module.exports = (req, res) => {
   // returns true if layers is undefined, empty, or contains 'address', 'street', or 'venue'
-  return !_.isEmpty(req.clean.layers) &&
+  const is_coarse_reverse = !_.isEmpty(req.clean.layers) &&
           _.isEmpty(_.intersection(req.clean.layers, non_coarse_layers));
+
+  debugLog.push(req, is_coarse_reverse);
+  return is_coarse_reverse;
 };
diff --git a/controller/search.js b/controller/search.js
index 989060a8..a8bee3e4 100644
--- a/controller/search.js
+++ b/controller/search.js
@@ -6,6 +6,8 @@ const searchService = require('../service/search');
 const logger = require('pelias-logger').get('api');
 const logging = require( '../helper/logging' );
 const retry = require('retry');
+const Debug = require('../helper/debug');
+const debugLog = new Debug('controller:search');
 
 function isRequestTimeout(err) {
   return _.get(err, 'status') === 408;
@@ -16,7 +18,7 @@ function setup( apiConfig, esclient, query, should_execute ){
     if (!should_execute(req, res)) {
       return next();
     }
-
+    debugLog.beginTimer(req);
     let cleanOutput = _.cloneDeep(req.clean);
     if (logging.isDNT(req)) {
       cleanOutput = logging.removeFields(cleanOutput);
@@ -28,6 +30,7 @@ function setup( apiConfig, esclient, query, should_execute ){
 
     // if there's no query to call ES with, skip the service
     if (_.isUndefined(renderedQuery)) {
+      debugLog.stopTimer(req, 'No query to call ES with. Skipping');
       return next();
     }
 
@@ -60,6 +63,7 @@ function setup( apiConfig, esclient, query, should_execute ){
         // only consider for status 408 (request timeout)
         if (isRequestTimeout(err) && operation.retry(err)) {
           logger.info(`request timed out on attempt ${currentAttempt}, retrying`);
+          debugLog.stopTimer(req, 'request timed out, retrying');
           return;
         }
 
@@ -97,11 +101,16 @@ function setup( apiConfig, esclient, query, should_execute ){
           ];
 
           logger.info(messageParts.join(' '));
+          debugLog.push(req, {queryType: {
+            [renderedQuery.type] : {
+              es_result_count: parseInt(messageParts[2].slice(17, -1))
+            }
+          }});
         }
         logger.debug('[ES response]', docs);
         next();
       });
-
+      debugLog.stopTimer(req);
     });
 
   }