Merge pull request #1154 from HDInnovations/development

(Update) Poll System

Author: HDVinnie

app/Helpers/Helpers.php

@@ -58,7 +58,7 @@ function hrefPoll($poll)
     {
         $appurl = appurl();
 
-        return "{$appurl}/polls/{$poll->slug}";
+        return "{$appurl}/polls/{$poll->id}";
     }
 }
 

app/Http/Controllers/PollController.php

@@ -57,14 +57,14 @@ public function index()
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function show(Request $request, $slug)
+    public function show(Request $request, $id)
     {
-        $poll = Poll::whereSlug($slug)->firstOrFail();
+        $poll = Poll::findOrFail($id);
         $user = $request->user();
         $user_has_voted = $poll->voters->where('user_id', '=', $user->id)->isNotEmpty();
 
         if ($user_has_voted) {
-            return redirect('polls/'.$poll->slug.'/result')
+            return redirect()->route('poll_results', ['id' => $poll->id])
                 ->withInfo('You have already vote on this poll. Here are the results.');
         }
 
@@ -82,10 +82,11 @@ public function vote(VoteOnPoll $request)
     {
         $user = $request->user();
         $poll = Option::findOrFail($request->input('option.0'))->poll;
-
-        // Extract the logic to function validateVoter()
-        if (!$this->validateVoter($request, $user, $poll)) {
-            return redirect('polls/'.$poll->slug.'/result')
+        $voted = Voter::where('user_id', '=', $user->id)
+            ->where('poll_id', '=', $poll->id)
+            ->exists();
+        if ($voted) {
+            return redirect()->route('poll_results', ['id' => $poll->id])
                 ->withErrors('Bro have already vote on this poll. Your vote has not been counted.');
         }
 
@@ -98,7 +99,6 @@ public function vote(VoteOnPoll $request)
         $vote = new Voter();
         $vote->poll_id = $poll->id;
         $vote->user_id = $user->id;
-        $vote->ip_address = $request->ip();
         $vote->save();
 
         $poll_url = hrefPoll($poll);
@@ -108,7 +108,7 @@ public function vote(VoteOnPoll $request)
             "[url={$profile_url}]{$user->username}[/url] has voted on poll [url={$poll_url}]{$poll->title}[/url]"
         );
 
-        return redirect('polls/'.$poll->slug.'/result')
+        return redirect()->route('poll_results', ['id' => $poll->id])
             ->withSuccess('Your vote has been counted.');
     }
 
@@ -119,44 +119,14 @@ public function vote(VoteOnPoll $request)
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function result($slug)
+    public function result($id)
     {
-        $poll = Poll::whereSlug($slug)->firstOrFail();
+        $poll = Poll::findOrFail($id);
         $map = [
             'poll'        => $poll,
             'total_votes' => $poll->totalVotes(),
         ];
 
         return view('poll.result', $map);
     }
-
-    /**
-     * Check If Voter Validated.
-     *
-     * @param VoteOnPoll $request
-     * @param $user
-     * @param Poll $poll
-     *
-     * @return bool
-     */
-    private function validateVoter(VoteOnPoll $request, $user, Poll $poll): bool
-    {
-        // Expect for simplifying the logic below while remain semantic.
-        return !(
-            // One user should never vote on one poll twice.
-            (
-            Voter::where('user_id', '=', $user->id)
-                ->where('poll_id', '=', $poll->id)
-                ->exists()
-            ) ||
-            // If ip_checking is set, further examine request's IP.
-            (
-                $poll->ip_checking == 1
-                &&
-                Voter::where('user_id', '=', $user->id)
-                    ->where('ip_address', '=', $request->ip())
-                    ->exists()
-            )
-        );
-    }
 }

app/Http/Kernel.php

@@ -76,7 +76,6 @@ class Kernel extends HttpKernel
         'bindings'      => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can'           => \Illuminate\Auth\Middleware\Authorize::class,
-        'check_ip'      => \App\Http\Middleware\CheckIfAlreadyVoted::class,
         'csrf'          => \App\Http\Middleware\VerifyCsrfToken::class,
         'guest'         => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'language'      => \App\Http\Middleware\SetLanguage::class,

app/Http/Middleware/CheckIfAlreadyVoted.php

@@ -22,7 +22,6 @@
  * @property int $id
  * @property int $poll_id
  * @property int $user_id
