From c5abf73eb05b02074e6bd188d29dda3a992b6fa3 Mon Sep 17 00:00:00 2001
From: aslan <aslan@aslan.ru>
Date: Mon, 12 Feb 2024 10:58:48 +0300
Subject: [PATCH] refactoring fix lint Direction resource

---
 .../Catalog/DirectionController.php           |  18 +--
 .../Catalog/StoreDirectionRequest.php         |  10 +-
 .../Catalog/UpdateDirectionRequest.php        |  11 +-
 app/Policies/DirectionPolicy.php              |  66 -----------
 database/factories/DirectionFactory.php       |  14 +--
 database/seeders/DirectionSeeder.php          |   7 +-
 .../admin/catalog/department/create.blade.php |   1 -
 .../catalog/direction/create.blade.php        |   1 -
 .../catalog/direction/edit.blade.php          |  11 ++
 .../catalog/direction/index.blade.php         |   3 +-
 .../catalog/direction/show.blade.php          |   0
 tests/Feature/admin/catalog/DirectionTest.php | 108 ++++++++++++++++++
 12 files changed, 141 insertions(+), 109 deletions(-)
 rename app/Http/Controllers/{ => admin}/Catalog/DirectionController.php (74%)
 rename app/Http/Requests/{ => admin}/Catalog/StoreDirectionRequest.php (63%)
 rename app/Http/Requests/{ => admin}/Catalog/UpdateDirectionRequest.php (70%)
 delete mode 100644 app/Policies/DirectionPolicy.php
 rename resources/views/{ => admin}/catalog/direction/create.blade.php (99%)
 rename resources/views/{ => admin}/catalog/direction/edit.blade.php (85%)
 rename resources/views/{ => admin}/catalog/direction/index.blade.php (95%)
 rename resources/views/{ => admin}/catalog/direction/show.blade.php (100%)
 create mode 100644 tests/Feature/admin/catalog/DirectionTest.php

diff --git a/app/Http/Controllers/Catalog/DirectionController.php b/app/Http/Controllers/admin/Catalog/DirectionController.php
similarity index 74%
rename from app/Http/Controllers/Catalog/DirectionController.php
rename to app/Http/Controllers/admin/Catalog/DirectionController.php
index f65be02..04d314e 100644
--- a/app/Http/Controllers/Catalog/DirectionController.php
+++ b/app/Http/Controllers/admin/Catalog/DirectionController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Catalog;
+namespace App\Http\Controllers\admin\Catalog;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreDirectionRequest;
-use App\Http\Requests\UpdateDepartmentRequest;
+use App\Http\Requests\admin\Catalog\StoreDirectionRequest;
+use App\Http\Requests\admin\Catalog\UpdateDepartmentRequest;
+use App\Http\Requests\admin\Catalog\UpdateDirectionRequest;
 use App\Models\Department;
 use App\Models\Direction;
 use Illuminate\Contracts\View\Factory;
@@ -17,13 +18,13 @@ class DirectionController extends Controller
     public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $directions = Direction::all();
-        return view('catalog.direction.index', compact('directions'));
+        return view('admin.catalog.direction.index', compact('directions'));
     }
 
     public function create(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $departments = Department::pluck('name', 'id');
-        return view('catalog.direction.create', compact('departments'));
+        return view('admin.catalog.direction.create', compact('departments'));
     }
 
     public function store(StoreDirectionRequest $request): RedirectResponse
@@ -43,22 +44,23 @@ class DirectionController extends Controller
 
     public function show(Direction $direction): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
-        return view('catalog.direction.show', compact('direction'));
+        return view('admin.catalog.direction.show', compact('direction'));
     }
 
     public function edit(Direction $direction): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $departments = Department::pluck('name', 'id');
-        return view('catalog.direction.edit', compact('direction', 'departments'));
+        return view('admin.catalog.direction.edit', compact('direction', 'departments'));
     }
 
