Merge pull request #674 from LearningLocker/issue/voiding-api

Fixes voiding API issues.

Author: ryasmi

app/locker/repository/Query/EloquentQueryRepository.php

@@ -149,7 +149,11 @@ public function void(array $match, array $opts) {
 
     $opts['authority'] = json_decode(json_encode($opts['client']['authority']));
 
-    return (new StatementsRepo())->store(json_decode(json_encode($statements)), [], $opts);
+    if( count($statements) > 0 ){
+      return (new StatementsRepo())->store(json_decode(json_encode($statements)), [], $opts);      
+    } else {
+      return [];
+    }
   }
 
   /**

app/locker/repository/Statement/EloquentInserter.php

@@ -47,7 +47,7 @@ private function checkForConflict(\stdClass $statement, StoreOptions $opts) {
    * @param \stdClass $statement_y
    * @throws Exceptions\Conflict
    */
-  private function compareForConflict(\stdClass $statement_x, \stdClass $statement_y) {
+  public function compareForConflict(\stdClass $statement_x, \stdClass $statement_y) {
     $matchable_x = $this->matchableStatement($statement_x);
     $matchable_y = $this->matchableStatement($statement_y);
     if ($matchable_x != $matchable_y) {

app/locker/repository/Statement/EloquentStorer.php

@@ -52,6 +52,7 @@ public function store(array $statements, array $attachments, StoreOptions $opts)
    * @return [String => \stdClass] Array of statements mapped to their UUIDs.
    */
   private function constructValidStatements(array $statements, StoreOptions $opts) {
+    $generated_ids = [];
     $constructed = [];
     $this->hashes = [];
 
@@ -64,7 +65,8 @@ private function constructValidStatements(array $statements, StoreOptions $opts)
       }
 
       if (!isset($statement->id)) {
-        $statement->id = $this->getUUID();
+        $statement->id = $this->getUUID($generated_ids);
+        $generated_ids[] = $statement->id;
       }
 
       // Validates statement.
@@ -102,18 +104,25 @@ private function activateStatements(array $ids, StoreOptions $opts) {
 
   /**
    * Generates a UUID.
+   * @param $excludes An array of ids to check that the new id is unique against
    * @return String
    */
-  private function getUUID() {
+  private function getUUID($exclude=[]) {
     $remote_addr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'LL';
     mt_srand(crc32(serialize([microtime(true), $remote_addr, 'ETC'])));
 
-    return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+    $uuid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
       mt_rand(0, 0xffff), mt_rand(0, 0xffff),
       mt_rand(0, 0xffff),
       mt_rand(0, 0x0fff) | 0x4000,
       mt_rand(0, 0x3fff) | 0x8000,
       mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
     );
+
+    if( in_array($uuid, $exclude)){
+      return $this->getUUID($exclude);
+    } else {
+      return $uuid;
+    }
   }
 }

app/tests/routes/StatementsTest.php

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