Allow users to manually subscribe and unsubscribe

driesvints · driesvints · commit 0fc8db725f8b · 2018-01-26T17:25:50.000+01:00
diff --git a/app/Http/Controllers/Forum/ThreadsController.php b/app/Http/Controllers/Forum/ThreadsController.php
@@ -14,8 +14,11 @@
 use App\Jobs\UnmarkThreadSolution;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ThreadRequest;
+use App\Jobs\SubscribeToSubscriptionAble;
 use Illuminate\Auth\Middleware\Authenticate;
+use App\Jobs\UnsubscribeFromSubscriptionAble;
 use App\Http\Middleware\RedirectIfUnconfirmed;
+use Illuminate\Http\Request;
 
 class ThreadsController extends Controller
 {
@@ -97,4 +100,26 @@ public function unmarkSolution(Thread $thread)
 
         return redirect()->route('thread', $thread->slug());
     }
+
+    public function subscribe(Request $request, Thread $thread)
+    {
+        $this->authorize(ThreadPolicy::SUBSCRIBE, $thread);
+
+        $this->dispatchNow(new SubscribeToSubscriptionAble($request->user(), $thread));
+
+        $this->success("You're now subscribed to this thread.");
+
+        return redirect()->route('thread', $thread->slug());
+    }
+
+    public function unsubscribe(Request $request, Thread $thread)
+    {
+        $this->authorize(ThreadPolicy::UNSUBSCRIBE, $thread);
+
+        $this->dispatchNow(new UnsubscribeFromSubscriptionAble($request->user(), $thread));
+
+        $this->success("You're now unsubscribed from this thread.");
+
+        return redirect()->route('thread', $thread->slug());
+    }
 }
diff --git a/app/Jobs/SubscribeToSubscriptionAble.php b/app/Jobs/SubscribeToSubscriptionAble.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Subscription;
+use App\User;
+use App\Models\SubscriptionAble;
+
+class SubscribeToSubscriptionAble
+{
+    /**
+     * @var \App\User
+     */
+    private $user;
+
+    /**
+     * @var \App\Models\SubscriptionAble
+     */
+    private $subscriptionAble;
+
+    public function __construct(User $user, SubscriptionAble $subscriptionAble)
+    {
+        $this->user = $user;
+        $this->subscriptionAble = $subscriptionAble;
+    }
+
+    public function handle()
+    {
+        $subscription = new Subscription();
+        $subscription->userRelation()->associate($this->user);
+        $this->subscriptionAble->subscriptionsRelation()->save($subscription);
+    }
+}
diff --git a/app/Policies/ThreadPolicy.php b/app/Policies/ThreadPolicy.php
@@ -9,20 +9,26 @@ class ThreadPolicy
 {
     const UPDATE = 'update';
     const DELETE = 'delete';
+    const SUBSCRIBE = 'subscribe';
+    const UNSUBSCRIBE = 'unsubscribe';
 
-    /**
-     * Determine if the given thread can be updated by the user.
-     */
     public function update(User $user, Thread $thread): bool
     {
         return $thread->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
     }
 
-    /**
-     * Determine if the given thread can be deleted by the user.
-     */
     public function delete(User $user, Thread $thread): bool
     {
         return $thread->isAuthoredBy($user) || $user->isModerator() || $user->isAdmin();
     }
+
+    public function subscribe(User $user, Thread $thread): bool
+    {
+        return ! $thread->hasSubscriber($user);
+    }
+
+    public function unsubscribe(User $user, Thread $thread): bool
+    {
+        return $thread->hasSubscriber($user);
+    }
 }
diff --git a/resources/views/forum/threads/show.blade.php b/resources/views/forum/threads/show.blade.php
@@ -10,11 +10,25 @@
             <hr>
 
             @can(App\Policies\ThreadPolicy::UPDATE, $thread)
-                <a class="btn btn-default btn-block" href="{{ route('threads.edit', $thread->slug()) }}">Edit</a>
+                <a class="btn btn-default btn-block" href="{{ route('threads.edit', $thread->slug()) }}">
+                    Edit
+                </a>
+            @endcan
+
+            @can(App\Policies\ThreadPolicy::UNSUBSCRIBE, $thread)
+                <a class="btn btn-primary btn-block" href="{{ route('threads.unsubscribe', $thread->slug()) }}">
+                    Unsubscribe
+                </a>
+            @elsecan(App\Policies\ThreadPolicy::SUBSCRIBE, $thread)
+                <a class="btn btn-primary btn-block" href="{{ route('threads.subscribe', $thread->slug()) }}">
+                    Subscribe
+                </a>
             @endcan
 
             @can(App\Policies\ThreadPolicy::DELETE, $thread)
