Merge pull request #688 from LearningLocker/issue/684

Fix #684

Author: daniel-abbey

app/locker/repository/Statement/EloquentInserter.php

@@ -16,11 +16,15 @@ class EloquentInserter extends EloquentReader implements Inserter {
    * @throws Exceptions\Conflict
    */
   public function insert(array $statements, StoreOptions $opts) {
-    $models = array_map(function (\stdClass $statement) use ($opts) {
-      $this->checkForConflict($statement, $opts);
-      return $this->constructModel($statement, $opts);
-    }, $statements);
+    $models = [];
 
+    foreach($statements as $statement) {
+      $duplicate = $this->checkForConflict($statement, $opts);
+      if (!$duplicate) {
+        $models[] = $this->constructModel($statement, $opts);
+      }
+    }
+    
     return $this->insertModels($models, $opts);
   }
 
@@ -36,8 +40,9 @@ private function checkForConflict(\stdClass $statement, StoreOptions $opts) {
       ->where('active', true)
       ->first();
 
-    if ($duplicate === null) return;
+    if ($duplicate === null) return false;
     $this->compareForConflict($statement, $this->formatModel($duplicate));
+    return true;
   }
 
   /**
@@ -68,6 +73,7 @@ public function compareForConflict(\stdClass $statement_x, \stdClass $statement_
   private function matchableStatement(\stdClass $statement) {
     $statement = json_decode(json_encode($statement));
     unset($statement->stored);
+    unset($statement->timestamp);
     unset($statement->authority);
     return $statement;
   }
@@ -95,6 +101,9 @@ private function constructModel(\stdClass $statement, StoreOptions $opts) {
    * @param StoreOptions $opts
    */
   private function insertModels(array $models, StoreOptions $opts) {
+    if(empty($models)) {
+      return;
+    }
     return $this->where($opts)->insert($models);
   }
 }

app/locker/repository/Statement/EloquentStorer.php

@@ -104,12 +104,9 @@ 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($exclude=[]) {
-    $remote_addr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'LL';
-    mt_srand(crc32(serialize([microtime(true), $remote_addr, 'ETC'])));
+  private function getUUID() {
 
     $uuid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
       mt_rand(0, 0xffff), mt_rand(0, 0xffff),
@@ -118,11 +115,8 @@ private function getUUID($exclude=[]) {
       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;
-    }
+    
+    return $uuid;
+    
   }
 }