Following each other. #63

overtrue · Aug 31, 2018 · 2830aa6 · 2830aa6
1 parent 510e222
commit 2830aa6
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -110,6 +110,7 @@ $user->unfollow($targets)
 $user->toggleFollow($targets)
 $user->followings()->get() // App\User:class
 $user->followings(App\Post::class)->get()
+$user->areFollowingEachOther($anotherUser);
 $user->isFollowing($target)
 ```
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "overtrue/laravel-follow",
     "description": "Laravel 5 User Based System",
     "require": {
-        "php": ">=5.5.9"
+        "php": ">=5.6.0"
     },
     "require-dev": {
         "laravel/laravel": "5.*",

diff --git a/src/Follow.php b/src/Follow.php
@@ -73,9 +73,10 @@ class Follow
     public static function isRelationExists(Model $model, $relation, $target, $class = null)
     {
         $target = self::formatTargets($target, $class ?: config('follow.user_model'));
+        $field = self::tablePrefixedField($class ? 'followable_id' : config('follow.users_table_foreign_key', 'user_id'));
 
         return $model->{$relation}($target->classname)
-                        ->where($class ? 'followable_id' : config('follow.users_table_foreign_key', 'user_id'), head($target->ids))->exists();
+                        ->where($field, head($target->ids))->exists();
     }
 
     /**
@@ -216,4 +217,14 @@ protected static function getRelationTypeFromRelation(MorphToMany $relation)
 
         return self::RELATION_TYPES[$relation->getRelationName()];
     }
+
+    /**
+     * @param string $field
+     *
+     * @return string
+     */
+    protected static function tablePrefixedField($field)
+    {
+        return \sprintf('%s.%s', config('follow.followable_table'), $field);
+    }
 }
diff --git a/src/Traits/CanBeFollowed.php b/src/Traits/CanBeFollowed.php
@@ -11,6 +11,7 @@
 
 namespace Overtrue\LaravelFollow\Traits;
 
+use Illuminate\Support\Facades\DB;
 use Overtrue\LaravelFollow\Follow;
 
 /**
@@ -37,8 +38,20 @@ public function isFollowedBy($user)
      */
     public function followers()
     {
+        $table = config('follow.followable_table');
+        $class = \get_class($this);
+        $userTable = config('follow.user_table', 'users');
+        $foreignKey = config('follow.users_table_foreign_key', 'user_id');
+
         return $this->morphToMany(config('follow.user_model'), config('follow.morph_prefix'), config('follow.followable_table'))
                     ->wherePivot('relation', '=', Follow::RELATION_FOLLOW)
-                    ->withPivot('followable_type', 'relation', 'created_at');
+                    ->withPivot('followable_type', 'relation', 'created_at')
+                    ->addSelect("{$userTable}.*", DB::raw("pivot_followables.{$foreignKey} IS NOT NULL AS pivot_each_other"))
+                    ->leftJoin("{$table} as pivot_followables", function($join) use ($table, $class, $foreignKey) {
+
+                        $join->on('pivot_followables.followable_type', '=', DB::raw(\addcslashes("'{$class}'", '\\')))
+                            ->on('pivot_followables.followable_id', '=', "{$table}.{$foreignKey}")
+                            ->on("pivot_followables.{$foreignKey}", '=', "{$table}.followable_id");
+                    });
     }
 }
diff --git a/src/Traits/CanFollow.php b/src/Traits/CanFollow.php
@@ -11,6 +11,7 @@
 
 namespace Overtrue\LaravelFollow\Traits;
 
+use Illuminate\Support\Facades\DB;
 use Overtrue\LaravelFollow\Follow;
 
 /**
@@ -74,6 +75,19 @@ public function isFollowing($target, $class = __CLASS__)
         return Follow::isRelationExists($this, 'followings', $target, $class);
     }
 
+    /**
+     * Check if user and target user is following each other.
+     *
+     * @param int|array|\Illuminate\Database\Eloquent\Model $target
+     * @param string                                        $class
+     *
+     * @return bool
+     */
+    public function areFollowingEachOther($target, $class = __CLASS__)
+    {
+        return Follow::isRelationExists($this, 'followings', $target, $class) && Follow::isRelationExists($target, 'followings', $this, $class);
+    }
+
     /**
      * Return item followings.
      *
@@ -83,8 +97,19 @@ public function isFollowing($target, $class = __CLASS__)
      */
     public function followings($class = __CLASS__)
     {
-        return $this->morphedByMany($class, config('follow.morph_prefix'), config('follow.followable_table'))
+        $table = config('follow.followable_table');
+        $foreignKey = config('follow.users_table_foreign_key', 'user_id');
+        $targetTable = (new $class)->getTable();
+
+        return $this->morphedByMany($class, config('follow.morph_prefix'), $table)
                     ->wherePivot('relation', '=', Follow::RELATION_FOLLOW)
-                    ->withPivot('followable_type', 'relation', 'created_at');
+                    ->withPivot('followable_type', 'relation', 'created_at')
+                    ->addSelect("{$targetTable}.*", DB::raw("pivot_followables.{$foreignKey} IS NOT NULL AS pivot_each_other"))
+                    ->leftJoin("{$table} as pivot_followables", function($join) use ($table, $class, $foreignKey) {
+
+                        $join->on('pivot_followables.followable_type', '=', DB::raw(\addcslashes("'{$class}'", '\\')))
+                            ->on('pivot_followables.followable_id', '=', "{$table}.{$foreignKey}")
+                            ->on("pivot_followables.{$foreignKey}", '=', "{$table}.followable_id");
+                    });
     }
 }
diff --git a/tests/FollowTest.php b/tests/FollowTest.php
@@ -24,7 +24,7 @@ public function testIsRelationExists()
         $target = 12;
         $model = \Mockery::mock(Model::class);
         $model->shouldReceive('followings')->with($class)->andReturnSelf()->once();
-        $model->shouldReceive('where')->with('followable_id', $target)->andReturnSelf()->once();
+        $model->shouldReceive('where')->with('followables.followable_id', $target)->andReturnSelf()->once();
         $model->shouldReceive('exists')->withNoArgs()->andReturn(true)->once();
 
         $this->assertTrue(Follow::isRelationExists($model, 'followings', $target, $class));
@@ -35,7 +35,7 @@ public function testIsRelationExists()
         $target = 12;
         $model = \Mockery::mock(Model::class);
         $model->shouldReceive('followings')->with('App\User')->andReturnSelf()->once();
-        $model->shouldReceive('where')->with('user_id', $target)->andReturnSelf()->once();
+        $model->shouldReceive('where')->with('followables.user_id', $target)->andReturnSelf()->once();
         $model->shouldReceive('exists')->withNoArgs()->andReturn(true)->once();
 
         $this->assertTrue(Follow::isRelationExists($model, 'followings', $target));

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -13,11 +13,11 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Artisan;
 
 class TestCase extends \Illuminate\Foundation\Testing\TestCase
 {
-    use DatabaseTransactions;
-
     protected $config;
 
     /**
@@ -41,7 +41,7 @@ public function createApplication()
     /**
      * Setup DB before each test.
      */
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 
@@ -64,21 +64,23 @@ public function migrate()
         $fileSystem = new Filesystem();
 
         $fileSystem->copy(
-            __DIR__.'/../database/migrations/create_laravel_follow_tables.php',
-            __DIR__.'/../tests/database/migrations/create_laravel_follow_tables.php'
+            __DIR__.'/../database/migrations/2018_06_29_032244_create_laravel_follow_tables.php',
+            __DIR__.'/database/migrations/create_laravel_follow_tables.php'
         );
 
-        foreach ($fileSystem->files(__DIR__.'/../tests/database/migrations') as $file) {
+        foreach ($fileSystem->files(__DIR__.'/database/migrations') as $file) {
             $fileSystem->requireOnce($file);
         }
+
+        (new \CreateLaravelFollowTables())->up();
         (new \CreateUsersTable())->up();
         (new \CreateOthersTable())->up();
-        (new \CreateLaravelFollowTables())->up();
     }
 
     public function tearDown()
     {
         parent::tearDown();
+
         unlink(__DIR__.'/database/migrations/create_laravel_follow_tables.php');
     }
 

diff --git a/tests/Traits/CanFollowTest.php b/tests/Traits/CanFollowTest.php
@@ -66,7 +66,7 @@ public function test_user_can_follow_other_by_id()
 
         $user->follow($other);
 
-        $this->assertCount(1, $user->followings(Other::class)->get());
+       $this->assertCount(1, $user->followings(Other::class)->get());
     }
 
     public function test_unfollow_other()
@@ -89,4 +89,17 @@ public function test_is_following_other()
 
         $this->assertTrue($user->isFollowing($other));
     }
+
+    public function test_following_each_other()
+    {
+        $user1 = User::find(1);
+        $user2 = User::find(2);
+
+        $user1->follow($user2);
+
+        $this->assertFalse($user1->areFollowingEachOther($user2));
+
+        $user2->follow($user1);
+        $this->assertTrue($user1->areFollowingEachOther($user2));
+    }
 }