Merge pull request #788 from LearningLocker/develop

v1.12.0

Author: ht2

.github/issue_template.md

@@ -0,0 +1,19 @@
+You need to replace the parts of this template where you see {{some text}}.
+
+**Version**
+{{branch}} at {{commit}} on {{version - found in your copy of the VERSION file}} 
+
+**Steps to reproduce the bug**
+1. {{step 1}}
+2. {{step 2}}
+
+**Expected behaviour**
+{{feature}} should be {{expectedResult}} because {{reason}}.
+
+**Actual behaviour**
+{{feature}} is {{actualResult}}.
+
+**Additional information**
+OS: {{operatingSystem}}
+Browser: {{browser}} version 1.0.1
+{{additionalInfo}}

.travis.yml

@@ -7,6 +7,7 @@ services:
   - mongodb
 
 install:
+  - echo y | pecl install mongo
   - php -r "readfile('https://getcomposer.org/installer');" | php
   - php composer.phar install --no-interaction --dev
 
@@ -16,8 +17,9 @@ before_script:
   - sudo chmod -R 777 ./uploads
   - php artisan migrate --env="testing"
 
-script: ./vendor/bin/phpunit
-after_success: sh test.sh
+script:
+  - ./vendor/bin/phpunit
+  - sh test.sh
 
 notifications:
   slack:

VERSION

@@ -1 +1 @@
-1.11.0
+1.12.0

app/commands/ConvertTimestamp.php

