Fixed #70 #76

overtrue · Dec 2, 2018 · d0239c5 · d0239c5
1 parent b760c72
commit d0239c5
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 28 deletions.
diff --git a/src/Events/Event.php b/src/Events/Event.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationAttached.php b/src/Events/RelationAttached.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationAttaching.php b/src/Events/RelationAttaching.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationDetached.php b/src/Events/RelationDetached.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationDetaching.php b/src/Events/RelationDetaching.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationToggled.php b/src/Events/RelationToggled.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Events/RelationToggling.php b/src/Events/RelationToggling.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Follow.php b/src/Follow.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *
@@ -74,15 +74,11 @@ public static function isRelationExists(Model $model, $relation, $target, $class
     {
         $target = self::formatTargets($target, $class ?: config('follow.user_model'));
 
-        $relationKey = $class ? 'followable_id' : config('follow.users_table_foreign_key', 'user_id');
-
-        $relationKey = self::tablePrefixedField($relationKey);
-
         if ($model->relationLoaded($relation)) {
-            return $model->{$relation}->where($relationKey, head($target->ids))->isNotEmpty();
+            return $model->{$relation}->where('id', head($target->ids))->isNotEmpty();
         }
 
-        return $model->{$relation}($target->classname)->where($relationKey, head($target->ids))->exists();
+        return $model->{$relation}($target->classname)->where('id', head($target->ids))->exists();
     }
 
     /**

diff --git a/src/FollowRelation.php b/src/FollowRelation.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/FollowServiceProvider.php b/src/FollowServiceProvider.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeBookmarked.php b/src/Traits/CanBeBookmarked.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeFavorited.php b/src/Traits/CanBeFavorited.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeFollowed.php b/src/Traits/CanBeFollowed.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeLiked.php b/src/Traits/CanBeLiked.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeSubscribed.php b/src/Traits/CanBeSubscribed.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBeVoted.php b/src/Traits/CanBeVoted.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanBookmark.php b/src/Traits/CanBookmark.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanFavorite.php b/src/Traits/CanFavorite.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanFollow.php b/src/Traits/CanFollow.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanLike.php b/src/Traits/CanLike.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanSubscribe.php b/src/Traits/CanSubscribe.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/src/Traits/CanVote.php b/src/Traits/CanVote.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the overtrue/laravel-follow
+ * This file is part of the overtrue/laravel-follow.
  *
  * (c) overtrue <i@overtrue.me>
  *

diff --git a/tests/Traits/CanFollowTest.php b/tests/Traits/CanFollowTest.php
@@ -102,4 +102,20 @@ public function test_following_each_other()
         $user2->follow($user1);
         $this->assertTrue($user1->areFollowingEachOther($user2));
     }
+
+    public function test_eager_loading()
+    {
+        $user1 = User::find(1);
+        $user2 = User::find(2);
+
+        $user1->follow($user2);
+        $user2->follow($user1);
+
+        // eager loading
+        $user2 = User::find(2)->load(['followings', 'followers']);
+        $this->assertTrue($user2->isFollowedBy($user1));
+
+        // without eager loading
+        $this->assertTrue($user1->isFollowedBy($user2));
+    }
 }