Merge pull request #666 from LearningLocker/develop

v1.5.2

Author: ryasmi

.gitignore

@@ -7,5 +7,3 @@ Thumbs.db
 /app/config/ht2
 /app/config/production
 /app/config/staging
-
-/public/assets/js/bower_components

.travis.yml

@@ -7,8 +7,8 @@ services:
   - mongodb
 
 install:
-  - npm install -g bower
-  - composer install --no-interaction --dev
+  - php -r "readfile('https://getcomposer.org/installer');" | php
+  - php composer.phar install --no-interaction --dev
 
 before_script:
   - phpenv config-add travisconfig.ini

VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

app/locker/repository/Statement/EloquentRepository.php

@@ -39,9 +39,10 @@ public function store(array $statements, array $attachments, array $opts) {
   public function index(array $opts) {
     $opts = new IndexOptions($opts);
     $builder = $this->indexer->index($opts);
+    $count = $this->indexer->count($builder, $opts);
     return [
       $this->indexer->format($builder, $opts),
-      $this->indexer->count($builder, $opts),
+      $count,
       $opts->options
     ];
   }

app/models/Report.php

@@ -13,42 +13,47 @@ class Report extends Eloquent {
   public static $rules = [];
   protected $fillable = ['name', 'description', 'query', 'lrs', 'since', 'until'];
   protected $actorQuery = [ 'statement.actor.account', 'statement.actor.mbox', 'statement.actor.openid', 'statement.actor.mbox_sha1sum' ];
-
-  public function getFilterAttribute() {
-    $reportArr = $this->toArray();
-    $filter = [];
-
-    if (isset($reportArr['query'])) $filter['filter'] = json_encode($reportArr['query']);
-    if (isset($reportArr['since'])) {
-      $filter['since'] = (new \Carbon\Carbon($reportArr['since']))->toIso8601String();
-    }
-    if (isset($reportArr['until'])) {
-      $filter['until'] = (new \Carbon\Carbon($reportArr['until']))->toIso8601String();
+  protected $instructorQuery = [
+    'statement.context.instructor.account',
+    'statement.context.instructor.mbox',
+    'statement.context.instructor.openid',
+    'statement.context.instructor.mbox_sha1sum'
+  ];
+
+  private function constructOr($key, $value) {
+    $query = [];
+    foreach ($value as $actor_id) {
+      if (is_object($actor_id)) {
+        $object_vars = get_object_vars($actor_id);
+        $filter = [];
+        foreach ($object_vars as $var_key => $var_val) {
+          $filter[$key.'.'.$var_key] = $var_val;
+        }
+        return $filter;
+      } else {
+        return [$key => $actor_id];
+      }
     }
+    return $query;
+  }
 
-    return $filter;
+  private function constructDate($date) {
+    return (new \Carbon\Carbon($date))->toIso8601String();
   }
 
   public function getMatchAttribute() {
     $reportArr = $this->toArray();
     $match = [];
+    $actorMatch = [];
+    $instructorMatch = [];
     $query = isset($reportArr['query']) ? (array) $reportArr['query'] : null;
 
     if (is_array($query) && count($query) > 0 && !isset($query[0])) {
       foreach ($query as $key => $value) {
         if (in_array($key, $this->actorQuery)) {
-          foreach ($value as $actor_id) {
-            if (is_object($actor_id)) {
-              $object_vars = get_object_vars($actor_id);
-              $filter = [];
-              foreach ($object_vars as $var_key => $var_val) {
-                $filter[$key.'.'.$var_key] = $var_val;
-              }
-              $match['$or'][] = $filter;
-            } else {
-              $match['$or'][][$key] = $actor_id;
-            }
-          }
+          $actorMatch['$or'][] = $this->constructOr($key, $value);
+        } else if (in_array($key, $this->instructorQuery)) {
+          $instructorMatch['$or'][] = $this->constructOr($key, $value);
         } else {
           if (is_array($value)) {
             $match[$key] = ['$in' => $value];
@@ -59,8 +64,8 @@ public function getMatchAttribute() {
       }
     }
 
-    $since = isset($reportArr['since']) ? (new \Carbon\Carbon($reportArr['since']))->toIso8601String() : null;
-    $until = isset($reportArr['until']) ? (new \Carbon\Carbon($reportArr['until']))->toIso8601String() : null;
+    $since = isset($reportArr['since']) ? $this->constructDate($reportArr['since']) : null;
+    $until = isset($reportArr['until']) ? $this->constructDate($reportArr['until']) : null;
 
     if ($since || $until) {
       $match['statement.timestamp'] = [];
@@ -71,20 +76,28 @@ public function getMatchAttribute() {
     if ($until) {
       $match['statement.timestamp']['$lte'] = $until;
     }
+    $andMatch = ['$and' => []];
+    if (!empty($actorMatch)) $andMatch['$and'][] = $actorMatch;
+    if (!empty($instructorMatch)) $andMatch['$and'][] = $instructorMatch;
+    if (!empty($match)) $andMatch['$and'][] = $match;
+    //echo(json_encode($andMatch));die;
 
-    return $match;
+    return $andMatch;
   }
 
   public function getWhereAttribute() {
     $reportArr = $this->toArray();
     $wheres = [];
     $query = isset($reportArr['query']) ? (array) $reportArr['query'] : null;
     $actorArray = [];
+    $instructorArray = [];
 
     if (is_array($query) && count($query) > 0 && !isset($query[0])) {
       foreach (array_keys($query) as $key) {
         if (in_array($key, $this->actorQuery)) {
           array_push($actorArray, [$key, $query[$key]]);
+        } else if (in_array($key, $this->instructorQuery)) {
+          array_push($instructorArray, [$key, $query[$key]]);
         } else {
           if (is_array($query[$key])) {
             array_push($wheres, [$key, 'in', $query[$key]]);
@@ -94,10 +107,11 @@ public function getWhereAttribute() {
         }
       }
       array_push($wheres, ['orArray', 'or', $actorArray]);
+      array_push($wheres, ['orArray', 'or', $instructorArray]);
     }
 
-    $since = isset($reportArr['since']) ? (new \Carbon\Carbon($reportArr['since']))->toIso8601String() : null;
-    $until = isset($reportArr['until']) ? (new \Carbon\Carbon($reportArr['until']))->toIso8601String() : null;
+    $since = isset($reportArr['since']) ? $this->constructDate($reportArr['since']) : null;
+    $until = isset($reportArr['until']) ? $this->constructDate($reportArr['until']) : null;
 
     if ($since && $until) {
       $wheres[] = ['statement.timestamp', 'between', $since, $until];

composer.json

@@ -66,18 +66,26 @@
   },
   "scripts": {
     "post-install-cmd": [
-      "php artisan optimize",
-      "php artisan js-localization:refresh",
-      "cd public/assets/js && bower --allow-root update && cd ../../.."
+      "php composer.phar refresh"
     ],
     "post-update-cmd": [
       "php artisan clear-compiled",
-      "php artisan optimize",
-      "php artisan js-localization:refresh",
-      "cd public/assets/js && bower --allow-root update && cd ../../.."
+      "php composer.phar refresh"
     ],
     "post-create-project-cmd": [
       "php artisan key:generate"
+    ],
+    "refresh": [
+      "php artisan optimize",
+      "php artisan js-localization:refresh",
+      "php composer.phar clean-bower"
+    ],
+    "clean-bower": [
+      "find public/assets/js/bower_components/ -type f -name '*.md' | xargs rm -f",
+      "find public/assets/js/bower_components/ -type d -name 'docs' | xargs rm -rf",
+      "find public/assets/js/bower_components/ -type d -name 'spec' | xargs rm -rf",
+      "find public/assets/js/bower_components/ -type d -name 'test' | xargs rm -rf",
+      "find public/assets/js/bower_components/ -type f -not \\( -name '*.css' -o -name '*.js' \\) | xargs rm -rf"
     ]
   },
   "minimum-stability": "stable"