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

Alex Savenko
2 parents b660745b 92a5b7e0
Showing 2 changed files with 6 additions and 9 deletions Show diff stats
app/library/App/Bootstrap/CollectionBootstrap.php
app/library/App/Controllers/GaController.php
@@ -4,11 +4,10 @@ namespace App\Bootstrap;
 use App\BootstrapInterface;
 use App\Collections\ExportCollection;
+use App\Resources\AllPositionResource;
 use App\Resources\GaResource;
 use App\Resources\ProjectResource;
 use App\Resources\UserResource;
-use App\Resources\AlbumResource;
-use App\Resources\PhotoResource;
 use Phalcon\Config;
 use Phalcon\DiInterface;
 use PhalconRest\Api;
@@ -19,9 +18,8 @@ class CollectionBootstrap implements BootstrapInterface
     {
         $api
             ->resource(new GaResource('/ga'))
+            ->resource(new AllPositionResource('/ap'))
             ->resource(new UserResource('/users'))
-            //->resource(new AlbumResource('/albums'))
-            //->resource(new PhotoResource('/photos'))
             ->resource(new ProjectResource('/projects'))
             ->collection(new ExportCollection('/export'));
     }
@@ -10,7 +10,6 @@ namespace App\Controllers;
 use App\Model\Project;
-use App\Model\User;
 use Google_Client;
 use Google_Service_AnalyticsReporting;
 use Google_Service_AnalyticsReporting_DateRange;
@@ -54,7 +53,7 @@ class GaController extends CrudResourceController {
             $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);
         }
-        return $result;
+        return '123';
     }
@@ -116,7 +115,7 @@ class GaController extends CrudResourceController {
             $result = self::responseDataTransform($response, $project_name);
         }
-        return ($result);
+        return $result;
     }
@@ -155,10 +154,10 @@ class GaController extends CrudResourceController {
             if (count($metric_val) > 1) {
                 for ($i = 0; $i < count($metric_val); $i++) {
-                    $result['data'][] = $metric_val[$i];
+                    $result['data'][] = (int)$metric_val[$i];
                 }
             } else {
-                $result['data'][] = $metric_val[0];
+                $result['data'][] = (int)$metric_val[0];
             }
         }