Merge pull request #1620 from fey/add-points

Add points

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/Chapter/ChapterMemberController.php

@@ -7,7 +7,7 @@
 use App\Models\ChapterMember;
 use App\Models\User;
 use App\Services\ActivityService;
-use Flash;
+use DB;
 use Illuminate\Http\RedirectResponse;
 
 class ChapterMemberController extends Controller
@@ -18,8 +18,8 @@ public function finish(Chapter $chapter, ActivityService $activityService): Redi
         $currentChapterMember = $this->getMember($user, $chapter);
         $currentChapterMember->finish();
         $currentChapterMember->save();
+        $user->increment('points');
 
-        // TODO: add points for finishing
         flash()->info(__('layout.flash.success'))->success();
         $activityService->logChapterMemberFinished($currentChapterMember);
 

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,30 +4,27 @@
 
 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();
-        $userRatingPosition = $rating
-            ->search(function (array $ratingPosition) use ($user) {
-                ['user' => $ratingUser] = $ratingPosition;
-                return $ratingUser->id === $user->id;
-            });
-
-        if ($userRatingPosition) {
-            ['points' => $points] = $rating->get($userRatingPosition);
+        $rating = $ratingCalculator->calculate();
+        $userInRating = $rating->get($user->id);
+        if ($userInRating) {
+            $points = $userInRating->points;
+            $position = $userInRating->position;
         } else {
             $points = 0;
-            $userRatingPosition = 'N/A';
+            $position = 'N/A';
         }
         $user->load('chapterMembers', 'exerciseMembers');
         $chart = ChartHelper::getChart($user->id);
         return view('user.show', compact(
             'user',
-            'userRatingPosition',
+            'position',
             'points',
             'chart'
         ));

app/Services/ExerciseService.php

@@ -13,6 +13,8 @@
 
 class ExerciseService
 {
+    private const POINTS_PER_EXERCISE = 3;
+
     public function __construct(private SolutionChecker $checker, private ActivityService $activityService)
     {
     }
@@ -46,6 +48,7 @@ public function check(User $user, Exercise $exercise, string $solutionCode): Che
         if ($checkResult->isSuccess() && $user->isRegistered()) {
             if ($exerciseMember->mayFinish()) {
                 $exerciseMember->finish();
+                $user->increment('points', self::POINTS_PER_EXERCISE);
                 $exerciseMember->save();
 
                 $this->activityService->logCompletedExercise($user, $exercise);

app/Services/RatingCalculator.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\User;
+use Illuminate\Support\Collection;
+
+class RatingCalculator
+{
+    public static function calculate(): Collection
+    {
+        $ratings = User::select('users.*')
+            ->selectRaw('DENSE_RANK() OVER (ORDER BY points desc, created_at) AS position')
+            ->where('points', '>', 0)
+            ->limit(100)
+            ->get()
+            ->keyBy('id');
+        return $ratings;
+    }
+}

database/migrations/2024_03_27_174229_add_points_to_user.php

@@ -0,0 +1,32 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Query\JoinClause;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->addColumn('integer', 'points')->default(0);
+        });
+        DB::statement("UPDATE users SET points = ((SELECT count(user_id) FROM exercise_members em WHERE em.user_id = users.id) * 3);");
+        DB::statement("UPDATE users SET points = points + (SELECT count(user_id) FROM chapter_members em WHERE em.user_id = users.id);");
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('points');
+        });
+    }
+};

resources/lang/en/rating.php

@@ -9,10 +9,6 @@
         'title' => 'Top commenters',
         'description' => 'The sicp.hexlet.ru top commenters ranking',
     ],
-    'progress' => [
-        'title' => 'Top students',
-        'description' => 'The sicp.hexlet.ru top students ranking',
-    ],
     'positions' => 'Rank',
     'user' => 'Username',
     'number_of_points' => 'Points',

resources/lang/ru/rating.php

@@ -9,10 +9,6 @@
         'title' => 'Вклад в сообщество',
         'description' => 'Рейтиг участников платформы sicp.hexlet.ru по вкладу в сообщество',
     ],
-    'progress' => [
-        'title' => 'Прогресс',
-        'description' => 'Рейтиг участников платформы sicp.hexlet.ru в соответсвии с прогрессом изучения материалов книги СИКП',
-    ],
     'positions' => 'Позиция',
     'user' => 'Пользователь',
     'number_of_points' => 'Количество баллов',

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/menu.blade.php → resources/views/rating/_menu.blade.php

@@ -2,9 +2,6 @@
   <a class="btn btn-light" href="{{ route('top.index') }}">
     {{ __('rating.index.title') }}
   </a>
-  <a class="btn btn-light" href="{{ route('progress_top.index') }}">
-    {{ __('rating.progress.title') }}
-  </a>
   <a class="btn btn-light" href="{{ route('comments_top.index') }}">
     {{ __('rating.comments.title') }}
   </a>

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>