- * @property string $ip_address
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Poll $poll
@@ -33,7 +32,6 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter query()
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter whereIpAddress($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter wherePollId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter whereUpdatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Voter whereUserId($value)

app/Models/Voter.php

@@ -17,7 +17,7 @@
     </li>
     <li>
         <a href="{{ route('staff.polls.edit', ['id'=> $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('poll.edit-poll') {{$poll->slug}}</span>
+            <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('poll.edit-poll') {{$poll->title}}</span>
         </a>
     </li>
 @endsection

resources/views/Staff/poll/edit.blade.php

@@ -37,7 +37,7 @@
                 <tbody>
                     @foreach ($polls as $poll)
                         <tr>
-                            <td><a href="{{ url('/dashboard/polls/' . $poll->id) }}">{{ $poll->title }}</a></td>
+                            <td><a href="{{ route('staff.polls.show', ['id' => $poll->id]) }}">{{ $poll->title }}</a></td>
                             <td>{{ date('d M Y', $poll->created_at->getTimestamp()) }}</td>
                             <td>
                                 <form action="{{ route('staff.polls.destroy', ['id' => $poll->id]) }}" method="POST">

resources/views/Staff/poll/index.blade.php

@@ -17,7 +17,7 @@
     </li>
     <li>
         <a href="{{ route('staff.polls.show', ['id' => $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->slug }} @lang('poll.results')</span>
+            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->title }} @lang('poll.results')</span>
         </a>
     </li>
 @endsection

resources/views/Staff/poll/show.blade.php

@@ -39,7 +39,7 @@
     <div class="form-group">
         <div class="col-md-12">
             <button type="submit" class="btn btn-primary">@lang('poll.vote')</button>
-            <a class="btn btn-success" href="{{ route('poll_results', ['slug' => $poll->slug]) }}" role="button"><i
+            <a class="btn btn-success" href="{{ route('poll_results', ['id' => $poll->id]) }}" role="button"><i
                         class="{{ config('other.font-awesome') }} fa-bar-chart"
                         aria-hidden="true"> @lang('poll.results')</i></a>
         </div>

resources/views/poll/forms/vote.blade.php

@@ -21,7 +21,7 @@
         </div>
         <div class="blocks">
             @foreach ($polls as $poll)
-                <a href="{{ url('/polls/' . $poll->slug) }}" style="padding: 0 2px;">
+                <a href="{{ route('poll', ['id' => $poll->id]) }}" style="padding: 0 2px;">
                     <div class="general media_blocks">
                         <h2 style="font-size: 20px;"><i class="{{ config('other.font-awesome') }} fa-pie-chart"></i>
                             {{ $poll->title }}</h2>

resources/views/poll/latest.blade.php

@@ -11,12 +11,12 @@
         </a>
     </li>
     <li>
-        <a href="{{ route('poll', ['slug' => $poll->slug]) }}" itemprop="url" class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->slug }}</span>
+        <a href="{{ route('poll', ['id' => $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->title }}</span>
         </a>
     </li>
     <li>
-        <a href="{{ route('poll_results', ['slug' => $poll->slug]) }}" itemprop="url" class="l-breadcrumb-item-link">
+        <a href="{{ route('poll_results', ['id' => $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('poll.results')</span>
         </a>
     </li>

resources/views/poll/result.blade.php

@@ -11,8 +11,8 @@
         </a>
     </li>
     <li>
-        <a href="{{ route('poll', ['slug' => $poll->slug]) }}" itemprop="url" class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->slug }}</span>
+        <a href="{{ route('poll', ['id' => $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $poll->title }}</span>
         </a>
     </li>
 @endsection

resources/views/poll/show.blade.php

@@ -387,9 +387,9 @@
         // Poll System
         Route::group(['prefix' => 'polls'], function () {
             Route::get('/', 'PollController@index')->name('polls');
-            Route::post('/vote', 'PollController@vote')->middleware('check_ip');
-            Route::get('/{slug}', 'PollController@show')->name('poll');
-            Route::get('/{slug}/result', 'PollController@result')->name('poll_results');
+            Route::post('/vote', 'PollController@vote');
+            Route::get('/{id}', 'PollController@show')->where('id', '[0-9]+')->name('poll');
+            Route::get('/{id}/result', 'PollController@result')->name('poll_results');
         });
 
         // Graveyard System

routes/web.php

@@ -37,7 +37,7 @@ public function result_returns_an_ok_response()
         $poll = factory(\App\Models\Poll::class)->create();
         $user = factory(\App\Models\User::class)->create();
 
-        $response = $this->actingAs($user)->get(route('poll_results', ['slug' => $poll->slug]));
+        $response = $this->actingAs($user)->get(route('poll_results', ['id' => $poll->id]));
 
         $response->assertOk();
         $response->assertViewIs('poll.result');
@@ -55,7 +55,7 @@ public function show_returns_an_ok_response()
         $poll = factory(\App\Models\Poll::class)->create();
         $user = factory(\App\Models\User::class)->create();
 
-        $response = $this->actingAs($user)->get(route('poll', ['slug' => $poll->slug]));
+        $response = $this->actingAs($user)->get(route('poll', ['id' => $poll->id]));
 
         $response->assertRedirect(withInfo('You have already vote on this poll. Here are the results.'));