Fix owner and local key (#45)

* iteration * iteration2 * iteration3 * iteration5 * iteration8 * cs * use owner and local keys + tests * iteration * iteration2 * iteration3 * iteration4 * iteration7 * finish * typo
fico7489 · Jan 20, 2019 · 9db28c3 · 9db28c3
1 parent 0e000af
commit 9db28c3
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 33 deletions.
diff --git a/src/EloquentJoinBuilder.php b/src/EloquentJoinBuilder.php
@@ -151,18 +151,21 @@ private function performJoin($relations, $leftJoin = null)
                 if ($relatedRelation instanceof BelongsToJoin) {
                     $relatedKey = $relatedRelation->getQualifiedForeignKey();
                     $relatedKey = last(explode('.', $relatedKey));
+                    $ownerKey = $relatedRelation->getOwnerKey();
 
-                    $this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $relatedPrimaryKey) {
-                        $join->on($relatedTableAlias.'.'.$relatedPrimaryKey, '=', $currentTableAlias.'.'.$relatedKey);
+                    $this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $ownerKey) {
+                        $join->on($relatedTableAlias.'.'.$ownerKey, '=', $currentTableAlias.'.'.$relatedKey);
 
                         $this->joinQuery($join, $relatedRelation, $relatedTableAlias);
                     });
                 } elseif ($relatedRelation instanceof HasOneJoin  ||  $relatedRelation instanceof HasManyJoin) {
                     $relatedKey = $relatedRelation->getQualifiedForeignKeyName();
                     $relatedKey = last(explode('.', $relatedKey));
+                    $localKey = $relatedRelation->getQualifiedParentKeyName();
+                    $localKey = last(explode('.', $localKey));
 
-                    $this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $currentPrimaryKey) {
-                        $join->on($relatedTableAlias.'.'.$relatedKey, '=', $currentTableAlias.'.'.$currentPrimaryKey);
+                    $this->$joinMethod($joinQuery, function ($join) use ($relatedRelation, $relatedTableAlias, $relatedKey, $currentTableAlias, $currentPrimaryKey, $localKey) {
+                        $join->on($relatedTableAlias.'.'.$relatedKey, '=', $currentTableAlias.'.'.$localKey);
 
                         $this->joinQuery($join, $relatedRelation, $relatedTableAlias);
                     });

diff --git a/tests/Models/Key/Location.php b/tests/Models/Key/Location.php
@@ -6,9 +6,9 @@
 
 class Location extends BaseModel
 {
-    protected $primaryKey = 'key_id_location';
+    protected $primaryKey = 'id_location_primary';
 
     protected $table = 'key_locations';
 
-    protected $fillable = ['address', 'seller_id'];
+    protected $fillable = ['address', 'id_seller_foreign'];
 }
diff --git a/tests/Models/Key/Order.php b/tests/Models/Key/Order.php
@@ -6,14 +6,19 @@
 
 class Order extends BaseModel
 {
-    protected $primaryKey = 'key_id_order';
+    protected $primaryKey = 'id_order_primary';
 
     protected $table = 'key_orders';
 
-    protected $fillable = ['number', 'seller_id'];
+    protected $fillable = ['number', 'id_seller_foreign'];
 
     public function seller()
     {
-        return $this->belongsTo(Seller::class, 'key_seller_id', 'key_id_order');
+        return $this->belongsTo(Seller::class, 'id_seller_foreign', 'id_seller_primary');
+    }
+
+    public function sellerOwner()
+    {
+        return $this->belongsTo(Seller::class, 'id_seller_foreign', 'id_seller_owner');
     }
 }
diff --git a/tests/Models/Key/Seller.php b/tests/Models/Key/Seller.php
@@ -6,19 +6,29 @@
 
 class Seller extends BaseModel
 {
-    protected $primaryKey = 'key_id_seller';
+    protected $primaryKey = 'id_seller_primary';
 
     protected $table = 'key_sellers';
 
-    protected $fillable = ['title', 'deleted_at'];
+    protected $fillable = ['title'];
 
     public function location()
     {
-        return $this->hasOne(Location::class, 'key_seller_id', 'key_id_seller');
+        return $this->hasOne(Location::class, 'id_seller_foreign', 'id_seller_primary');
     }
 
     public function locations()
     {
-        return $this->hasMany(Location::class, 'key_seller_id', 'key_id_seller');
+        return $this->hasMany(Location::class, 'id_seller_foreign', 'id_seller_primary');
+    }
+
+    public function locationOwner()
+    {
+        return $this->hasOne(Location::class, 'id_seller_foreign', 'id_seller_owner');
+    }
+
+    public function locationsOwner()
+    {
+        return $this->hasMany(Location::class, 'id_seller_foreign', 'id_seller_owner');
     }
 }
diff --git a/tests/Tests/KeysOwnerTest.php b/tests/Tests/KeysOwnerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Fico7489\Laravel\EloquentJoin\Tests\Tests;
+
+use Fico7489\Laravel\EloquentJoin\Tests\Models\Key\Order;
+use Fico7489\Laravel\EloquentJoin\Tests\Models\Key\Seller;
+use Fico7489\Laravel\EloquentJoin\Tests\TestCase;
+
+class KeysOwnerTest extends TestCase
+{
+    public function testBelogsTo()
+    {
+        Order::joinRelations('sellerOwner')
+            ->get();
+
+        $queryTest = 'select key_orders.* 
+            from "key_orders" 
+            left join "key_sellers" on "key_sellers"."id_seller_owner" = "key_orders"."id_seller_foreign" 
+            group by "key_orders"."id_order_primary"';
+
+        $this->assertQueryMatches($queryTest, $this->fetchQuery());
+    }
+
+    public function testHasOne()
+    {
+        Seller::joinRelations('locationOwner')
+            ->get();
+
+        $queryTest = 'select key_sellers.* 
+            from "key_sellers" 
+            left join "key_locations" on "key_locations"."id_seller_foreign" = "key_sellers"."id_seller_owner" 
+            group by "key_sellers"."id_seller_primary"';
+
+        $this->assertQueryMatches($queryTest, $this->fetchQuery());
+    }
+
+    public function testHasMany()
+    {
+        Seller::joinRelations('locationsOwner')
+            ->get();
+
+        $queryTest = 'select key_sellers.* 
+            from "key_sellers" 
+            left join "key_locations" on "key_locations"."id_seller_foreign" = "key_sellers"."id_seller_owner" 
+            group by "key_sellers"."id_seller_primary"';
+
+        $this->assertQueryMatches($queryTest, $this->fetchQuery());
+    }
+}
diff --git a/tests/Tests/KeysTest.php b/tests/Tests/KeysTest.php
@@ -8,15 +8,15 @@
 
 class KeysTest extends TestCase
 {
-    public function testBelogsTo()
+    public function testBelongsTo()
     {
         Order::joinRelations('seller')
             ->get();
 
         $queryTest = 'select key_orders.* 
             from "key_orders" 
-            left join "key_sellers" on "key_sellers"."key_id_seller" = "key_orders"."key_seller_id" 
-            group by "key_orders"."key_id_order"';
+            left join "key_sellers" on "key_sellers"."id_seller_primary" = "key_orders"."id_seller_foreign" 
+            group by "key_orders"."id_order_primary"';
 
         $this->assertQueryMatches($queryTest, $this->fetchQuery());
     }
@@ -26,10 +26,10 @@ public function testHasOne()
         Seller::joinRelations('location')
             ->get();
 
-        $queryTest = 'select key_sellers.* 
-            from "key_sellers" 
-            left join "key_locations" on "key_locations"."key_seller_id" = "key_sellers"."key_id_seller" 
-            group by "key_sellers"."key_id_seller"';
+        $queryTest = 'select key_sellers.*
+            from "key_sellers"
+            left join "key_locations" on "key_locations"."id_seller_foreign" = "key_sellers"."id_seller_primary"
+            group by "key_sellers"."id_seller_primary"';
 
         $this->assertQueryMatches($queryTest, $this->fetchQuery());
     }
@@ -39,10 +39,10 @@ public function testHasMany()
         Seller::joinRelations('locations')
             ->get();
 
-        $queryTest = 'select key_sellers.* 
-            from "key_sellers" 
-            left join "key_locations" on "key_locations"."key_seller_id" = "key_sellers"."key_id_seller" 
-            group by "key_sellers"."key_id_seller"';
+        $queryTest = 'select key_sellers.*
+            from "key_sellers"
+            left join "key_locations" on "key_locations"."id_seller_foreign" = "key_sellers"."id_seller_primary"
+            group by "key_sellers"."id_seller_primary"';
 
         $this->assertQueryMatches($queryTest, $this->fetchQuery());
     }

