Stregthen type checks and backfill tests

Author: jasonmccreary

src/Generators/FactoryGenerator.php

@@ -95,8 +95,9 @@ protected function buildDefinition(Model $model)
                     implode(', ', [$scale, 0, (str_repeat(9, $precision - $scale) . '.' . str_repeat(9, $scale))]),
                     $definition
                 );
-            } elseif ($column->dataType() == 'json') {
-                $definition .= self::INDENT . "'{$column->name()}' => '[]'," . PHP_EOL;
+            } elseif ($column->dataType() === 'json') {
+                $default = $column->defaultValue() ?? "'{}'";
+                $definition .= self::INDENT . "'{$column->name()}' => {$default}," . PHP_EOL;
             } else {
                 $definition .= self::INDENT . "'{$column->name()}' => ";
                 $faker = self::fakerData($column->name()) ?? self::fakerDataType($column->dataType());
@@ -163,7 +164,7 @@ public static function fakerDataType(string $type)
             'datetime' => 'dateTime()',
             'timestamp' => 'dateTime()',
             'integer' => 'randomNumber()',
-            'unsignedsmallinteger' => 'randomNumber()',
+            'unsignedsmallinteger' => 'randomDigitNotNull',
             'bigint' => 'randomNumber()',
             'smallint' => 'randomNumber()',
             'decimal' => 'randomFloat(/** decimal_attributes **/)',

src/Generators/MigrationGenerator.php

@@ -54,13 +54,11 @@ protected function buildDefinition(Model $model)
         /** @var \Blueprint\Models\Column $column */
         foreach ($model->columns() as $column) {
             $dataType = $column->dataType();
-            if ($column->name() === 'id' && $dataType != 'uuid') {
+            if ($column->name() === 'id' && $dataType !== 'uuid') {
                 $dataType = 'bigIncrements';
             } elseif ($column->dataType() === 'id') {
                 $dataType = 'unsignedBigInteger';
-            }
-
-            if ($column->dataType() === 'uuid') {
+            } elseif ($column->dataType() === 'uuid') {
                 $dataType = 'uuid';
             }
 
@@ -80,7 +78,7 @@ protected function buildDefinition(Model $model)
 
             foreach ($column->modifiers() as $modifier) {
                 if (is_array($modifier)) {
-                    if (key($modifier) == 'foreign') {
+                    if (key($modifier) === 'foreign') {
                         $foreign =
                             self::INDENT .
                             '$table->foreign(' .

src/Models/Column.php

@@ -36,4 +36,13 @@ public function modifiers()
     {
         return $this->modifiers;
     }
+
+    public function defaultValue()
+    {
+        return collect($this->modifiers())
+            ->collapse()
+            ->first(function ($value, $key) {
+                return $key === 'default';
+            });
+    }
 }

tests/Feature/Generator/FactoryGeneratorTest.php

@@ -92,7 +92,8 @@ public function modelTreeDataProvider()
             ['definitions/team.bp', 'database/factories/TeamFactory.php', 'factories/team.php'],
             ['definitions/unconventional.bp', 'database/factories/TeamFactory.php', 'factories/unconventional.php'],
             ['definitions/nested-components.bp', 'database/factories/Admin/UserFactory.php', 'factories/nested-components.php'],
-            ['definitions/model-modifiers.bp', 'database/factories/ModifierFactory.php', 'factories/model-modifiers.php']
+            ['definitions/model-modifiers.bp', 'database/factories/ModifierFactory.php', 'factories/model-modifiers.php'],
+            ['definitions/model-key-constraints.bp', 'database/factories/OrderFactory.php', 'factories/model-key-constraints.php']
         ];
     }
 }

tests/Feature/Generator/MigrationGeneratorTest.php

@@ -104,6 +104,8 @@ public function modelTreeDataProvider()
             ['definitions/soft-deletes.bp', 'database/migrations/timestamp_create_comments_table.php', 'migrations/soft-deletes.php'],
             ['definitions/with-timezones.bp', 'database/migrations/timestamp_create_comments_table.php', 'migrations/with-timezones.php'],
             ['definitions/relationships.bp', 'database/migrations/timestamp_create_comments_table.php', 'migrations/relationships.php'],
+            ['definitions/unconventional.bp', 'database/migrations/timestamp_create_teams_table.php', 'migrations/unconventional.php'],
+            ['definitions/model-key-constraints.bp', 'database/migrations/timestamp_create_orders_table.php', 'migrations/model-key-constraints.php'],
         ];
     }
 }

tests/fixtures/definitions/model-key-constraints.bp

@@ -0,0 +1,8 @@
+models:
+  Order:
+    id: uuid primary
+    user_id: id foreign:user
+    external_id: string nullable index
+    subscription_id: uuid foreign:subscription
+    expires_at: timestamp nullable index
+    meta: json default:'[]'

tests/fixtures/definitions/unconventional.bp

@@ -2,4 +2,5 @@ models:
   Team:
     name: string
     owner: id
-    manager: id:user
+    manager: id:user
+    options: json

tests/fixtures/factories/model-key-constraints.php

@@ -0,0 +1,16 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\Order;
+use Faker\Generator as Faker;
+
+$factory->define(Order::class, function (Faker $faker) {
+    return [
+        'user_id' => factory(\App\User::class),
+        'external_id' => $faker->word,
+        'subscription_id' => factory(\App\Subscription::class),
+        'expires_at' => $faker->dateTime(),
+        'meta' => '[]',
+    ];
+});

tests/fixtures/factories/unconventional.php

@@ -10,5 +10,6 @@
         'name' => $faker->name,
         'owner' => factory(\App\Owner::class),
         'manager' => factory(\App\User::class),
+        'options' => '{}',
     ];
 });

tests/fixtures/migrations/model-key-constraints.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOrdersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('orders', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->unsignedBigInteger('user_id');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->string('external_id')->nullable()->index();
+            $table->uuid('subscription_id');
+            $table->foreign('subscription_id')->references('id')->on('subscriptions')->onDelete('cascade');
+            $table->timestamp('expires_at')->nullable()->index();
+            $table->json('meta')->default('[]');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('orders');
+    }
+}