-    public function update(UpdateDepartmentRequest $request, Direction $direction): RedirectResponse
+    public function update(UpdateDirectionRequest $request, Direction $direction): RedirectResponse
     {
         $validated = $request->validated();
 
         $direction->name = $validated['name'];
         $direction->description = $validated['description'];
         $direction->position = $validated['position'];
+        $direction->slug = $validated['slug'];
         $direction->department_id = $validated['department_id'];
         $direction->save();
 
diff --git a/app/Http/Requests/Catalog/StoreDirectionRequest.php b/app/Http/Requests/admin/Catalog/StoreDirectionRequest.php
similarity index 63%
rename from app/Http/Requests/Catalog/StoreDirectionRequest.php
rename to app/Http/Requests/admin/Catalog/StoreDirectionRequest.php
index 5ddc838..16e0f91 100644
--- a/app/Http/Requests/Catalog/StoreDirectionRequest.php
+++ b/app/Http/Requests/admin/Catalog/StoreDirectionRequest.php
@@ -1,24 +1,16 @@
 <?php
 
-namespace App\Http\Requests\Catalog;
+namespace App\Http\Requests\admin\Catalog;
 
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreDirectionRequest extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     */
     public function authorize(): bool
     {
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
-     */
     public function rules(): array
     {
         return [
diff --git a/app/Http/Requests/Catalog/UpdateDirectionRequest.php b/app/Http/Requests/admin/Catalog/UpdateDirectionRequest.php
similarity index 70%
rename from app/Http/Requests/Catalog/UpdateDirectionRequest.php
rename to app/Http/Requests/admin/Catalog/UpdateDirectionRequest.php
index e95fc9f..f5db324 100644
--- a/app/Http/Requests/Catalog/UpdateDirectionRequest.php
+++ b/app/Http/Requests/admin/Catalog/UpdateDirectionRequest.php
@@ -1,31 +1,24 @@
 <?php
 
-namespace App\Http\Requests\Catalog;
+namespace App\Http\Requests\admin\Catalog;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateDirectionRequest extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     */
     public function authorize(): bool
     {
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array|string>
-     */
     public function rules(): array
     {
         return [
             'position' => 'int|max:255',
             'description' => 'string',
             'department_id' => 'int|required',
+            'slug' => 'required|string',
             'name' => [
                 'required',
                 'string',
diff --git a/app/Policies/DirectionPolicy.php b/app/Policies/DirectionPolicy.php
deleted file mode 100644
index 885ae5c..0000000
--- a/app/Policies/DirectionPolicy.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Models\Direction;
-use App\Models\User;
-use Illuminate\Auth\Access\Response;
-
-class DirectionPolicy
-{
-    /**
-     * Determine whether the user can view any models.
-     */
-    public function viewAny(User $user): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can view the model.
-     */
-    public function view(User $user, Direction $direction): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can create models.
-     */
-    public function create(User $user): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can update the model.
-     */
-    public function update(User $user, Direction $direction): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, Direction $direction): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, Direction $direction): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, Direction $direction): bool
-    {
-        //
-    }
-}
diff --git a/database/factories/DirectionFactory.php b/database/factories/DirectionFactory.php
index 1078232..18e5461 100644
--- a/database/factories/DirectionFactory.php
+++ b/database/factories/DirectionFactory.php
@@ -4,20 +4,16 @@ namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Direction>
- */
 class DirectionFactory extends Factory
 {
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
     public function definition(): array
     {
         return [
-            //
+            'name' => fake()->name(),
+            'description' => fake()->text(),
+            'slug' => fake()->slug(),
+            'position' => fake()->randomDigit(),
+            'department_id' => 1,
         ];
     }
 }
diff --git a/database/seeders/DirectionSeeder.php b/database/seeders/DirectionSeeder.php
index b6bbc3b..1b26f73 100644
--- a/database/seeders/DirectionSeeder.php
+++ b/database/seeders/DirectionSeeder.php
@@ -2,16 +2,13 @@
 
 namespace Database\Seeders;
 
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use App\Models\Direction;
 use Illuminate\Database\Seeder;
 
 class DirectionSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     */
     public function run(): void
     {
-        //
+        Direction::factory(3)->create();
     }
 }
diff --git a/resources/views/admin/catalog/department/create.blade.php b/resources/views/admin/catalog/department/create.blade.php
index b8e8623..6b963be 100644
--- a/resources/views/admin/catalog/department/create.blade.php
+++ b/resources/views/admin/catalog/department/create.blade.php
@@ -1,6 +1,5 @@
 @extends('layouts.admin-layout')
 @section('content')
-
     @auth()
         <div class="row">
             <div class="col">
diff --git a/resources/views/catalog/direction/create.blade.php b/resources/views/admin/catalog/direction/create.blade.php
similarity index 99%
rename from resources/views/catalog/direction/create.blade.php
rename to resources/views/admin/catalog/direction/create.blade.php
index 46f4a5c..5f94105 100644
--- a/resources/views/catalog/direction/create.blade.php
+++ b/resources/views/admin/catalog/direction/create.blade.php
@@ -1,6 +1,5 @@
 @extends('layouts.admin-layout')
 @section('content')
-
     @auth()
         <div class="row">
             <div class="col">
diff --git a/resources/views/catalog/direction/edit.blade.php b/resources/views/admin/catalog/direction/edit.blade.php
similarity index 85%
rename from resources/views/catalog/direction/edit.blade.php
rename to resources/views/admin/catalog/direction/edit.blade.php
index 5193984..ec4d2de 100644
--- a/resources/views/catalog/direction/edit.blade.php
+++ b/resources/views/admin/catalog/direction/edit.blade.php
@@ -53,6 +53,17 @@
                             {{ $errors->first('educational_institution_id') }}
                         @endif
                     </div>
+                    <div class="mt-3">
+                        {{ Form::label('slug', 'URL') }}
+                    </div>
+                    <div class="mt-1">
+                        {{ Form::text('slug', $direction->slug, ['class' => 'form-control']) }}
+                    </div>
+                    <div>
+                        @if ($errors->any())
+                            {{ $errors->first('slug') }}
+                        @endif
+                    </div>
                     <div class="mt-3">
                         {{ Form::submit('Изменить', ['class' => 'btn btn-primary']) }}
                     </div>
diff --git a/resources/views/catalog/direction/index.blade.php b/resources/views/admin/catalog/direction/index.blade.php
similarity index 95%
rename from resources/views/catalog/direction/index.blade.php
rename to resources/views/admin/catalog/direction/index.blade.php
index c1adf31..8067380 100644
--- a/resources/views/catalog/direction/index.blade.php
+++ b/resources/views/admin/catalog/direction/index.blade.php
@@ -13,6 +13,7 @@
                 <th scope="col">Позиция</th>
                 <th scope="col">Название</th>
                 <th scope="col">Описание</th>
+                <th scope="col">URL</th>
                 <th scope="col">Кафедра</th>
                 <th scope="col">действия</th>
                 <th scope="col"></th>
@@ -24,6 +25,7 @@
                     <th scope="row">{{ $direction->position }}</th>
                     <td><a href="{{ route('directions.show', $direction) }}">{{ $direction->name }}</a></td>
                     <td>{{ Str::words($direction->description, 10, '...') }}</td>
+                    <td>{{ $direction->slug }}</td>
                     <td>{{ $direction->department->name }}</td>
                     <td>
                         <a href="{{ route("directions.edit", $direction) }}"
@@ -39,5 +41,4 @@
         <br>
         <br>
     </div>
-
 @endsection
diff --git a/resources/views/catalog/direction/show.blade.php b/resources/views/admin/catalog/direction/show.blade.php
similarity index 100%
rename from resources/views/catalog/direction/show.blade.php
rename to resources/views/admin/catalog/direction/show.blade.php
diff --git a/tests/Feature/admin/catalog/DirectionTest.php b/tests/Feature/admin/catalog/DirectionTest.php
new file mode 100644
index 0000000..363e255
--- /dev/null
+++ b/tests/Feature/admin/catalog/DirectionTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Feature\admin\catalog;
+
+use App\Models\Department;
+use App\Models\Direction;
+use App\Models\EducationalInstitution;
+use App\Models\Faculty;
+use App\Models\User;
+use Tests\TestCase;
+
+class DirectionTest extends TestCase
+{
+    private User $user;
+    private Direction $direction;
+    private array $data;
+    protected function setUp(): void
+    {
+        parent::setUp();
+        EducationalInstitution::factory()->create();
+        Faculty::factory()->create();
+        Department::factory()->create();
+
+        $this->direction = Direction::factory()->create();
+        $this->data = Direction::factory()->make()->only([
+            'position',
+            'name',
+            'description',
+            'slug',
+            'department_id',
+        ]);
+
+        $this->user = User::factory()->create([
+            'name' => 'admin',
+            'email' => 'test@example.com',
+            'password' => 123456
+        ]);
+    }
+
+    public function testIndexDirectionsPage(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->get(route('directions.index'));
+
+        $response->assertOk();
+    }
+
+    public function testCreateDirectionPage(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->get(route('directions.create'));
+
+        $response->assertOk();
+    }
+
+    public function testStoreDirection(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->post(route('directions.store', $this->data));
+
+        $response->assertRedirect(route('directions.index'));
+
+        $this->assertDatabaseHas('directions', $this->data);
+    }
+
+    public function testShowDirectionPage(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->get(route('directions.show', $this->direction));
+
+        $response->assertOk();
+    }
+
+    public function testEditDirectionPage(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->get(route('directions.edit', $this->direction));
+
+        $response->assertOk();
+    }
+
+    public function testUpdateDirection(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->patch(route('directions.update', $this->direction), $this->data);
+
+        $response->assertRedirect(route('directions.index'));
+
+        $this->assertDatabaseHas('directions', $this->data);
+    }
+
+    public function testDestroyDirection(): void
+    {
+        $response = $this->actingAs($this->user)
+            ->withSession(['banned' => false])
+            ->delete(route('directions.destroy', $this->direction));
+
+        $response->assertRedirect(route('directions.index'));
+
+        $this->assertDatabaseMissing('directions', $this->direction->toArray());
+    }
+}