From f7a763b6378c4dc9ce1d334f11582f84ec20e1e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= <matallo@carto.com>
Date: Fri, 7 Jul 2017 17:09:17 +0200
Subject: [PATCH] widgets: add aggregation for search results

---
 lib/cartodb/models/dataview/aggregation.js | 3 ++-
 package.json                               | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index c15f0506..2fb76600 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -253,6 +253,7 @@ Aggregation.prototype.search = function(psql, userQuery, callback) {
     var self = this;
 
     var _userQuery = psql.escapeLiteral('%' + userQuery + '%');
+    var _value = this.aggregation !== 'count' && this.aggregationColumn ? this.aggregation + '(' + this.aggregationColumn + ')' : 'count(1)';
 
     // TODO unfiltered will be wrong as filters are already applied at this point
     var query = searchQueryTpl({
@@ -265,7 +266,7 @@ Aggregation.prototype.search = function(psql, userQuery, callback) {
         _searchFiltered: filterCategoriesQueryTpl({
             _query: this.query,
             _column: this.column,
-            _value: 'count(1)',
+            _value: _value,
             _userQuery: _userQuery
         })
     });
diff --git a/package.json b/package.json
index c32459f0..f613df30 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
   "contributors": [
     "Simon Tokumine <simon@vizzuality.com>",
     "Javi Santana <jsantana@vizzuality.com>",
-    "Sandro Santilli <strk@vizzuality.com>"
+    "Sandro Santilli <strk@vizzuality.com>",
+    "Carlos Matallín <matallo@carto.com>"
   ],
   "dependencies": {
     "body-parser": "~1.14.0",