From 0c1a07f0d6b1b3303f59d01921df46e45887b649 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Wed, 15 Mar 2017 19:16:01 +0200
Subject: [PATCH] add filter param to Ga Collections

---
 app/library/App/Controllers/GaController.php | 24 ++++++++++++++----------
 app/library/App/Resources/GaResource.php     | 11 ++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/library/App/Controllers/GaController.php b/app/library/App/Controllers/GaController.php
index 00e17f7..75e5180 100644
--- a/app/library/App/Controllers/GaController.php
+++ b/app/library/App/Controllers/GaController.php
@@ -28,15 +28,16 @@ class GaController extends CrudResourceController {
     public function getAction() {
 
         /** user params **/
-        $user_id = $this->request->get('user_id')?? '1';
-        $view_id= $this->request->get('view_id');
-        $chart = $this->request->get('chart') ?? false;
+        $user_id    = $this->request->get('user_id')?? '1';
+        $view_id    = $this->request->get('view_id');
+        $chart      = $this->request->get('chart') ?? false;
 
         /** google params **/
-        $get_metrics = $this->request->get('metric') ?? 'users';
-        $get_dimensions = $this->request->get('dimension');
-        $get_start_date = $this->request->get('start') ?? '30daysAgo';
-        $get_end_date = $this->request->get('end') ?? 'today';
+        $get_metrics        = $this->request->get('metric') ?? 'users';
+        $get_dimensions     = $this->request->get('dimension');
+        $get_start_date     = $this->request->get('start') ?? '30daysAgo';
+        $get_end_date       = $this->request->get('end') ?? 'today';
+        $filter_expression  = $this->request->get('filter');
 
 
         if (empty($view_id)) {
@@ -45,19 +46,19 @@ class GaController extends CrudResourceController {
             foreach ($projects as $project) {
                 $view_id = (string)$project->ga_view_id;
                 if (!empty($view_id)) {
-                    $result[] = $this->sendGaRequest($project->name, $view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date, $chart);
+                    $result[] = $this->sendGaRequest($project->name, $view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date, $chart, $filter_expression);
                 }
             }
         }
         else {
             $project = Project::findFirst(['ga_view_id' => $view_id]);
-            $result = $this->sendGaRequest($project->name , $view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date, $chart);
+            $result = $this->sendGaRequest($project->name , $view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date, $chart, $filter_expression);
         }
         return $result;
 
     }
 
-    public function sendGaRequest($project_name, $view, $get_metrics, $get_dimensions, $start, $end, $chart = false) {
+    public function sendGaRequest($project_name, $view, $get_metrics, $get_dimensions, $start, $end, $chart = false, $filter_expression = null) {
 
         putenv('GOOGLE_APPLICATION_CREDENTIALS=/var/www/phalcon/'.self::SECRET_JSON);
         $client = new Google_Client();
@@ -100,6 +101,9 @@ class GaController extends CrudResourceController {
             $request->setDimensions(array($dimensions));
         }
         $request->setMetrics(array($metrics));
+        if (!empty($filter_expression)) {
+            $request->setFiltersExpression("ga:".$filter_expression);
+        }
 
         $body = new Google_Service_AnalyticsReporting_GetReportsRequest();
         $body->setReportRequests(array($request));
diff --git a/app/library/App/Resources/GaResource.php b/app/library/App/Resources/GaResource.php
index c62b5a5..ab25b2f 100644
--- a/app/library/App/Resources/GaResource.php
+++ b/app/library/App/Resources/GaResource.php
@@ -43,18 +43,19 @@ class GaResource extends ApiResource   {
                 ->paramsDescription([
                     'get params' => [
                         'required params' => [
-                            'metric' => 'string(метрика Google, линк в описании запроса)',
+                            'metric'    => 'string(метрика Google, линк в описании запроса)',
                             'dimension' => 'string(размерность Google, линк в описании запроса)',
-                            'start' => 'ГГГГ-ММ-ДД/NdaysAgo, где N – целое положительное число(дата начала загрузки данных)',
-                            'end' => 'ГГГГ-ММ-ДД/NdaysAgo, где N – целое положительное число(дата конца загрузки данных)'
+                            'start'     => 'ГГГГ-ММ-ДД/NdaysAgo, где N – целое положительное число(дата начала загрузки данных)',
+                            'end'       => 'ГГГГ-ММ-ДД/NdaysAgo, где N – целое положительное число(дата конца загрузки данных)'
                         ],
                         'optional params' => [
                             'user_id'   => 'integer(id пользователя в системе)',
                             'view_id'   => 'integer(id представления проэкта с гугл аналитики)',
-                            'chart'   => 'boolean(Задает структуру возвращаемых данных(true для графиков))',
+                            'chart'     => 'boolean(Задает структуру возвращаемых данных(true для графиков))',
+                            'filter'    => 'expression(https://developers.google.com/analytics/devguides/reporting/core/v3/reference#filters)',
                         ]
                     ],
-                    'summary' => 'http://test-30.artweb.com.ua/ga?view_id=119240817&metric=users,sessions&dimension=source,browser'
+                    'summary' => '/ga?view_id=119240817&metric=users,sessions&dimension=source,browser&filter=browser=~^Firef'
                 ])
             )
         ;
--
libgit2 0.21.4