diff --git a/app/library/App/Controllers/GaController.php b/app/library/App/Controllers/GaController.php index 1755f57..638c6ec 100644 --- a/app/library/App/Controllers/GaController.php +++ b/app/library/App/Controllers/GaController.php @@ -24,17 +24,21 @@ class GaController extends CrudResourceController { const SECRET_JSON = 'ca4a1bd8aa14.json'; const VIEW_ID = '119240817'; + const SCOPE = 'https://www.googleapis.com/auth/analytics.readonly'; public function getAction() { + /** user params **/ $user_id = $this->request->get('user_id')?? '1'; - //$view_id= $this->request->get('view_id') ?? '119240817'; $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'; - $chart = $this->request->get('chart') ?? false; + if (empty($view_id)) { $result = []; @@ -59,15 +63,15 @@ class GaController extends CrudResourceController { putenv('GOOGLE_APPLICATION_CREDENTIALS=/var/www/phalcon/'.self::SECRET_JSON); $client = new Google_Client(); $client->useApplicationDefaultCredentials(); - $client->setScopes(['https://www.googleapis.com/auth/analytics.readonly']); + $client->setScopes([self::SCOPE]); $analytics = new Google_Service_AnalyticsReporting($client); - // Создание объекта DateRange. + /** Create the DateRange object. **/ $dateRange = new Google_Service_AnalyticsReporting_DateRange(); $dateRange->setStartDate($start); $dateRange->setEndDate($end); - // Создание объекта Metrics. + /** Create the Metrics object. **/ $metrics = []; $get_metrics = explode(',', $get_metrics); foreach ($get_metrics as $metric) { @@ -77,7 +81,7 @@ class GaController extends CrudResourceController { $metrics[] = $metrics_obj; } - //Create the Dimensions object. + /** Create the Dimensions object. **/ if (!empty($get_dimensions)) { $dimensions = []; $get_dimensions = explode(',', $get_dimensions); @@ -88,7 +92,7 @@ class GaController extends CrudResourceController { } } - // Создание объекта ReportRequest. + //Create the ReportRequest object. $request = new Google_Service_AnalyticsReporting_ReportRequest(); $request->setViewId($view); $request->setDateRanges($dateRange); -- libgit2 0.21.4