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

Alex Savenko
2 parents bef9c346 dead86c6
Showing 3 changed files with 6 additions and 3 deletions Show diff stats
app/library/App/Model/Project.php
app/library/App/Resources/GaResource.php
composer.json
@@ -8,6 +8,7 @@ class Project extends \App\Mvc\DateTrackingModel
     public $name;
     public $user_id;
     public $ga_view_id;
+    public $group;
     public function getSource()
     {
@@ -20,7 +21,8 @@ class Project extends \App\Mvc\DateTrackingModel
             'id'            => 'id',
             'name'          => 'name',
             'ga_view_id'    => 'ga_view_id',
-            'user_id'       => 'user_id'
+            'user_id'       => 'user_id',
+            'group'         => 'group'
         ];
     }
@@ -27,7 +27,7 @@ class GaResource extends ApiResource   {
             ->deny(AclRoles::UNAUTHORIZED)
             ->handler(GaController::class)
-            ->endpoint(ApiEndpoint::get('', 'getAction')
+            ->endpoint(ApiEndpoint::factory('', 'GET', 'getAction')
                 ->allow(AclRoles::USER)
                 ->description('Returns data from Google Analytics Api. https://developers.google.com/analytics/devguides/reporting/core/dimsmets')
                 ->exampleResponse([
@@ -10,7 +10,8 @@
         "league/fractal": "^0.13.0",
         "firebase/php-jwt": "^3.0",
         "google/apiclient": "^2.0",
-        "phpxmlrpc/phpxmlrpc": "@dev"
+        "phpxmlrpc/phpxmlrpc": "@dev",
+        "ursaevandrey/allpositions": "~1.0.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.1"