diff --git a/app/library/App/Controllers/GaController.php b/app/library/App/Controllers/GaController.php index 8d31558..4b5138c 100644 --- a/app/library/App/Controllers/GaController.php +++ b/app/library/App/Controllers/GaController.php @@ -10,6 +10,7 @@ namespace App\Controllers; use App\Model\Project; +use App\Model\User; use Google_Client; use Google_Service_AnalyticsReporting; use Google_Service_AnalyticsReporting_DateRange; @@ -26,14 +27,23 @@ class GaController extends CrudResourceController { public function getAction() { + $user_id = $this->request->get('user_id') ?? '1'; $view_id = $this->request->get('view_id') ?? '119240817'; $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'; - - return $this->sendGaRequest($view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date); + if (empty($view_id)) { + $projects = Project::find(['user_id' => $user_id]); + foreach ($projects as $project) { + $result[] = $this->sendGaRequest($project->id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date); + } + } + else { + $result = $this->sendGaRequest($view_id, $get_metrics, $get_dimensions, $get_start_date, $get_end_date); + } + return $result; } -- libgit2 0.21.4