Merge pull request #675 from LearningLocker/issue/voiders

Fixes voiding of voiders.

Author: ryasmi

app/locker/repository/Query/EloquentQueryRepository.php

@@ -62,9 +62,12 @@ public function aggregate($lrsId, array $pipeline) {
       return;
     }
 
-    $pipeline[0] = array_merge_recursive([
-      '$match' => [self::LRS_ID_KEY => $lrsId]
-    ], $pipeline[0]);
+    $pipeline[0]['$match'] = [
+      '$and' => [(object) $pipeline[0]['$match'], [
+        self::LRS_ID_KEY => $lrsId,
+        'active' => true
+      ]]
+    ];
 
     return Helpers::replaceHtmlEntity($this->db->statements->aggregate($pipeline), true);
   }
@@ -122,6 +125,14 @@ public function aggregateObject($lrsId, array $match) {
   }
 
   public function void(array $match, array $opts) {
+    $void_id = 'http://adlnet.gov/expapi/verbs/voided';
+    $match = [
+      '$and' => [$match, [
+        'statement.verb.id' => ['$ne' => $void_id],
+        'voided' => false
+      ]]
+    ];
+
     $data = $this->aggregate($opts['lrs_id'], [[
       '$match' => $match
     ], [
@@ -131,11 +142,11 @@ public function void(array $match, array $opts) {
       ]
     ]]);
 
-    $statements = array_map(function ($result) use ($opts) {
+    $statements = array_map(function ($result) use ($opts, $void_id) {
       return [
         'actor' => $opts['client']['authority'],
         'verb' => [
-          'id' => 'http://adlnet.gov/expapi/verbs/voided',
+          'id' => $void_id,
           'display' => [
             'en' => 'voided'
           ]