Corrects tests.

Author: ryasmi

app/controllers/api/Statements.php

@@ -74,9 +74,12 @@ public function void() {
   }
 
   private function getParam($param) {
-    $value = json_decode(\LockerRequest::getParam($param), true);
-    if ($value === null) {
+    $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) {
+      throw new Exceptions\Exception("Expected the value of `$param` to be valid JSON in the URL parameter.");
     }
     return $value;
   }

app/locker/repository/Query/EloquentQueryRepository.php

@@ -25,25 +25,25 @@ public function where($lrsId, array $filters) {
         case 'in': $statements->whereIn($filter[0], $filter[2]); break;
         case 'between': $statements->whereBetween($filter[0], [$filter[2], $filter[3]]); break;
         case 'or':
-                if (!empty($filter[2]) && is_array($filter[2])) {
-                    $statements->where(function($query) use ($filter) {
-                        foreach ($filter[2] as $value) {
-                            foreach ($value[1] as $subVal) {
-                                if (is_object($subVal)) {
-                                    $subVal_array = get_object_vars($subVal);
-                                    $query->orWhere(function($query) use ($subVal_array, $value) {
-                                        foreach ($subVal_array as $key => $val) {
-                                            $query->where($value[0] . '.' . $key, '=', $val);
-                                        }
-                                    });
-                                } else {
-                                    $query->orWhere($value[0], '=', $subVal);
-                                }
-                            }
-                        }
+          if (!empty($filter[2]) && is_array($filter[2])) {
+            $statements->where(function($query) use ($filter) {
+              foreach ($filter[2] as $value) {
+                foreach ($value[1] as $subVal) {
+                  if (is_object($subVal)) {
+                    $subVal_array = get_object_vars($subVal);
+                    $query->orWhere(function($query) use ($subVal_array, $value) {
+                      foreach ($subVal_array as $key => $val) {
+                        $query->where($value[0] . '.' . $key, '=', $val);
+                      }
                     });
+                  } else {
+                    $query->orWhere($value[0], '=', $subVal);
+                  }
                 }
-                break;
+              }
+            });
+          }
+          break;
         default: $statements->where($filter[0], $filter[1], $filter[2]);
       }
     }
@@ -161,7 +161,7 @@ public function void(array $match, array $opts) {
     $opts['authority'] = json_decode(json_encode($opts['client']['authority']));
 
     if( count($statements) > 0 ){
-      return (new StatementsRepo())->store(json_decode(json_encode($statements)), [], $opts);      
+      return (new StatementsRepo())->store(json_decode(json_encode($statements)), [], $opts);
     } else {
       return [];
     }
@@ -191,19 +191,19 @@ public function selectDistinctField( $lrs='', $table='', $field='', $value='', $
 
   /**
    * Gets statement documents based on a filter.
-   * 
+   *
    * @param $lrs       id      The Lrs to search in (required)
    * @param $filter    array   The filter array
    * @param $raw       boolean  Pagination or raw statements?
    * @param $sections  array   Sections of the statement to return, default = all
-   * 
+   *
    * @return Statement query
    */
   public function selectStatementDocs( $lrs='', $filter, $raw=false, $sections=[] ){
     $statements = \Statement::where('lrs._id', $lrs);
 
     if( !empty($filter) ){
-      
+
       foreach($filter as $key => $value ){
         if( is_array($value) ){
           //does the array contain between values? e.g. <> 3, 6
@@ -229,7 +229,7 @@ public function selectStatementDocs( $lrs='', $filter, $raw=false, $sections=[]
    * @param $filter    array   The filter array
    * @param $raw       boolean  Pagination or raw statements?
    * @param $sections  array   Sections of the statement to return, default = all
-   * 
+   *
    * @return array results
    *
    **/
@@ -276,16 +276,16 @@ public function timedGrouping( $lrs, $filters, $interval, $type='time' ){
       $set_id = [ $interval => '$timestamp' ];
     }else{
       switch($type){
-        case 'user': 
-          $set_id  = ['actor' => '$statement.actor'];  
-          $project = ['$addToSet' => '$statement.actor'];  
+        case 'user':
+          $set_id  = ['actor' => '$statement.actor'];
+          $project = ['$addToSet' => '$statement.actor'];
           break;
-        case 'verb': 
-          $set_id  = ['verb' => '$statement.verb'];   
-          $project = ['$addToSet' => '$statement.verb'];    
+        case 'verb':
+          $set_id  = ['verb' => '$statement.verb'];
+          $project = ['$addToSet' => '$statement.verb'];
           break;
-        case 'activity': 
-          $set_id  = ['activity' => '$statement.object']; 
+        case 'activity':
+          $set_id  = ['activity' => '$statement.object'];
           $project = ['$addToSet' => '$statement.object'];
           break;
       }
@@ -337,8 +337,8 @@ public function timedGrouping( $lrs, $filters, $interval, $type='time' ){
    * Return grouped object based on criteria passed.
    *
    * @param $lrs
-   * @param $section 
-   * @param $filters 
+   * @param $section
+   * @param $filters
    * @param $returnFields
    *
    * @return $results

app/tests/routes/StatementsTest.php

@@ -103,7 +103,7 @@ public function testAggregateObject() {
 
   public function testWhere() {
     $response = $this->requestStatements('where', [
-      'filters' => '[[{"active", true}]]',
+      'filters' => '[["active", "=", true]]',
       'limit' => 1,
       'page' => 1
     ]);