From 3f13b8120cd16d6ec4f135fc043ae906233970b7 Mon Sep 17 00:00:00 2001
From: Andrey Groza <andrey.groza@mail.ru>
Date: Tue, 24 Sep 2019 01:23:07 +0300
Subject: [PATCH 1/2] feat(rating): add rating

---
 app/Http/Controllers/RatingController.php     | 23 +++++++++++++
 database/factories/ReadChapterFactory.php     |  1 -
 resources/lang/en/layout.php                  |  5 +++
 resources/lang/en/rating.php                  |  8 +++++
 resources/lang/ru/layout.php                  |  5 +++
 resources/lang/ru/rating.php                  |  8 +++++
 resources/views/layouts/app.blade.php         |  7 +++-
 resources/views/rating/index.blade.php        | 30 +++++++++++++++++
 routes/web.php                                |  2 ++
 .../Http/Controllers/RatingControllerTest.php | 32 +++++++++++++++++++
 10 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 app/Http/Controllers/RatingController.php
 create mode 100644 resources/lang/en/layout.php
 create mode 100644 resources/lang/en/rating.php
 create mode 100644 resources/lang/ru/layout.php
 create mode 100644 resources/lang/ru/rating.php
 create mode 100644 resources/views/rating/index.blade.php
 create mode 100644 tests/Feature/Http/Controllers/RatingControllerTest.php

diff --git a/app/Http/Controllers/RatingController.php b/app/Http/Controllers/RatingController.php
new file mode 100644
index 000000000..fb5abd277
--- /dev/null
+++ b/app/Http/Controllers/RatingController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+
+class RatingController extends Controller
+{
+    public function index()
+    {
+        $users = User::withCount('readChapters')
+            ->orderBy('read_chapters_count', 'DESC')
+            ->get();
+
+        if (request()->wantsJson()) {
+            return $users;
+        }
+
+        return view('rating.index', [
+           'users' => $users,
+        ]);
+    }
+}
diff --git a/database/factories/ReadChapterFactory.php b/database/factories/ReadChapterFactory.php
index a62631e0b..83d101d15 100644
--- a/database/factories/ReadChapterFactory.php
+++ b/database/factories/ReadChapterFactory.php
@@ -11,6 +11,5 @@
 $factory->define(ReadChapter::class, function (Faker $faker) {
     return [
         'chapter_id' => factory(Chapter::class)->create()->id,
-        'user_id'    => factory(User::class)->create()->id,
     ];
 });
diff --git a/resources/lang/en/layout.php b/resources/lang/en/layout.php
new file mode 100644
index 000000000..a95431337
--- /dev/null
+++ b/resources/lang/en/layout.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'rating_page' => 'Rating',
+];
diff --git a/resources/lang/en/rating.php b/resources/lang/en/rating.php
new file mode 100644
index 000000000..8b577d536
--- /dev/null
+++ b/resources/lang/en/rating.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'page_title' => 'Users rating',
+    'positions' => 'Positions',
+    'user' => 'User',
+    'number_of_points' => 'Number of points'
+];
diff --git a/resources/lang/ru/layout.php b/resources/lang/ru/layout.php
new file mode 100644
index 000000000..07da86940
--- /dev/null
+++ b/resources/lang/ru/layout.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'rating_page' => 'Рейтинг',
+];
diff --git a/resources/lang/ru/rating.php b/resources/lang/ru/rating.php
new file mode 100644
index 000000000..b0e5167ef
--- /dev/null
+++ b/resources/lang/ru/rating.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'page_title' => 'Рейтинг пользователей',
+    'positions' => 'Позиция',
+    'user' => 'Пользователь',
+    'number_of_points' => 'Количество очков'
+];
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 8db12e154..26e6fa9f9 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -33,7 +33,12 @@
                     <div class="collapse navbar-collapse" id="navbarSupportedContent">
                         <!-- Left Side Of Navbar -->
                         <ul class="navbar-nav mr-auto">
-                            <a href="https://github.com/Hexlet/hexlet-sicp">Source Code</a>
+                            <li class="nav-item">
+                                <a class="nav-link" href="https://github.com/Hexlet/hexlet-sicp">{{ __('layout.rating_page') }}</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="https://github.com/Hexlet/hexlet-sicp">Source Code</a>
+                            </li>
                         </ul>
 
                         <!-- Right Side Of Navbar -->
