refactor rating views

app/Helpers/helpers.php

@@ -50,10 +50,3 @@ function getExerciseOriginLink(Exercise $exercise): ?string
         return ExerciseHelper::getExerciseOriginLink($exercise);
     }
 }
-
-if (!function_exists('getCalculatedRating')) {
-    function getCalculatedRating(): Collection
-    {
-        return RatingHelper::getCalculatedRating();
-    }
-}

app/Http/Controllers/HomeController.php

@@ -10,7 +10,6 @@
 use App\Models\Exercise;
 use App\Models\ChapterMember;
 use App\Models\User;
-use App\Services\PointsCalculator;
 use Illuminate\Support\Carbon;
 use Illuminate\View\View;
 use Request;
@@ -67,7 +66,6 @@ private function getStatisticTable(string $filter): array
         return [
             'countChapterMember' => $countChapterMember,
             'countCompletedExercise' => $countCompletedExercise,
-            'countPoints' => PointsCalculator::calculate($countChapterMember, $countCompletedExercise),
             'filterForQuery' => $filter,
         ];
     }

app/Http/Controllers/Rating/TopController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Controllers\Rating;
+
+use App\Http\Controllers\Controller;
+use App\Services\RatingCalculator;
+use Illuminate\View\View;
+
+class TopController extends Controller
+{
+    public function index(RatingCalculator $ratingCalculator): View
+    {
+        $rating = $ratingCalculator->calculate();
+
+        return view('rating.top', compact('rating'));
+    }
+}

app/Http/Controllers/UserController.php

@@ -4,13 +4,14 @@
 
 use App\Helpers\ChartHelper;
 use App\Models\User;
+use App\Services\RatingCalculator;
 use Illuminate\View\View;
 
 class UserController extends Controller
 {
-    public function show(User $user): View
+    public function show(User $user, RatingCalculator $ratingCalculator): View
     {
-        $rating = getCalculatedRating();
+        $rating = $ratingCalculator->calculate();
         $userInRating = $rating->get($user->id);
         if ($userInRating) {
             $points = $userInRating->points;

app/Helpers/RatingHelper.php → app/Services/RatingCalculator.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Helpers;
+namespace App\Services;
 
 use App\Models\User;
 use Illuminate\Support\Collection;
 
-class RatingHelper
+class RatingCalculator
 {
-    public static function getCalculatedRating(): Collection
+    public static function calculate(): Collection
     {
         $ratings = User::select('users.*')
             ->selectRaw('DENSE_RANK() OVER (ORDER BY points desc, created_at) AS position')

resources/views/home/index.blade.php

@@ -47,10 +47,6 @@
         </ul>
         <div class="container m-0 p-0  mt-2">
           <div class="row m-0 p-0  text-center">
-            <div class="col mt-4">
-              <p>{{ __('welcome.statistic.table.count_points') }}:</p>
-              <h3>{{ $statisticTable['countPoints'] }}</h3>
-            </div>
             <div class="col mt-4">
               <p>{{ __('welcome.statistic.table.count_read_chapter') }}:</p>
               <h3>{{ $statisticTable['countChapterMember'] }}</h3>

resources/views/rating/comments.blade.php

@@ -4,7 +4,7 @@
 @endsection
 @section('content')
   <div class="my-4">
-    @include('rating.menu')
+    @include('rating._menu')
 
     <h1 class="h3">{{ __('rating.comments.title') }}</h1>
 

resources/views/rating/index.blade.php → resources/views/rating/top.blade.php

@@ -7,7 +7,7 @@
 @endsection
 @section('content')
   <div class="my-4">
-    @include('rating.menu')
+    @include('rating._menu')
 
     <section>
       <h1 class="h3">{{ __('rating.index.title') }}</h1>

routes/web.php

@@ -29,7 +29,7 @@
     });
 
     Route::namespace('Rating')->prefix('ratings')->group(function (): void {
-        Route::resource('top', 'UserController')->only('index');
+        Route::resource('top', 'TopController')->only('index');
         Route::resource('comments_top', 'CommentController')->only('index');
     });
 

tests/Feature/Http/Controllers/Rating/UserControllerTest.php → tests/Feature/Http/Controllers/Rating/TopControllerTest.php

@@ -8,7 +8,7 @@
 use Tests\TestCase;
 use Illuminate\Support\Collection;
 
-class UserControllerTest extends TestCase
+class TopControllerTest extends TestCase
 {
     public function testIndex(): void
     {