From 819a5783474b183cb06f639d12e0313c214d69dc Mon Sep 17 00:00:00 2001
From: Daria Voytova <vdariaclem@gmail.com>
Date: Fri, 26 Jan 2018 18:38:16 +0300
Subject: [PATCH 1/3] Remove the filter button from the toolbar

---
 apinf_packages/dashboard/client/view/toolbar/toolbar.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apinf_packages/dashboard/client/view/toolbar/toolbar.html b/apinf_packages/dashboard/client/view/toolbar/toolbar.html
index 106f40e540..d0e6eb62f4 100644
--- a/apinf_packages/dashboard/client/view/toolbar/toolbar.html
+++ b/apinf_packages/dashboard/client/view/toolbar/toolbar.html
@@ -21,9 +21,6 @@
         </select>
       </div>
       <div class="form-group pull-right">
-        <button class="btn btn-default">
-          <i class="fa fa-filter" aria-hidden="true"></i>
-        </button>
         <select name="sort" class="form-control toolbar-select">
           <option value="name">
             {{_ 'dashboardToolbar_optionText_apiName' }}

From 14ca658c073fcbe6f0c17f44d74fdb98977bad11 Mon Sep 17 00:00:00 2001
From: Daria Voytova <vdariaclem@gmail.com>
Date: Fri, 26 Jan 2018 19:00:10 +0300
Subject: [PATCH 2/3] Add default value of query parameter "sort" on the
 Dashboard route

---
 apinf_packages/dashboard/client/lib/routes.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apinf_packages/dashboard/client/lib/routes.js b/apinf_packages/dashboard/client/lib/routes.js