@@ -43,7 +43,8 @@ public function fire()
   {
     Statement::chunk(1000, function($statements){
       foreach ($statements as $s){
-        $s->timestamp = new \MongoDate(strtotime($s->statement['timestamp']));
+        $timestamp = new Carbon\Carbon($s->statement['timestamp']);
+        $s->timestamp = new \MongoDate($timestamp->timestamp, $timestamp->micro);
         $s->save();
       }
       $this->info(count($statements) . ' converted.');

app/config/app.php

@@ -120,6 +120,7 @@
     'JsLocalization\JsLocalizationServiceProvider',
     'locker\RequestServiceProvider',
     'Philo\Translate\TranslateServiceProvider',
+    'Clockwork\Support\Laravel\ClockworkServiceProvider',
   ),
 
   /*

app/config/database.php

@@ -5,13 +5,13 @@
   'default' => 'mongodb',
   'connections' => [
 		'mongodb' => [
-		    'driver'   => 'mongodb',
-		    'host'     => 'localhost',
-		    'port'     => 27017,
-		    'username' => '',
-		    'password' => '',
-		    'database' => 'll_staging' // Default name (removing this makes Travis fail).
-		],
+        'driver'   => 'mongodb',
+        'host'     => 'localhost',
+        'port'     => 27017,
+        'username' => '',
+        'password' => '',
+        'database' => 'll_staging' // Default name (removing this makes Travis fail).
+    ],
 	],
 	'migrations' => 'migrations',
 ];

app/controllers/LrsController.php

@@ -134,7 +134,6 @@ public function show($lrs_id) {
     $dashboard = new \app\locker\data\dashboards\LrsDashboard($lrs_id);
     return View::make('partials.lrs.dashboard', array_merge($this->getLrs($lrs_id), [
       'stats' => $dashboard->getStats(),
-      'graph_data' => $dashboard->getGraphData(),
       'dash_nav' => true,
       'client' => (new \Client)->where('lrs_id', $lrs_id)->first()
     ]));
@@ -198,7 +197,7 @@ public function statements($lrs_id){
         'scopes' => ['all']
       ]),
       'scopes' => ['all']
-    ]))->orderBy('statement.stored', 'DESC')->paginate(15);
+    ]))->orderBy('stored', 'DESC')->paginate(15);
     return View::make('partials.statements.list', array_merge($this->getLrs($lrs_id), [
       'statements' => $statements,
       'statement_nav' => true,

app/controllers/SiteController.php

@@ -38,7 +38,7 @@ public function index(){
       'site' => $site,
       'list' => $list,
       'stats' => $admin_dashboard->getFullStats(),
-      'graph_data' => $admin_dashboard->getGraphData()
+      'dash_nav' => true
     ]);
 
   }
@@ -120,9 +120,12 @@ public function getGraphData(){
   public function lrs(){
     $opts = ['user' => \Auth::user()];
     $lrss = $this->lrs->index($opts);
+    $lrs_repo = $this->lrs;
 
-    return Response::json(array_map(function ($lrs) {
-      $lrs->statement_total = $this->statement->count(['lrs_id' => $lrs->_id, 'scopes' => ['all']]);
+    $collection = \DB::getCollection('statements');
+
+    return Response::json(array_map(function ($lrs) use ($lrs_repo) {
+      $lrs->statement_total = $lrs_repo->getStatementCount($lrs->_id);
       return $lrs;
     }, $lrss));
   }

app/controllers/api/Exports.php

@@ -23,6 +23,9 @@ public function __construct(Export $export) {
    * @return StreamedResponse.
    */
   public function showJson($id) {
+    // should top timeouts on long queries
+    set_time_limit(0);
+
     $opts = $this->getOptions();
     $model = $this->repo->show($id, $opts);
 
@@ -46,6 +49,9 @@ public function showJson($id) {
    * @return StreamedResponse.
    */
   public function showCsv($id) {
+    // should top timeouts on long queries
+    set_time_limit(0);
+
     $opts = $this->getOptions();
     $model = $this->repo->show($id, $opts);
 
@@ -92,4 +98,4 @@ private function quoteCSV($field) {
       return $field;
     }
   }
-}
+}

app/controllers/api/Statements.php

@@ -1,5 +1,6 @@
 <?php namespace Controllers\API;
 
+use Carbon\Carbon;
 use \Locker\Repository\Query\QueryRepository as QueryRepository;
 use \Locker\Helpers\Exceptions as Exceptions;
 
@@ -29,7 +30,7 @@ public function where() {
    * @return Aggregate http://php.net/manual/en/mongocollection.aggregate.php#refsect1-mongocollection.aggregate-examples
    */
   public function aggregate() {
-    $pipeline = $this->getParam('pipeline');
+    $pipeline = $this->getPipeline();
     return \Response::json($this->query->aggregate($this->getOptions(), $pipeline));
   }
 
@@ -82,9 +83,43 @@ public function void() {
     return \Response::json($this->query->void($match, $this->getOptions()));
   }
 
+  private function convertDte($value) {
+    if(is_array($value)) {
+      if(isset($value['$dte']))  {
+        $date = $value['$dte'];
+        $parsedDate = new Carbon($date);
+        if($parsedDate) return new \MongoDate($parsedDate->timestamp, $parsedDate->micro);
+        else throw new Exceptions\Exception("`$date` is not a valid date.");
+      }
+      else
+        return array_map([$this, __FUNCTION__], $value); // recursively apply this function to whole pipeline
+    }
+
+    return $value;
+  }
+
+  private function convertOid($value) {
+    if(is_array($value)) {
+      if(isset($value['$oid'])) 
+        return new \MongoId($value['$oid']);
+      else
+        return array_map([$this, __FUNCTION__], $value); // recursively apply this function to whole pipeline
+    }
+
+    return $value;
+  }
+
+  private function getPipeline() {
+    $pipeline = $this->getParam('pipeline');
+    $pipeline = $this->convertDte($pipeline);
+    $pipeline = $this->convertOid($pipeline);
+    return $pipeline;
+  }
+
   private function getParam($param) {
     $param_value = \LockerRequest::getParam($param);
     $value = json_decode($param_value, true);
+
     if ($value === null && $param_value === null) {
       throw new Exceptions\Exception("Expected `$param` to be defined as a URL parameter.");
     } else if ($value === null) {