-                <a class="btn btn-danger btn-block" href="#" data-toggle="modal" data-target="#deleteThread">Delete</a>
+                <a class="btn btn-danger btn-block" href="#" data-toggle="modal" data-target="#deleteThread">
+                    Delete
+                </a>
 
                 @include('_partials._delete_modal', [
                     'id' => 'deleteThread',
@@ -24,7 +38,9 @@
                 ])
             @endcan
 
-            <a class="btn btn-link btn-block" href="{{ route('forum') }}"><i class="fa fa-arrow-left"></i> Back</a></a>
+            <a class="btn btn-link btn-block" href="{{ route('forum') }}">
+                <i class="fa fa-arrow-left"></i> Back
+            </a>
 
             @include('layouts._ads._forum_sidebar')
         </div>
@@ -57,18 +73,26 @@
                         @include('forum.threads.info.avatar', ['user' => $reply->author()])
 
                         <div class="thread-info-author">
-                            <a href="{{ route('profile', $reply->author()->username()) }}" class="thread-info-link">{{ $reply->author()->name() }}</a> replied
+                            <a href="{{ route('profile', $reply->author()->username()) }}" class="thread-info-link">
+                                {{ $reply->author()->name() }}
+                            </a> replied
                             {{ $reply->createdAt()->diffForHumans() }}
 
                             @if ($thread->isSolutionReply($reply))
-                                <span class="label label-primary thread-info-badge">Solution</span>
+                                <span class="label label-primary thread-info-badge">
+                                    Solution
+                                </span>
                             @endif
                         </div>
 
                         @can(App\Policies\ReplyPolicy::UPDATE, $reply)
                             <div class="thread-info-tags">
-                                <a class="btn btn-default btn-xs" href="{{ route('replies.edit', $reply->id()) }}">Edit</a>
-                                <a class="btn btn-danger btn-xs" href="#" data-toggle="modal" data-target="#deleteReply{{ $reply->id() }}">Delete</a>
+                                <a class="btn btn-default btn-xs" href="{{ route('replies.edit', $reply->id()) }}">
+                                    Edit
+                                </a>
+                                <a class="btn btn-danger btn-xs" href="#" data-toggle="modal" data-target="#deleteReply{{ $reply->id() }}">
+                                    Delete
+                                </a>
                             </div>
                         @endcan
                     </div>
diff --git a/routes/web.php b/routes/web.php
@@ -54,6 +54,8 @@
     Route::delete('{thread}', ['as' => 'threads.delete', 'uses' => 'ThreadsController@delete']);
     Route::put('{thread}/mark-solution/{reply}', ['as' => 'threads.solution.mark', 'uses' => 'ThreadsController@markSolution']);
     Route::put('{thread}/unmark-solution', ['as' => 'threads.solution.unmark', 'uses' => 'ThreadsController@unmarkSolution']);
+    Route::get('{thread}/subscribe', ['as' => 'threads.subscribe', 'uses' => 'ThreadsController@subscribe']);
+    Route::get('{thread}/unsubscribe', ['as' => 'threads.unsubscribe', 'uses' => 'ThreadsController@unsubscribe']);
 
     Route::get('tags/{tag}', ['as' => 'forum.tag', 'uses' => 'TagsController@show']);
 });
diff --git a/tests/BrowserKitTestCase.php b/tests/BrowserKitTestCase.php
@@ -6,7 +6,12 @@
 
 abstract class BrowserKitTestCase extends BaseTestCase
 {
-    use CreatesApplication, CreatesUsers, HttpAssertions;
+    use CreatesApplication, CreatesUsers, FakesData, HttpAssertions;
 
     public $baseUrl = 'http://localhost';
+
+    protected function dispatch($job)
+    {
+        return $job->handle();
+    }
 }
diff --git a/tests/Components/Jobs/SubscribeToSubscriptionAbleTest.php b/tests/Components/Jobs/SubscribeToSubscriptionAbleTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Components\Jobs;
+
+use Tests\TestCase;
+use App\Models\Thread;
+use App\Jobs\SubscribeToSubscriptionAble;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class SubscribeToSubscriptionAbleTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function it_can_subscribe_a_user_to_a_thread()
+    {
+        $user = $this->createUser();
+        $thread = factory(Thread::class)->create();
+
+        $this->assertFalse($thread->hasSubscriber($user));
+
+        $this->dispatch(new SubscribeToSubscriptionAble($user, $thread));
+
+        $this->assertTrue($thread->hasSubscriber($user));
+    }
+}
diff --git a/tests/Components/Jobs/UnsubscribeFromSubscriptionAbleTest.php b/tests/Components/Jobs/UnsubscribeFromSubscriptionAbleTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Components\Jobs;
+
+use Tests\TestCase;
+use App\Models\Thread;
+use App\Models\Subscription;
+use App\Jobs\UnsubscribeFromSubscriptionAble;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class UnsubscribeFromSubscriptionAbleTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /** @test */
+    public function it_can_unsubscribe_a_user_from_a_thread()
+    {
+        $user = $this->createUser();
+        $thread = factory(Thread::class)->create();
+        factory(Subscription::class)->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
+
+        $this->assertTrue($thread->hasSubscriber($user));
+
+        $this->dispatch(new UnsubscribeFromSubscriptionAble($user, $thread));
+
+        $this->assertFalse($thread->hasSubscriber($user));
+    }
+}
diff --git a/tests/Feature/SubscriptionTest.php b/tests/Feature/SubscriptionTest.php
@@ -3,17 +3,17 @@
 namespace Tests\Feature;
 
 use App\User;