diff --git a/tests/database/migrations/2017_11_04_163552_create_database.php b/tests/database/migrations/2017_11_04_163552_create_database.php
@@ -128,26 +128,30 @@ public function up()
 
         //for key tests
         Schema::create('key_orders', function (Blueprint $table) {
-            $table->increments('key_id_order');
+            $table->increments('id_order_primary');
+            $table->unsignedInteger('id_order_owner')->nullable();
+
             $table->string('number')->nullable();
-            $table->unsignedInteger('key_seller_id')->nullable();
 
-            $table->foreign('key_seller_id')->references('id')->on('sellers');
+            $table->unsignedInteger('id_seller_foreign')->nullable();
+            $table->foreign('id_seller_foreign')->references('id')->on('sellers');
         });
 
         Schema::create('key_sellers', function (Blueprint $table) {
-            $table->increments('key_id_seller');
+            $table->increments('id_seller_primary');
+            $table->unsignedInteger('id_seller_owner')->nullable();
+
             $table->string('title')->nullable();
-            $table->unsignedInteger('city_id')->nullable();
         });
 
         Schema::create('key_locations', function (Blueprint $table) {
-            $table->increments('id');
+            $table->increments('id_location_primary');
+            $table->unsignedInteger('id_location_owner')->nullable();
+
             $table->string('address')->nullable();
-            $table->boolean('is_primary')->default(0);
-            $table->unsignedInteger('key_seller_id')->nullable();
 
-            $table->foreign('key_seller_id')->references('id')->on('sellers');
+            $table->unsignedInteger('id_seller_foreign')->nullable();
+            $table->foreign('id_seller_foreign')->references('id')->on('sellers');
         });
     }