Merge pull request #29 from kslimani/fix-uuid-scope-trait

Make UUID fillable at entity creation using UUID scope trait

Author: joselfonseca

app/Support/UuidScopeTrait.php

@@ -27,7 +27,9 @@ protected static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            $model->uuid = Uuid::generate()->string;
+            if (empty($model->uuid)) {
+                $model->uuid = Uuid::generate()->string;
+            }
         });
     }
 }

tests/Unit/Entities/RoleTest.php

@@ -51,4 +51,14 @@ function test_it_syncs_permissions_by_array_of_uuids()
         });
     }
 
+    function test_it_can_fill_uuid_at_creation()
+    {
+        $uuid = '84e28c10-8991-11e7-ad89-056674746d73';
+
+        $roleNotFilled = factory(Role::class)->create();
+        $this->assertNotEquals($uuid, $roleNotFilled->uuid);
+
+        $roleFilled = factory(Role::class)->create(['uuid' => $uuid]);
+        $this->assertEquals($uuid, $roleFilled->uuid);
+    }
 }