Fixes #47

Author: jasonmccreary

src/Generators/FactoryGenerator.php

@@ -63,7 +63,7 @@ protected function buildDefinition(Model $model)
             }
 
             if ($column->dataType() === 'id') {
-                $name = Str::substr($column->name(), 0, -3);
+                $name = Str::beforeLast($column->name(), '_id');
                 $class = Str::studly($column->attributes()[0] ?? $name);
 
                 $definition .= self::INDENT . "'{$column->name()}' => ";

src/Generators/ModelGenerator.php

@@ -79,7 +79,7 @@ private function buildProperties(Model $model)
     private function buildRelationships(Model $model)
     {
         $columns = array_filter($model->columns(), function (Column $column) {
-            return Str::endsWith($column->name(), '_id');
+            return $column->name() !== 'id' && $column->dataType() === 'id';
         });
 
         if (empty($columns)) {
@@ -91,7 +91,7 @@ private function buildRelationships(Model $model)
 
         /** @var Column $column */
         foreach ($columns as $column) {
-            $name = Str::substr($column->name(), 0, -3);
+            $name = Str::beforeLast($column->name(), '_id');
             $class = Str::studly($column->attributes()[0] ?? $name);
             $relationship = sprintf("\$this->belongsTo(\App\%s::class)", $class);
 

tests/Feature/Generator/FactoryGeneratorTest.php

@@ -6,6 +6,9 @@
 use Blueprint\Generators\FactoryGenerator;
 use Tests\TestCase;
 
+/**
+ * @see FactoryGenerator
+ */
 class FactoryGeneratorTest extends TestCase
 {
     private $blueprint;
@@ -64,7 +67,8 @@ public function modelTreeDataProvider()
     {
         return [
             ['definitions/post.bp', 'database/factories/PostFactory.php', 'factories/post.php'],
-            ['definitions/team.bp', 'database/factories/TeamFactory.php', 'factories/team.php']
+            ['definitions/team.bp', 'database/factories/TeamFactory.php', 'factories/team.php'],
+            ['definitions/unconventional.bp', 'database/factories/TeamFactory.php', 'factories/unconventional.php']
         ];
     }
 }

tests/Feature/Generator/ModelGeneratorTest.php

@@ -91,6 +91,7 @@ public function modelTreeDataProvider()
             ['definitions/with-timezones.bp', 'app/Comment.php', 'models/comment.php'],
             ['definitions/soft-deletes.bp', 'app/Comment.php', 'models/soft-deletes.php'],
             ['definitions/relationships.bp', 'app/Comment.php', 'models/relationships.php'],
+            ['definitions/unconventional.bp', 'app/Team.php', 'models/unconventional.php'],
         ];
     }
 }

tests/fixtures/definitions/unconventional.bp

@@ -0,0 +1,5 @@
+models:
+  Team:
+    name: string
+    owner: id
+    manager: id:user

tests/fixtures/factories/unconventional.php

@@ -0,0 +1,14 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\Team;
+use Faker\Generator as Faker;
+
+$factory->define(Team::class, function (Faker $faker) {
+    return [
+        'name' => $faker->name,
+        'owner' => factory(\App\Owner::class),
+        'manager' => factory(\App\User::class),
+    ];
+});

tests/fixtures/models/unconventional.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Team extends Model
+{
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name',
+        'owner',
+        'manager',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'id' => 'integer',
+        'owner' => 'integer',
+        'manager' => 'integer',
+    ];
+
+
+    public function owner()
+    {
+        return $this->belongsTo(\App\Owner::class);
+    }
+
+    public function manager()
+    {
+        return $this->belongsTo(\App\User::class);
+    }
+}