Alex Savenko / analytics

Commit f8fab208a7ca92cbd21c362feeb34105a0f32f93

Authored by Alex Savenko
2 parents bef9c346 dead86c6

Merge branch 'restart' of gitlab.artweb.com.ua:Alex/analytics into restart

Showing 3 changed files with 6 additions and 3 deletions   Show diff stats
Inline Side-by-side
app/library/App/Model/Project.php
  Show/Hide comments   View file @f8fab20
... ... @@ -8,6 +8,7 @@ class Project extends \App\Mvc\DateTrackingModel
8 8 public $name;
9 9 public $user_id;
10 10 public $ga_view_id;
  11 + public $group;
11 12  
12 13 public function getSource()
13 14 {
... ... @@ -20,7 +21,8 @@ class Project extends \App\Mvc\DateTrackingModel
20 21 'id' => 'id',
21 22 'name' => 'name',
22 23 'ga_view_id' => 'ga_view_id',
23   - 'user_id' => 'user_id'
  24 + 'user_id' => 'user_id',
  25 + 'group' => 'group'
24 26 ];
25 27 }
26 28  
... ...
app/library/App/Resources/GaResource.php
  Show/Hide comments   View file @f8fab20
... ... @@ -27,7 +27,7 @@ class GaResource extends ApiResource {
27 27 ->deny(AclRoles::UNAUTHORIZED)
28 28 ->handler(GaController::class)
29 29  
30   - ->endpoint(ApiEndpoint::get('', 'getAction')
  30 + ->endpoint(ApiEndpoint::factory('', 'GET', 'getAction')
31 31 ->allow(AclRoles::USER)
32 32 ->description('Returns data from Google Analytics Api. https://developers.google.com/analytics/devguides/reporting/core/dimsmets')
33 33 ->exampleResponse([
... ...
composer.json
  Show/Hide comments   View file @f8fab20
... ... @@ -10,7 +10,8 @@
10 10 "league/fractal": "^0.13.0",
11 11 "firebase/php-jwt": "^3.0",
12 12 "google/apiclient": "^2.0",
13   - "phpxmlrpc/phpxmlrpc": "@dev"
  13 + "phpxmlrpc/phpxmlrpc": "@dev",
  14 + "ursaevandrey/allpositions": "~1.0.0"
14 15 },
15 16 "require-dev": {
16 17 "codeception/codeception": "^2.1"
... ...