diff --git a/resources/views/rating/index.blade.php b/resources/views/rating/index.blade.php
new file mode 100644
index 000000000..2ddbbe44b
--- /dev/null
+++ b/resources/views/rating/index.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.app')
+
+@section('content')
+    <div class="row my-4">
+        <div class="col-12 my-4">
+            <h3>{{ __('rating.page_title') }}</h3>
+
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th>{{ __('rating.positions') }}</th>
+                            <th>{{ __('rating.user') }}</th>
+                            <th>{{ __('rating.number_of_points') }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($users as $user)
+                            <tr>
+                                <td>{{ $loop->index + 1 }}</td>
+                                <td>{{ $user->name }}</td>
+                                <td>{{ $user->read_chapters_count }}</td>
+                            </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 4ab467bec..f01b5d967 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -35,4 +35,6 @@ static function () {
     Route::resource('users.chapters', 'UserChapterController')->only('store');
 });
 
+Route::resource('ratings', 'RatingController')->only('index');
+
 Route::get('/home', 'HomeController@index')->name('home');
diff --git a/tests/Feature/Http/Controllers/RatingControllerTest.php b/tests/Feature/Http/Controllers/RatingControllerTest.php
new file mode 100644
index 000000000..2a10a3ab5
--- /dev/null
+++ b/tests/Feature/Http/Controllers/RatingControllerTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Feature\Http\Controllers;
+
+use App\ReadChapter;
+use App\User;
+use Tests\TestCase;
+
+class RatingControllerTest extends TestCase
+{
+    public function testIndex()
+    {
+        $userWithThree = factory(User::class)->create();
+        factory(ReadChapter::class, 3)->create([
+            'user_id' => $userWithThree->id,
+        ]);
+
+        factory(User::class)->create();
+
+        $userWithTwo = factory(User::class)->create();
+        factory(ReadChapter::class, 2)->create([
+            'user_id' => $userWithTwo->id,
+        ]);
+
+        $response = $this->getJson(route('ratings.index'))
+            ->assertStatus(200);
+
+        $responseData = $response->json();
+
+        $this->assertEquals([3, 2, 0], array_column($responseData, 'read_chapters_count'));
+    }
+}

From 474eb2f8fe68bf79efc178f1586b8da92b598e91 Mon Sep 17 00:00:00 2001
From: Andrey Groza <andrey.groza@mail.ru>
Date: Wed, 25 Sep 2019 00:45:34 +0300
Subject: [PATCH 2/2] fix(rating): remove sorting test, only status 200

---
 app/Http/Controllers/RatingController.php     |  4 ---
 database/factories/ReadChapterFactory.php     |  1 +
 .../Http/Controllers/RatingControllerTest.php | 26 +++++++------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/RatingController.php b/app/Http/Controllers/RatingController.php
index fb5abd277..01a0b0de6 100644
--- a/app/Http/Controllers/RatingController.php
+++ b/app/Http/Controllers/RatingController.php
@@ -12,10 +12,6 @@ public function index()
             ->orderBy('read_chapters_count', 'DESC')
             ->get();
 
-        if (request()->wantsJson()) {
-            return $users;
-        }
-
         return view('rating.index', [
            'users' => $users,
         ]);
diff --git a/database/factories/ReadChapterFactory.php b/database/factories/ReadChapterFactory.php
index 83d101d15..a62631e0b 100644
--- a/database/factories/ReadChapterFactory.php
+++ b/database/factories/ReadChapterFactory.php
@@ -11,5 +11,6 @@
 $factory->define(ReadChapter::class, function (Faker $faker) {
     return [
         'chapter_id' => factory(Chapter::class)->create()->id,
+        'user_id'    => factory(User::class)->create()->id,
     ];
 });
diff --git a/tests/Feature/Http/Controllers/RatingControllerTest.php b/tests/Feature/Http/Controllers/RatingControllerTest.php
index 2a10a3ab5..dcc7067f4 100644
--- a/tests/Feature/Http/Controllers/RatingControllerTest.php
+++ b/tests/Feature/Http/Controllers/RatingControllerTest.php
@@ -10,23 +10,15 @@ class RatingControllerTest extends TestCase
 {
     public function testIndex()
     {
-        $userWithThree = factory(User::class)->create();
-        factory(ReadChapter::class, 3)->create([
-            'user_id' => $userWithThree->id,
-        ]);
-
-        factory(User::class)->create();
-
-        $userWithTwo = factory(User::class)->create();
-        factory(ReadChapter::class, 2)->create([
-            'user_id' => $userWithTwo->id,
-        ]);
-
-        $response = $this->getJson(route('ratings.index'))
+        factory(User::class, 10)
+            ->create()
+            ->each(function ($user) {
+                factory(ReadChapter::class, mt_rand(0, 10))->create([
+                    'user_id' => $user->id,
+                ]);
+            });
+
+        $this->get(route('ratings.index'))
             ->assertStatus(200);
-
-        $responseData = $response->json();
-
-        $this->assertEquals([3, 2, 0], array_column($responseData, 'read_chapters_count'));
     }
 }