-use Tests\TestCase;
 use App\Models\Thread;
 use App\Jobs\CreateReply;
 use App\Jobs\CreateThread;
 use App\Models\Subscription;
+use Tests\BrowserKitTestCase;
 use App\Notifications\NewReply;
 use Illuminate\Support\Facades\Notification;
 use App\Jobs\UnsubscribeFromSubscriptionAble;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
-class SubscriptionTest extends TestCase
+class SubscriptionTest extends BrowserKitTestCase
 {
     use DatabaseMigrations;
 
@@ -55,17 +55,31 @@ public function users_are_automatically_subscribed_to_a_thread_after_replying_to
         $this->assertTrue($thread->hasSubscriber($user));
     }
 
+    /** @test */
+    public function users_can_manually_subscribe_to_threads()
+    {
+        factory(Thread::class)->create(['slug' => $slug = $this->faker->slug]);
+
+        $this->login();
+
+        $this->visit("/forum/$slug")
+            ->click('Subscribe')
+            ->seePageIs("/forum/$slug")
+            ->see("You're now subscribed to this thread.");
+    }
+
     /** @test */
     public function users_can_unsubscribe_from_threads()
     {
         $user = $this->createUser();
-        $thread = factory(Thread::class)->create();
+        $thread = factory(Thread::class)->create(['slug' => $slug = $this->faker->slug]);
         factory(Subscription::class)->create(['user_id' => $user->id(), 'subscriptionable_id' => $thread->id()]);
 
-        $this->assertTrue($thread->hasSubscriber($user));
-
-        $this->dispatch(new UnsubscribeFromSubscriptionAble($user, $thread));
+        $this->loginAs($user);
 
-        $this->assertFalse($thread->hasSubscriber($user));
+        $this->visit("/forum/$slug")
+            ->click('Unsubscribe')
+            ->seePageIs("/forum/$slug")
+            ->see("You're now unsubscribed from this thread.");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,26 @@ class ThreadPolicy`
`9`	`9`	`{`
`10`	`10`	`const UPDATE = 'update';`
`11`	`11`	`const DELETE = 'delete';`
	`12`	`+ const SUBSCRIBE = 'subscribe';`
	`13`	`+ const UNSUBSCRIBE = 'unsubscribe';`
`12`	`14`
`13`		`- /**`
`14`		`- * Determine if the given thread can be updated by the user.`
`15`		`- */`
`16`	`15`	`public function update(User $user, Thread $thread): bool`
`17`	`16`	`{`
`18`	`17`	`return $thread->isAuthoredBy($user) \|\| $user->isModerator() \|\| $user->isAdmin();`
`19`	`18`	`}`
`20`	`19`
`21`		`- /**`
`22`		`- * Determine if the given thread can be deleted by the user.`
`23`		`- */`
`24`	`20`	`public function delete(User $user, Thread $thread): bool`
`25`	`21`	`{`
`26`	`22`	`return $thread->isAuthoredBy($user) \|\| $user->isModerator() \|\| $user->isAdmin();`
`27`	`23`	`}`
	`24`	`+`
	`25`	`+ public function subscribe(User $user, Thread $thread): bool`
	`26`	`+ {`
	`27`	`+ return ! $thread->hasSubscriber($user);`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ public function unsubscribe(User $user, Thread $thread): bool`
	`31`	`+ {`
	`32`	`+ return $thread->hasSubscriber($user);`
	`33`	`+ }`
`28`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,12 @@`
`6`	`6`
`7`	`7`	`abstract class BrowserKitTestCase extends BaseTestCase`
`8`	`8`	`{`
`9`		`- use CreatesApplication, CreatesUsers, HttpAssertions;`
	`9`	`+ use CreatesApplication, CreatesUsers, FakesData, HttpAssertions;`
`10`	`10`
`11`	`11`	`public $baseUrl = 'http://localhost';`
	`12`	`+`
	`13`	`+ protected function dispatch($job)`
	`14`	`+ {`
	`15`	`+ return $job->handle();`
	`16`	`+ }`
`12`	`17`	`}`