index edb554dea3..bef58cd874 100644
--- a/apinf_packages/dashboard/client/lib/routes.js
+++ b/apinf_packages/dashboard/client/lib/routes.js
@@ -29,6 +29,12 @@ signedIn.route('/dashboard', {
       // Default value is 7
       context.queryParams.timeframe = 7;
     }
+
+    if (!context.queryParams.sort) {
+      // Initialize sort parameter if it doesn't specify
+      // Default value is 'name'
+      context.queryParams.sort = 'name';
+    }
   }],
   name: 'dashboard',
   action () {

From f9103fd25de07781ad05d89df865321ea127a18c Mon Sep 17 00:00:00 2001
From: Daria Voytova <vdariaclem@gmail.com>
Date: Fri, 26 Jan 2018 19:26:58 +0300
Subject: [PATCH 3/3] Implement Sort feature in the Dashboard toolbar:

- groupingApiIds remake to groupingBackendIds. Now there returns IDs of Proxy Backends
- Changed summaryStatisticNumber method: add parameter proxyBackendIds
- Removed summaryStatisticTrend method
- Added totalNumberRequestsAndTrend method: return total number for current period and comparison data with previous period
- Code refactoring, clean up
---
 apinf_packages/analytics/server/methods.js    | 101 +++++++++-------
 .../dashboard/client/analytic/body/body.html  |  18 +--
 .../dashboard/client/analytic/body/body.js    |  83 ++++---------
 .../client/view/overview/overview.html        |  44 +++----
 .../client/view/overview/overview.js          |  79 +++----------
 .../view/summary_statistics/summary.html      |  61 +++++-----
 .../client/view/summary_statistics/summary.js | 109 ++++++++----------
 .../dashboard/client/view/view.html           |  18 +--
 apinf_packages/dashboard/client/view/view.js  |  88 +++++++-------
 apinf_packages/dashboard/server/methods.js    |  94 +++++++--------
 10 files changed, 289 insertions(+), 406 deletions(-)

diff --git a/apinf_packages/analytics/server/methods.js b/apinf_packages/analytics/server/methods.js
index 2ff0f42e34..8b01ece9f2 100644
--- a/apinf_packages/analytics/server/methods.js
+++ b/apinf_packages/analytics/server/methods.js
@@ -9,9 +9,11 @@ import { check } from 'meteor/check';
 
 // Collections imports
 import AnalyticsData from '/apinf_packages/analytics/collection';
+import ProxyBackends from '/apinf_packages/proxy_backends/collection';
 
 // Npm packages imports
 import _ from 'lodash';
+import moment from 'moment/moment';
 
 // APInf imports
 import { calculateTrend } from '/apinf_packages/dashboard/lib/trend_helpers';
@@ -107,22 +109,16 @@ Meteor.methods({
 
     return errors;
   },
-  summaryStatisticNumber (filter) {
+  summaryStatisticNumber (filter, proxyBackendIds) {
     check(filter, Object);
+    check(proxyBackendIds, Array);
 
     // Create query to $match
     const matchQuery = {
       date: { $gte: filter.fromDate, $lt: filter.toDate },
+      proxyBackendId: { $in: proxyBackendIds },
     };
 
-    if (filter.proxyId) {
-      // Fetch data for particular Proxy (and several Proxy Backends)
-      matchQuery.proxyId = filter.proxyId;
-    } else {
-      // Fetch data for particular Proxy Backend
-      matchQuery.proxyBackendId = filter.proxyBackendId;
-    }
-
     const requestPathsData = {};
 
     AnalyticsData.aggregate(
@@ -142,27 +138,21 @@ Meteor.methods({
             sumMedianTime: { $sum: '$medianResponseTime' },
             sumUniqueUsers: { $sum: '$uniqueUsers' },
             successCallsCount: { $sum: '$successCallsCount' },
-            redirectCallsCount: { $sum: '$redirectCallsCount' },
-            failCallsCount: { $sum: '$failCallsCount' },
             errorCallsCount: { $sum: '$errorCallsCount' },
           },
         },
       ]
     ).forEach(dataset => {
-      // Create query
-      const query = { prefix: dataset._id, date: matchQuery.date, requestNumber: { $ne: 0 } };
+      // Expend query
+      matchQuery.prefix = dataset._id;
+      matchQuery.requestNumber = { $ne: 0 };
 
-      if (filter.proxyId) {
-        query.proxyId = filter.proxyId;
-      } else {
-        query.proxyBackendId = filter.proxyBackendId;
-      }
-
-      // Get the number of date when requests were
-      const existedValuesCount = AnalyticsData.find(query).count();
+      // Get the number of date when requests were no 0
+      const existedValuesCount = AnalyticsData.find(matchQuery).count();
 
       // Calculate average (mean) value of Response time and Uniques users during period
       requestPathsData[dataset._id] = {
+        prefix: dataset._id, // Just rename it
         medianResponseTime: parseInt(dataset.sumMedianTime / existedValuesCount, 10) || 0,
         avgUniqueUsers: parseInt(dataset.sumUniqueUsers / existedValuesCount, 10) || 0,
       };
@@ -172,29 +162,6 @@ Meteor.methods({
 
     return requestPathsData;
   },
-  summaryStatisticTrend (filter, currentPeriodResponse) {
-    check(filter, Object);
-    check(currentPeriodResponse, Object);
-
-    // Get summary statistic data about previous period
-    const previousPeriodResponse = Meteor.call('summaryStatisticNumber', filter);
-
-    const comparisonData = {};
-
-    // Compare the current and previous periods data
-    _.mapKeys(currentPeriodResponse, (dataset, path) => {
-      const previousPeriodData = previousPeriodResponse[path] || {};
-
-      comparisonData[path] = {
-        compareRequests: calculateTrend(previousPeriodData.requestNumber, dataset.requestNumber),
-        compareResponse:
-          calculateTrend(previousPeriodData.medianResponseTime, dataset.medianResponseTime),
-        compareUsers: calculateTrend(previousPeriodData.avgUniqueUsers, dataset.avgUniqueUsers),
-      };
-    });
-
-    return comparisonData;
-  },
   statusCodesData (filter) {
     check(filter, Object);
 
@@ -282,4 +249,50 @@ Meteor.methods({
 
     return requestPathsData;
   },
+  totalNumberRequestsAndTrend (filter, proxyBackendIds) {
+    check(filter, Object);
+    check(proxyBackendIds, Array);
+
+    // Get data for Current period
+    const currentPeriodResponse =
+      Meteor.call('summaryStatisticNumber', filter, proxyBackendIds);
+
+    // Create date range filter for Previous period
+    const previousPeriodFilter = {
+      fromDate: moment(filter.fromDate).subtract(filter.timeframe, 'd').valueOf(),
+      toDate: filter.fromDate,
+    };
+
+    // Get data for Previous period
+    const previousPeriodResponse =
+      Meteor.call('summaryStatisticNumber', previousPeriodFilter, proxyBackendIds);
+
+    const response = [];
+
+    // Compare the current and previous periods data
+    _.mapKeys(currentPeriodResponse, (dataset, path) => {
+      const proxyBackend = ProxyBackends.findOne({
+        'apiUmbrella.url_matches.frontend_prefix': dataset.prefix,
+      });
+
+      if (proxyBackend) {
+        dataset.proxyBackendId = proxyBackend._id;
+        dataset.apiName = proxyBackend.apiName();
+        dataset.apiSlug = proxyBackend.apiSlug();
+      }
+
+      // Create a comparison data
+      const previousPeriodData = previousPeriodResponse[path] || {};
+      dataset.compareRequests =
+        calculateTrend(previousPeriodData.requestNumber, dataset.requestNumber);
+      dataset.compareResponse =
+        calculateTrend(previousPeriodData.medianResponseTime, dataset.medianResponseTime);
+      dataset.compareUsers =
+        calculateTrend(previousPeriodData.avgUniqueUsers, dataset.avgUniqueUsers);
+
+      response.push(dataset);
+    });
+
+    return response;
+  },
 });
diff --git a/apinf_packages/dashboard/client/analytic/body/body.html b/apinf_packages/dashboard/client/analytic/body/body.html
index dffe574ef2..4480456085 100644
--- a/apinf_packages/dashboard/client/analytic/body/body.html
+++ b/apinf_packages/dashboard/client/analytic/body/body.html
@@ -10,7 +10,7 @@
       <div class="col-xs-12 col-md-4">
         <div class="api-view-card form-group">
           <p class="overview-col-title">
-            {{_ 'apiAnalyticPageBody_text_requestsCount' count=(getStatistics 'requests') }}
+            {{_ 'apiAnalyticPageBody_text_requestsCount' count=analyticsData.requestNumber }}
           </p>
           <p class="overview-col-title">
             {{_ 'apiAnalyticPageBody_chartTitle_apiRequests' }}
@@ -23,7 +23,7 @@
             {{/ if }}
           </div>
 
-          {{# with comparisonData }}
+          {{# if analyticsData }}
             <div class="form-group">
               <div class="{{ arrowDirection 'requests' }}"></div>
               <!-- Keep the space symbol to set SPAN element a height -->
@@ -31,7 +31,7 @@
                 {{ summaryComparing 'requests' }}&nbsp;
               </span>
             </div>
-          {{/ with }}
+          {{/ if }}
 
           <!-- response status list-->
           <div class="row">
@@ -55,7 +55,7 @@
       <div class="col-xs-12 col-md-4">
         <div class="api-view-card form-group">
           <p class="overview-col-title">
-            {{_ 'apiAnalyticPageBody_text_responseTime' time=(getStatistics 'time') }}
+            {{_ 'apiAnalyticPageBody_text_responseTime' time=analyticsData.medianResponseTime }}
           </p>
           <p class="overview-col-title">
             {{_ 'apiAnalyticPageBody_chartTitle_medianResponseTime' }}
@@ -67,7 +67,7 @@
               {{> spinner}}
             {{/ if }}
           </div>
-          {{# with comparisonData }}
+          {{# if analyticsData }}
             <div class="form-group">
               <div class="{{ arrowDirection 'time' }}"></div>
               <!-- Keep the space symbol to set SPAN element a height -->
@@ -75,7 +75,7 @@
                 {{ summaryComparing 'time' }}&nbsp;
               </span>
             </div>
-          {{/ with }}
+          {{/ if }}
           <!-- Keep the space symbol to set a height the element a height -->
           <div class="row">&nbsp;</div>
         </div>
@@ -85,7 +85,7 @@
       <div class="col-xs-12 col-md-4">
         <div class="api-view-card form-group">
           <p class="overview-col-title">
-            {{_ 'apiAnalyticPageBody_text_usersCount' count=(getStatistics 'users') }} <sup>*</sup>
+            {{_ 'apiAnalyticPageBody_text_usersCount' count=analyticsData.avgUniqueUsers }} <sup>*</sup>
           </p>
           <p class="overview-col-title">
             {{_ 'apiAnalyticPageBody_chartTitle_uniqueUsers' }}
@@ -97,7 +97,7 @@
               {{> spinner}}
             {{/ if }}
           </div>
-          {{# with comparisonData }}
+          {{# if analyticsData }}
             <div class="form-group">
               <div class="{{ arrowDirection 'users' }}"></div>
               <!-- Keep the space symbol to set SPAN element a height -->
@@ -105,7 +105,7 @@
                 {{ summaryComparing 'users' }}&nbsp;
               </span>
             </div>
-          {{/ with }}
+          {{/ if }}
           <div class="overview-help-text">
             <sup>*</sup> {{_ 'apiAnalyticPageBody_helpText_averageUniqueUsers' }}
           </div>
diff --git a/apinf_packages/dashboard/client/analytic/body/body.js b/apinf_packages/dashboard/client/analytic/body/body.js
index 80106b4b7e..772b9220e6 100644
--- a/apinf_packages/dashboard/client/analytic/body/body.js
+++ b/apinf_packages/dashboard/client/analytic/body/body.js
@@ -21,7 +21,6 @@ import _ from 'lodash';
 
 // APInf import
 import mostUsersRequest from '/apinf_packages/dashboard/client/elasticsearch_queries/most_users';
-import promisifyCall from '/apinf_packages/core/helper_functions/promisify_call';
 import {
   arrowDirection,
   percentageValue,
@@ -38,8 +37,7 @@ Template.apiAnalyticPageBody.onCreated(function () {
 
   // Init variables
   instance.overviewChartResponse = new ReactiveVar();
-  instance.summaryStatisticResponse = new ReactiveVar();
-  instance.comparisonStatisticResponse = new ReactiveVar();
+  instance.analyticsData = new ReactiveVar();
   instance.statusCodesResponse = new ReactiveVar();
   instance.timelineChartResponse = new ReactiveVar();
   instance.allRequestPaths = new ReactiveVar();
@@ -55,22 +53,9 @@ Template.apiAnalyticPageBody.onCreated(function () {
     // Get timestamp of timeframe ago 00:00:00 Date time (included value)
     const fromDate = moment(toDate).subtract(timeframe, 'd').valueOf();
 
-    // Get data about summary statistic for current period
-    promisifyCall('summaryStatisticNumber', { proxyBackendId, fromDate, toDate })
-      .then((currentPeriodDataset) => {
-        instance.summaryStatisticResponse.set(currentPeriodDataset);
-
-        const previousFromDate = moment(fromDate).subtract(timeframe, 'd').valueOf();
-
-        // Get trend data is based on the current period data
-        Meteor.call('summaryStatisticTrend',
-          { proxyBackendId, fromDate: previousFromDate, toDate: fromDate }, currentPeriodDataset,
-          (err, compareResponse) => {
-            // Save the response about Comparison data
-            instance.comparisonStatisticResponse.set(compareResponse);
-          });
-      }).catch((error) => {
-        throw new Meteor.Error(error);
+    Meteor.call('totalNumberRequestsAndTrend',
+      { fromDate, toDate, timeframe }, [proxyBackendId], (error, result) => {
+        this.analyticsData.set(result);
       });
 
     // Get data about summary statistic over time
@@ -135,21 +120,32 @@ Template.apiAnalyticPageBody.onCreated(function () {
 });
 
 Template.apiAnalyticPageBody.helpers({
-// TODO: Keep in mind to case with error result
   arrowDirection (parameter) {
+    const instance = Template.instance();
+
+    const dataset = instance.analyticsData.get();
+
     // Provide compared data
-    return arrowDirection(parameter, this);
+    return arrowDirection(parameter, dataset[0]);
   },
   percentages (parameter) {
+    const instance = Template.instance();
+
+    const dataset = instance.analyticsData.get() || [];
+
     // Provide compared data
-    return percentageValue(parameter, this);
+    return percentageValue(parameter, dataset[0]);
   },
   summaryComparing (parameter) {
+    const instance = Template.instance();
+
     // Get value of timeframe
     const currentTimeframe = FlowRouter.getQueryParam('timeframe');
 
+    const dataset = instance.analyticsData.get() || [];
+
     // Provide compared data
-    return summaryComparing(parameter, this, currentTimeframe);
+    return summaryComparing(parameter, dataset[0], currentTimeframe);
   },
   overviewChartResponse () {
     const instance = Template.instance();
@@ -157,36 +153,12 @@ Template.apiAnalyticPageBody.helpers({
     // Return boolean value of available overviewChart response
     return !!(instance.overviewChartResponse.get());
   },
-  getStatistics (param) {
+  analyticsData () {
     const instance = Template.instance();
-    const path = instance.requestPath;
-
-    const summaryStatisticResponse = instance.summaryStatisticResponse.get();
-    const summaryStatistic = summaryStatisticResponse && summaryStatisticResponse[path];
-
-    let count;
-
-    switch (param) {
-
-      case 'requests': {
-        count = summaryStatistic ? summaryStatistic.requestNumber : 0;
-        break;
-      }
-      case 'time': {
-        count = summaryStatistic ? summaryStatistic.medianResponseTime : 0;
-        break;
-      }
-      case 'users': {
-        count = summaryStatistic ? summaryStatistic.avgUniqueUsers : 0;
-        break;
-      }
-      default: {
-        count = 0;
-        break;
-      }
-    }
+    const dataset = instance.analyticsData.get() || [];
 
-    return count;
+    // Return boolean value of available analyticsData response
+    return dataset[0];
   },
   getChartData (param) {
     const instance = Template.instance();
@@ -218,15 +190,6 @@ Template.apiAnalyticPageBody.helpers({
 
     return dataset;
   },
-  comparisonData () {
-    const instance = Template.instance();
-    const path = instance.requestPath;
-
-    const comparisonResponse = instance.comparisonStatisticResponse.get();
-    const comparisonData = comparisonResponse && comparisonResponse[path];
-
-    return comparisonData || {};
-  },
   getStatusCode (param) {
     const instance = Template.instance();
     const path = instance.requestPath;
diff --git a/apinf_packages/dashboard/client/view/overview/overview.html b/apinf_packages/dashboard/client/view/overview/overview.html
index 50f1d92acf..f7abcee9c9 100644
--- a/apinf_packages/dashboard/client/view/overview/overview.html
+++ b/apinf_packages/dashboard/client/view/overview/overview.html
@@ -4,77 +4,71 @@
 https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 -->
 
 <template name="dashboardOverviewStatistic">
-  <div class="overview-body" data-overview-id="{{ proxyBackend._id }}">
+  <div class="overview-body" data-overview-id="{{ dataset.proxyBackendId }}">
     <div class="row overview-line">
       <div class="col-xs-12 col-md-3">
         <p class="overview-col-title">
-          {{ proxyBackend.apiName }}
+          {{ dataset.apiName }}
         </p>
         <div class="form-group">
           <p>
-            {{_ 'dashboardOverviewStatistic_text_requestPath' path=proxyBackend.frontendPrefix }}
+            {{_ 'dashboardOverviewStatistic_text_requestPath' path=prefix }}
           </p>
           <p class="text-success">
-            {{_ 'dashboardOverviewStatistic_text_successCalls' count=(getStatistics 'success') }}
+            {{_ 'dashboardOverviewStatistic_text_successCalls' count=dataset.successCallsCount }}
           </p>
           <span class="text-danger">
             {{# if timeframeYesterday }}
-              {{_ 'dashboardOverviewStatistic_text_errorCallsYesterday' count=(getStatistics 'error') }}
+              {{_ 'dashboardOverviewStatistic_text_errorCallsYesterday' count=dataset.errorCallsCount }}
             {{ else }}
-              {{_ 'dashboardOverviewStatistic_text_errorCalls' count=(getStatistics 'error') timeframe=timeframe }}
+              {{_ 'dashboardOverviewStatistic_text_errorCalls' count=dataset.errorCallsCount timeframe=timeframe }}
             {{/ if }}
           </span>
         </div>
       </div>
       <div class="col-xs-12 col-md-3">
         <p class="overview-col-title">
-          {{_ 'dashboardOverviewStatistic_text_requestsCount' count=(getStatistics 'requests')}}
+          {{_ 'dashboardOverviewStatistic_text_requestsCount' count=dataset.requestNumber}}
         </p>
         <div class="form-group">
           <span class="overview-col-title">
             {{_ 'dashboardOverviewStatistic_chartTitle_requestsNumber' }}
           </span>
-          {{> requestsOverTime chartData=(getChartData 'requests') proxyBackendId=proxyBackend._id }}
-          {{# with comparisonData }}
-            <div class="{{ arrowDirection 'requests' }}"></div>
-            <span>{{ overviewComparing 'requests' }}</span>
-          {{/ with }}
+          {{> requestsOverTime chartData=(getChartData 'requests') proxyBackendId=dataset.proxyBackendId }}
+          <div class="{{ arrowDirection 'requests' }}"></div>
+          <span>{{ overviewComparing 'requests' }}</span>
         </div>
       </div>
       <div class="col-xs-12 col-md-3">
         <p class="overview-col-title">
-          {{_ 'dashboardOverviewStatistic_text_responseTime' time=(getStatistics 'time') }}
+          {{_ 'dashboardOverviewStatistic_text_responseTime' time=dataset.medianResponseTime }}
         </p>
         <div class="form-group">
           <span class="overview-col-title">
             {{_ 'dashboardOverviewStatistic_chartTitle_responseTime' }}
           </span>
-          {{> medianResponseTime chartData=(getChartData 'time') proxyBackendId=proxyBackend._id }}
-          {{# with comparisonData }}
-            <div class="{{ arrowDirection 'time' }}"></div>
-            <span>{{ overviewComparing 'time' }}</span>
-          {{/ with }}
+          {{> medianResponseTime chartData=(getChartData 'time') proxyBackendId=dataset.proxyBackendId }}
+          <div class="{{ arrowDirection 'time' }}"></div>
+          <span>{{ overviewComparing 'time' }}</span>
         </div>
       </div>
       <div class="col-xs-12 col-md-3">
         <p class="overview-col-title">
-          {{_ 'dashboardOverviewStatistic_text_usersCount' count=(getStatistics 'users') }} <sup>*</sup>
+          {{_ 'dashboardOverviewStatistic_text_usersCount' count=dataset.avgUniqueUsers }} <sup>*</sup>
         </p>
         <div class="form-group">
           <span class="overview-col-title">
             {{_ 'dashboardOverviewStatistic_chartTitle_uniqueUsers' }}
           </span>
-          {{> uniqueUsersOverTime chartData=(getChartData 'users') proxyBackendId=proxyBackend._id }}
-          {{# with comparisonData }}
-            <div class="{{ arrowDirection 'users' }}"></div>
-            <span>{{ overviewComparing 'users' }}</span>
-          {{/ with }}
+          {{> uniqueUsersOverTime chartData=(getChartData 'users') proxyBackendId=dataset.proxyBackendId }}
+          <div class="{{ arrowDirection 'users' }}"></div>
+          <span>{{ overviewComparing 'users' }}</span>
           <div class="overview-help-text">
             <sup>*</sup> {{_ 'dashboardOverviewStatistic_helpText_averageUniqueUsers' }}
           </div>
         </div>
 
-        <a href="{{ pathFor 'apiAnalyticPage' apiSlug=proxyBackend.apiSlug }}" class="pull-right">
+        <a href="{{ pathFor 'apiAnalyticPage' apiSlug=dataset.apiSlug }}" class="pull-right">
           {{_ 'dashboardOverviewStatistic_linkText_viewDetails' }}
         </a>
       </div>
diff --git a/apinf_packages/dashboard/client/view/overview/overview.js b/apinf_packages/dashboard/client/view/overview/overview.js
index 020f387ed1..aabc9a7fbd 100644
--- a/apinf_packages/dashboard/client/view/overview/overview.js
+++ b/apinf_packages/dashboard/client/view/overview/overview.js
@@ -18,18 +18,21 @@ import {
 
 Template.dashboardOverviewStatistic.helpers({
   arrowDirection (parameter) {
+    const dataset = Template.instance().data.dataset;
     // Provide compared data
-    return arrowDirection(parameter, this);
+    return arrowDirection(parameter, dataset);
   },
   percentages (parameter) {
+    const dataset = Template.instance().data.dataset;
     // Provide compared data
-    return percentageValue(parameter, this);
+    return percentageValue(parameter, dataset);
   },
   overviewComparing (parameter) {
+    const dataset = Template.instance().data.dataset;
     // Get value of timeframe
     const currentTimeframe = FlowRouter.getQueryParam('timeframe');
 
-    return summaryComparing(parameter, this, currentTimeframe);
+    return summaryComparing(parameter, dataset, currentTimeframe);
   },
   timeframeYesterday () {
     const timeframe = FlowRouter.getQueryParam('timeframe');
@@ -39,88 +42,34 @@ Template.dashboardOverviewStatistic.helpers({
   timeframe () {
     return FlowRouter.getQueryParam('timeframe');
   },
-  getStatistics (param) {
-    const proxyBackend = Template.instance().data.proxyBackend;
-    const path = proxyBackend.frontendPrefix();
-
-    const summaryStatisticResponse = Template.currentData().summaryStatisticResponse;
-    // Get summary statistics data that relates to provided Proxy Backend
-    const summaryStatistic = summaryStatisticResponse && summaryStatisticResponse[path];
-
-    const statusCodesResponse = Template.currentData().statusCodesResponse;
-    // Get response status codes data that relates to provided Proxy Backend
-    const statusCodesData = statusCodesResponse && statusCodesResponse[path];
-
-    let count;
-
-    switch (param) {
-      case 'success': {
-        count = statusCodesData ? statusCodesData.successCallsCount : 0;
-        break;
-      }
-      case 'error': {
-        count = statusCodesData ? statusCodesData.errorCallsCount : 0;
-        break;
-      }
-      case 'requests': {
-        count = summaryStatistic ? summaryStatistic.requestNumber : 0;
-        break;
-      }
-      case 'time': {
-        count = summaryStatistic ? summaryStatistic.medianResponseTime : 0;
-        break;
-      }
-      case 'users': {
-        count = summaryStatistic ? summaryStatistic.avgUniqueUsers : 0;
-        break;
-      }
-      default: {
-        count = 0;
-        break;
-      }
-    }
-
-    return count;
-  },
-  comparisonData () {
-    const proxyBackend = Template.instance().data.proxyBackend;
-    const path = proxyBackend.frontendPrefix();
-
-    const comparisonResponse = Template.currentData().comparisonStatisticResponse;
-    // Get comparison data that relates to provided Proxy Backend
-    const comparisonData = comparisonResponse && comparisonResponse[path];
-
-    return comparisonData || {};
-  },
   getChartData (param) {
-    const proxyBackend = Template.instance().data.proxyBackend;
-    const path = proxyBackend.frontendPrefix();
+    const prefix = Template.instance().data.prefix;
 
     const overviewChartResponse = Template.currentData().overviewChartResponse;
     // Get Overview chart data that relates to provided Proxy Backend
-    const overviewChartData = overviewChartResponse && overviewChartResponse[path];
+    const overviewChartData = overviewChartResponse && overviewChartResponse[prefix];
 
-    let dataset;
+    let chartData;
 
     switch (param) {
       case 'requests': {
-        dataset = overviewChartData ? overviewChartData.requestNumber : [];
+        chartData = overviewChartData ? overviewChartData.requestNumber : [];
         break;
       }
       case 'time': {
-        dataset = overviewChartData ? overviewChartData.medianTime : [];
+        chartData = overviewChartData ? overviewChartData.medianTime : [];
         break;
       }
       case 'users': {
-        dataset = overviewChartData ? overviewChartData.uniqueUsers : [];
+        chartData = overviewChartData ? overviewChartData.uniqueUsers : [];
         break;
       }
       default: {
-        dataset = [];
+        chartData = [];
         break;
       }
     }
 
-    return dataset;
+    return chartData;
   },
 });
diff --git a/apinf_packages/dashboard/client/view/summary_statistics/summary.html b/apinf_packages/dashboard/client/view/summary_statistics/summary.html
index 8ca4c3f69f..6810e6a6b3 100644
--- a/apinf_packages/dashboard/client/view/summary_statistics/summary.html
+++ b/apinf_packages/dashboard/client/view/summary_statistics/summary.html
@@ -4,10 +4,10 @@
 https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 -->
 
 <template name="dashboardSummaryStatistic">
-  {{# if proxyBackends }}
+  {{# if analyticsData }}
     <!-- Table head -->
     <h4>
-      {{ tableTitle }} ({{ proxyBackends.length }})
+      {{ tableTitle }} ({{ analyticsData.length }})
     </h4>
 
     <div class="dashboard-table-row statistic-title">
@@ -29,53 +29,46 @@ <h4>
 
     <div class="statistic-block">
       <!-- Table body -->
-      {{# each proxyBackend in proxyBackends }}
-        <div data-id="{{ proxyBackend._id }}" class="dashboard-table-row statistic-line">
-          <div class="row">
-            <div class="col-xs-3">
-              {{ proxyBackend.apiName }}
-            </div>
-            <div class="col-xs-3">
-              <span class="request-number">
-                {{ getCount proxyBackend.frontendPrefix 'requests' }}
-              </span>
-              {{# with comparisonData proxyBackend.frontendPrefix  }}
+      {{# each dataset in sortedAnalyticsData }}
+        {{# with dataset }}
+          <div data-id="{{ proxyBackendId }}" class="dashboard-table-row statistic-line">
+            <div class="row">
+              <div class="col-xs-3">
+                {{ apiName }}
+              </div>
+              <div class="col-xs-3">
+                <span class="request-number">
+                  {{ requestNumber }}
+                </span>
                 <div class="{{ arrowDirection 'requests' }}"></div>
                 <span class="{{ textColor 'requests' }}">
                   {{ percentages 'requests' }}
                 </span>
-              {{/ with }}
-            </div>
-            <div class="col-xs-3">
-              <span class="response-time">
-                {{ getCount proxyBackend.frontendPrefix 'time' }} ms
-              </span>
-              {{# with comparisonData proxyBackend.frontendPrefix  }}
+              </div>
+              <div class="col-xs-3">
+                <span class="response-time">
+                  {{ medianResponseTime }} ms
+                </span>
                 <div class="{{ arrowDirection 'time' }}"></div>
                 <span class="{{ textColor 'time' }}">
                   {{ percentages 'time' }}
                 </span>
-              {{/ with }}
-            </div>
-            <div class="col-xs-3">
-              <span class="unique-users">
-                {{ getCount proxyBackend.frontendPrefix 'users' }}
-              </span>
-              {{# with comparisonData proxyBackend.frontendPrefix  }}
+              </div>
+              <div class="col-xs-3">
+                <span class="unique-users">
+                  {{ avgUniqueUsers }}
+                </span>
                 <div class="{{ arrowDirection 'users' }}"></div>
                 <span class="{{ textColor 'users' }}">
                   {{ percentages 'users' }}
                 </span>
-              {{/ with }}
+              </div>
             </div>
           </div>
-        </div>
-        {{# if displayOverview proxyBackend._id }}
-          {{> dashboardOverviewStatistic proxyBackend=proxyBackend
+        {{/ with }}
+        {{# if displayOverview dataset.proxyBackendId }}
+          {{> dashboardOverviewStatistic dataset=dataset prefix=dataset.prefix
             overviewChartResponse=overviewChartResponse
-            summaryStatisticResponse=summaryStatisticResponse
-            comparisonStatisticResponse=comparisonStatisticResponse
-            statusCodesResponse=statusCodesResponse
           }}
         {{/ if }}
       {{/ each}}
diff --git a/apinf_packages/dashboard/client/view/summary_statistics/summary.js b/apinf_packages/dashboard/client/view/summary_statistics/summary.js
index 767f645827..767ba5b6b8 100644
--- a/apinf_packages/dashboard/client/view/summary_statistics/summary.js
+++ b/apinf_packages/dashboard/client/view/summary_statistics/summary.js
@@ -5,13 +5,12 @@
 
 // Meteor packages imports
 import { ReactiveDict } from 'meteor/reactive-dict';
+import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 
 // Meteor contributed packages imports
 import { TAPi18n } from 'meteor/tap:i18n';
-
-// Collection imports
-import ProxyBackends from '/apinf_packages/proxy_backends/collection';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 
 // APInf imports
 import {
@@ -25,21 +24,51 @@ Template.dashboardSummaryStatistic.onCreated(function () {
 
   // Dictionary of Flags about display/not the overview part for current item
   instance.displayOverview = new ReactiveDict();
+  instance.sortedAnalyticsData = new ReactiveVar();
 
+  // Watching on Sort parameter
   instance.autorun(() => {
-    // Get API IDs
-    const apiIds = Template.currentData().apiIds;
-
-    // Update list of proxy backends
-    const proxyBackends = ProxyBackends.find({ apiId: { $in: apiIds } }).fetch();
-
-    // Get the current language
-    const language = TAPi18n.getLanguage();
+    let sortedAnalyticsData;
+    const sortParameter = FlowRouter.getQueryParam('sort');
+
+    const analyticsData = Template.currentData().analyticsData;
+
+    if (analyticsData) {
+      switch (sortParameter) {
+        case 'calls': {
+          // Sort by desc requests number
+          sortedAnalyticsData = analyticsData.sort((a, b) => {
+            return b.requestNumber - a.requestNumber;
+          });
+          break;
+        }
+        case 'users': {
+          // Sort by desc unique users count
+          sortedAnalyticsData = analyticsData.sort((a, b) => {
+            return b.avgUniqueUsers - a.avgUniqueUsers;
+          });
+          break;
+        }
+        case 'time': {
+          // Sort by desc median response time
+          sortedAnalyticsData = analyticsData.sort((a, b) => {
+            return b.medianResponseTime - a.medianResponseTime;
+          });
+          break;
+        }
+        default: {
+          // sort by name on default
+          const language = TAPi18n.getLanguage();
+
+          sortedAnalyticsData = analyticsData.sort((a, b) => {
+            return a.apiName.localeCompare(b.apiName, language);
+          });
+        }
+      }
+    }
 
-    // Sort by name
-    instance.proxyBackends = proxyBackends.sort((a, b) => {
-      return a.apiName().localeCompare(b.apiName(), language);
-    });
+    // Update
+    instance.sortedAnalyticsData.set(sortedAnalyticsData);
   });
 });
 
@@ -73,59 +102,13 @@ Template.dashboardSummaryStatistic.helpers({
 
     return instance.displayOverview.get(parameter);
   },
-  proxyBackends () {
-    const instance = Template.instance();
-
-    // Sort by name
-    return instance.proxyBackends;
-  },
   tableTitle () {
     const title = Template.currentData().title;
 
     return TAPi18n.__(`dashboardSummaryStatistic_groupTitle_${title}`);
   },
-  getCount (path, param) {
-    const summaryStatisticResponse = Template.currentData().summaryStatisticResponse;
-    // Get summary statistics data that relates to provided Proxy Backend
-    const totalNumber = summaryStatisticResponse && summaryStatisticResponse[path];
-
-    let count;
-
-    switch (param) {
-      case 'success': {
-        count = totalNumber ? totalNumber.successCallsCount : 0;
-        break;
-      }
-      case 'error': {
-        count = totalNumber ? totalNumber.errorCallsCount : 0;
-        break;
-      }
-      case 'requests': {
-        count = totalNumber ? totalNumber.requestNumber : 0;
-        break;
-      }
-      case 'time': {
-        count = totalNumber ? totalNumber.medianResponseTime : 0;
-        break;
-      }
-      case 'users': {
-        count = totalNumber ? totalNumber.avgUniqueUsers : 0;
-        break;
-      }
-      default: {
-        count = 0;
-        break;
-      }
-    }
-
-    return count;
-  },
-  comparisonData (path) {
-    const comparisonResponse = Template.currentData().comparisonStatisticResponse;
-    // Get comparison data that relates to provided Proxy Backend
-    const comparisonData = comparisonResponse && comparisonResponse[path];
-
-    return comparisonData || {};
+  sortedAnalyticsData () {
+    return Template.instance().sortedAnalyticsData.get();
   },
 });
 
diff --git a/apinf_packages/dashboard/client/view/view.html b/apinf_packages/dashboard/client/view/view.html
index 1976375a76..3a015cb5b4 100644
--- a/apinf_packages/dashboard/client/view/view.html
+++ b/apinf_packages/dashboard/client/view/view.html
@@ -6,27 +6,21 @@
 <template name="dashboardView">
   {{# if Template.subscriptionsReady }}
     <!-- My APIs group -->
-    {{> dashboardSummaryStatistic apiIds=grouping.myApis title="myApis"
+    {{> dashboardSummaryStatistic title="myApis"
       overviewChartResponse=overviewChartResponse
-      summaryStatisticResponse=summaryStatisticResponse
-      comparisonStatisticResponse=comparisonStatisticResponse
-      statusCodesResponse=statusCodesResponse
+      analyticsData=analyticsDataMyApis
     }}
 
     <!-- Managed APIs group -->
-    {{> dashboardSummaryStatistic apiIds=grouping.managedApis title="managedApis"
+    {{> dashboardSummaryStatistic title="managedApis"
       overviewChartResponse=overviewChartResponse
-      summaryStatisticResponse=summaryStatisticResponse
-      comparisonStatisticResponse=comparisonStatisticResponse
-      statusCodesResponse=statusCodesResponse
+      analyticsData=analyticsDataManagedApis
     }}
 
     <!-- Other APIs group -->
-    {{> dashboardSummaryStatistic apiIds=grouping.otherApis title="otherApis"
+    {{> dashboardSummaryStatistic title="otherApis"
       overviewChartResponse=overviewChartResponse
-      summaryStatisticResponse=summaryStatisticResponse
-      comparisonStatisticResponse=comparisonStatisticResponse
-      statusCodesResponse=statusCodesResponse
+      analyticsData=analyticsDataOtherApis
     }}
   {{ else }}
     {{> spinner }}
diff --git a/apinf_packages/dashboard/client/view/view.js b/apinf_packages/dashboard/client/view/view.js
index f1c9406074..0ee2249b46 100644
--- a/apinf_packages/dashboard/client/view/view.js
+++ b/apinf_packages/dashboard/client/view/view.js
@@ -14,9 +14,6 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 // Npm packages imports
 import moment from 'moment';
 
-// APInf imports
-import promisifyCall from '/apinf_packages/core/helper_functions/promisify_call';
-
 Template.dashboardView.onCreated(function () {
   // Get reference to template instance
   const instance = this;
@@ -27,16 +24,21 @@ Template.dashboardView.onCreated(function () {
     otherApis: [],
   });
 
-  // Get API IDs for grouping
-  Meteor.call('groupingApiIds', (err, res) => {
-    instance.groupingIds.set(res);
+  instance.autorun(() => {
+    const proxyId = FlowRouter.getQueryParam('proxy_id');
+    if (proxyId) {
+      // Get Proxy backend IDs for grouping
+      Meteor.call('groupingBackendIds', proxyId, (err, res) => {
+        instance.groupingIds.set(res);
+      });
+    }
   });
 
   // Init variables
   instance.overviewChartResponse = new ReactiveVar();
-  instance.summaryStatisticResponse = new ReactiveVar();
-  instance.comparisonStatisticResponse = new ReactiveVar();
-  instance.statusCodesResponse = new ReactiveVar();
+  instance.analyticsDataMyApis = new ReactiveVar();
+  instance.analyticsDataManagedApis = new ReactiveVar();
+  instance.analyticsDataOtherApis = new ReactiveVar();
 
   instance.autorun(() => {
     const proxyId = FlowRouter.getQueryParam('proxy_id');
@@ -48,58 +50,50 @@ Template.dashboardView.onCreated(function () {
     // Get timestamp of timeframe ago 00:00:00 Date time (included value)
     const fromDate = moment(toDate).subtract(timeframe, 'd').valueOf();
 
-    // Get data about summary statistic for current period
-    promisifyCall('summaryStatisticNumber', { proxyId, fromDate, toDate })
-      .then((currentPeriodDataset) => {
-        instance.summaryStatisticResponse.set(currentPeriodDataset);
-
-        const previousFromDate = moment(fromDate).subtract(timeframe, 'd').valueOf();
-
-        // Get trend data is based on the current period data
-        Meteor.call('summaryStatisticTrend',
-          { proxyId, fromDate: previousFromDate, toDate: fromDate }, currentPeriodDataset,
-          (err, compareResponse) => {
-            // Save the response about Comparison data
-            instance.comparisonStatisticResponse.set(compareResponse);
-          });
-      }).catch((error) => {
-        throw new Meteor.Error(error);
-      });
-
     Meteor.call('overviewChartsData', { proxyId, fromDate, toDate }, (error, dataset) => {
       instance.overviewChartResponse.set(dataset);
     });
+  });
 
-    Meteor.call('statusCodesData', { proxyId, fromDate, toDate }, (error, dataset) => {
-      instance.statusCodesResponse.set(dataset);
-    });
+  instance.autorun(() => {
+    const grouping = instance.groupingIds.get();
+    const timeframe = FlowRouter.getQueryParam('timeframe');
+    // Get timestamp of tomorrow 00:00:00 Date time (excluded value)
+    const toDate = moment(0, 'HH').add(1, 'd').valueOf();
+
+    // Get timestamp of timeframe ago 00:00:00 Date time (included value)
+    const fromDate = moment(toDate).subtract(timeframe, 'd').valueOf();
+
+    Meteor.call('totalNumberRequestsAndTrend',
+      { fromDate, toDate, timeframe }, grouping.myApis, (error, result) => {
+        this.analyticsDataMyApis.set(result);
+      });
+
+    Meteor.call('totalNumberRequestsAndTrend',
+      { fromDate, toDate, timeframe }, grouping.managedApis, (error, result) => {
+        this.analyticsDataManagedApis.set(result);
+      });
+
+    Meteor.call('totalNumberRequestsAndTrend',
+      { fromDate, toDate, timeframe }, grouping.otherApis, (error, result) => {
+        this.analyticsDataOtherApis.set(result);
+      });
   });
 });
 
 Template.dashboardView.helpers({
-  grouping () {
-    const instance = Template.instance();
-    // Return object with IDs groups
-    return instance.groupingIds.get();
-  },
   overviewChartResponse () {
     const instance = Template.instance();
 
     return instance.overviewChartResponse.get();
   },
-  summaryStatisticResponse () {
-    const instance = Template.instance();
-
-    return instance.summaryStatisticResponse.get();
+  analyticsDataMyApis () {
+    return Template.instance().analyticsDataMyApis.get();
   },
-  comparisonStatisticResponse () {
-    const instance = Template.instance();
-
-    return instance.comparisonStatisticResponse.get();
+  analyticsDataManagedApis () {
+    return Template.instance().analyticsDataManagedApis.get();
   },
-  statusCodesResponse () {
-    const instance = Template.instance();
-
-    return instance.statusCodesResponse.get();
+  analyticsDataOtherApis () {
+    return Template.instance().analyticsDataOtherApis.get();
   },
 });
diff --git a/apinf_packages/dashboard/server/methods.js b/apinf_packages/dashboard/server/methods.js
index e00be94ffe..960f8a2cf3 100644
--- a/apinf_packages/dashboard/server/methods.js
+++ b/apinf_packages/dashboard/server/methods.js
@@ -52,11 +52,8 @@ Meteor.methods({
     return api && api.currentUserCanManage();
   },
   myApisIds () {
-    // Get APIs are managed by current user
-    const myApis = Apis.find({ managerIds: { $in: [this.userId] } }, { _id: 1 }).fetch();
-
-    // Return list of IDs
-    return myApis.map(api => {
+    // Return IDs list of APIs are managed by current user
+    return Apis.find({ managerIds: { $in: [this.userId] } }).map(api => {
       return api._id;
     });
   },
@@ -64,35 +61,26 @@ Meteor.methods({
     // Make sure parameter exists and is Array
     check(myApis, Array);
 
-    // Get Organizations which are managed by current user
-    const managedOrganizations = Organizations.find(
-      { managerIds: { $in: [this.userId] } },
-      { _id: 1 }
-    ).fetch();
-
-    // Make list of IDs
-    const organizationIds = managedOrganizations.map(organization => {
-      return organization._id;
-    });
-
-    // Get relations of organizations
-    const organizationApis = OrganizationApis.find(
-      { organizationId: { $in: organizationIds } },
-      { apiId: 1 }
-    ).fetch();
-
-    // Make list of IDs
-    const apiIds = organizationApis.map(organizationApi => {
-      return organizationApi.apiId;
-    });
-
-    // Get managed APIs of Organizations and no owned
-    const managedApis = Apis.find({ _id: { $in: apiIds, $nin: myApis } }, { _id: 1 }).fetch();
-
-    // Return list of IDs
-    return managedApis.map(api => {
-      return api._id;
-    });
+    // Get Organizations IDs which are managed by current user
+    const managedOrganizationIds = Organizations
+      .find({ managerIds: { $in: [this.userId] } })
+      .map(organization => {
+        return organization._id;
+      });
+
+    // Get APIs IDs that are connected to the managed organizations
+    const apiIds = OrganizationApis
+      .find({ organizationId: { $in: managedOrganizationIds } })
+      .map(organizationApi => {
+        return organizationApi.apiId;
+      });
+
+    // Return IDs list of managed APIs of Organizations and no owned
+    return Apis
+      .find({ _id: { $in: apiIds, $nin: myApis } })
+      .map(api => {
+        return api._id;
+      });
   },
   otherApisIds (myApis, managedApis) {
     // Check parameters are array
@@ -101,14 +89,16 @@ Meteor.methods({
 
     // Get APIs which are not managed by current user
     // And are not connected to Organizations which the current user is manager
-    const otherApis = Apis.find({ _id: { $nin: myApis.concat(managedApis) } }, { _id: 1 }).fetch();
-
-    // Return list of IDs
-    return otherApis.map(api => {
-      return api._id;
-    });
+    // Return IDs list of these APIs
+    return Apis
+      .find({ _id: { $nin: myApis.concat(managedApis) } })
+      .map(api => {
+        return api._id;
+      });
   },
-  groupingApiIds () {
+  groupingBackendIds (proxyId) {
+    check(proxyId, String);
+    let otherApis = [];
     // Placeholder to store ids
     const groupingIds = {
       myApis: [],
@@ -117,18 +107,28 @@ Meteor.methods({
     };
 
     // Get IDs of owned APIs
-    groupingIds.myApis = Meteor.call('myApisIds');
+    const myApis = Meteor.call('myApisIds');
     // Get IDs of managed APIs
-    groupingIds.managedApis = Meteor.call('managedApisIds', groupingIds.myApis);
-
+    const managedApis = Meteor.call('managedApisIds', groupingIds.myApis);
     // Make sure user is admin
     if (Roles.userIsInRole(this.userId, ['admin'])) {
       // Get IDs of other APIs
-      groupingIds.otherApis = Meteor.call('otherApisIds',
-        groupingIds.myApis, groupingIds.managedApis
-      );
+      otherApis = Meteor.call('otherApisIds', myApis, managedApis);
+      // Get related Proxy Backend IDs
+      groupingIds.otherApis = ProxyBackends
+        .find({ apiId: { $in: otherApis }, proxyId })
+        .map(backend => { return backend._id; });
     }
 
+    // Get related Proxy Backend IDs
+    groupingIds.myApis = ProxyBackends
+      .find({ apiId: { $in: myApis }, proxyId })
+      .map(backend => { return backend._id; });
+
+    groupingIds.managedApis = ProxyBackends
+      .find({ apiId: { $in: managedApis }, proxyId })
+      .map(backend => { return backend._id; });
+
     // Return all lists of IDs
     return groupingIds;
   },