From 35104455c26b783c3ca1b44e86c2062252467353 Mon Sep 17 00:00:00 2001
From: aslan <aslan@aslan.ru>
Date: Mon, 12 Feb 2024 09:19:08 +0300
Subject: [PATCH] refactoring Department resource

---
 .../Catalog/DepartmentController.php          | 16 +++--
 .../Catalog/StoreDepartmentRequest.php        |  5 +-
 .../Catalog/UpdateDepartmentRequest.php       | 14 +---
 app/Models/Department.php                     |  1 +
 app/Policies/DepartmentPolicy.php             | 66 -------------------
 database/factories/DepartmentFactory.php      | 16 ++---
 ..._02_08_074258_create_departments_table.php |  3 +-
 database/seeders/DepartmentSeeder.php         |  2 +
 .../catalog/department/edit.blade.php         |  0
 .../catalog/department/index.blade.php        |  2 +
 .../catalog/department/show.blade.php         | 20 ++----
 routes/admin.php                              | 26 ++++----
 12 files changed, 49 insertions(+), 122 deletions(-)
 rename app/Http/Controllers/{ => admin}/Catalog/DepartmentController.php (76%)
 rename app/Http/Requests/{ => admin}/Catalog/StoreDepartmentRequest.php (84%)
 rename app/Http/Requests/{ => admin}/Catalog/UpdateDepartmentRequest.php (65%)
 delete mode 100644 app/Policies/DepartmentPolicy.php
 rename resources/views/{ => admin}/catalog/department/edit.blade.php (100%)
 rename resources/views/{ => admin}/catalog/department/index.blade.php (95%)
 rename resources/views/{ => admin}/catalog/department/show.blade.php (50%)

diff --git a/app/Http/Controllers/Catalog/DepartmentController.php b/app/Http/Controllers/admin/Catalog/DepartmentController.php
similarity index 76%
rename from app/Http/Controllers/Catalog/DepartmentController.php
rename to app/Http/Controllers/admin/Catalog/DepartmentController.php
index c50c8bb..529c855 100644
--- a/app/Http/Controllers/Catalog/DepartmentController.php
+++ b/app/Http/Controllers/admin/Catalog/DepartmentController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Catalog;
+namespace App\Http\Controllers\admin\Catalog;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreDepartmentRequest;
-use App\Http\Requests\UpdateDepartmentRequest;
+use App\Http\Requests\admin\Catalog\StoreDepartmentRequest;
+use App\Http\Requests\admin\Catalog\UpdateDepartmentRequest;
 use App\Models\Department;
 use App\Models\Faculty;
 use Illuminate\Contracts\View\Factory;
@@ -17,13 +17,13 @@ class DepartmentController extends Controller
     public function index(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $departments = Department::all();
-        return view('catalog.department.index', compact('departments'));
+        return view('admin.catalog.department.index', compact('departments'));
     }
 
     public function create(): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $faculties = Faculty::pluck('name', 'id');
-        return view('catalog.department.create', compact('faculties'));
+        return view('admin.catalog.department.create', compact('faculties'));
     }
 
     public function store(StoreDepartmentRequest $request): RedirectResponse
@@ -42,13 +42,15 @@ class DepartmentController extends Controller
 
     public function show(Department $department): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
-        return view('catalog.department.show', compact('department'));
+        $faculty = Faculty::find($department->faculty->id);
+        $educationalInstitution = $faculty->educationalInstitution;
+        return view('admin.catalog.department.show', compact('department', 'faculty', 'educationalInstitution'));
     }
 
     public function edit(Department $department): View|Application|Factory|\Illuminate\Contracts\Foundation\Application
     {
         $faculties = Faculty::pluck('name', 'id');
-        return view('catalog.department.edit', compact('department', 'faculties'));
+        return view('admin.catalog.department.edit', compact('department', 'faculties'));
     }
 
     public function update(UpdateDepartmentRequest $request, Department $department): RedirectResponse
diff --git a/app/Http/Requests/Catalog/StoreDepartmentRequest.php b/app/Http/Requests/admin/Catalog/StoreDepartmentRequest.php
similarity index 84%
rename from app/Http/Requests/Catalog/StoreDepartmentRequest.php
rename to app/Http/Requests/admin/Catalog/StoreDepartmentRequest.php
index c255d54..2383243 100644
--- a/app/Http/Requests/Catalog/StoreDepartmentRequest.php
+++ b/app/Http/Requests/admin/Catalog/StoreDepartmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Catalog;
+namespace App\Http\Requests\admin\Catalog;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
@@ -26,7 +26,8 @@ class StoreDepartmentRequest extends FormRequest
             'position' => 'required|int|max:255',
             'name' => 'required|string|max:255|unique:educational_institutions,name',
             'description' => 'string',
-            'faculty_id' => 'required|int'
+            'slug' => 'required|string',
+            'faculty_id' => 'required|int',
         ];
     }
 }
diff --git a/app/Http/Requests/Catalog/UpdateDepartmentRequest.php b/app/Http/Requests/admin/Catalog/UpdateDepartmentRequest.php
similarity index 65%
rename from app/Http/Requests/Catalog/UpdateDepartmentRequest.php
rename to app/Http/Requests/admin/Catalog/UpdateDepartmentRequest.php
index 253059a..df0e43c 100644
--- a/app/Http/Requests/Catalog/UpdateDepartmentRequest.php
+++ b/app/Http/Requests/admin/Catalog/UpdateDepartmentRequest.php
@@ -1,30 +1,22 @@
 <?php
 
-namespace App\Http\Requests\Catalog;
+namespace App\Http\Requests\admin\Catalog;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateDepartmentRequest 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<mixed>|string>
-     */
     public function rules(): array
     {
         return [
-            'position' => 'int|max:255',
+            'position' => 'required|int|max:255',
             'description' => 'string',
+            'slug' => 'string|required',
             'faculty_id' => 'int|required',
             'name' => [
                 'required',
diff --git a/app/Models/Department.php b/app/Models/Department.php
index 2e32ed4..91517cb 100644
--- a/app/Models/Department.php
+++ b/app/Models/Department.php
@@ -14,6 +14,7 @@ class Department extends Model
     protected $fillable = [
         'id',
         'name',
+        'slug',
         'description',
         'position',
     ];
diff --git a/app/Policies/DepartmentPolicy.php b/app/Policies/DepartmentPolicy.php
deleted file mode 100644
index e60adbd..0000000
--- a/app/Policies/DepartmentPolicy.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Models\Department;
-use App\Models\User;
-use Illuminate\Auth\Access\Response;
-
-class DepartmentPolicy
-{
-    /**
-     * 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, Department $department): 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, Department $department): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can delete the model.
-     */
-    public function delete(User $user, Department $department): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can restore the model.
-     */
-    public function restore(User $user, Department $department): bool
-    {
-        //
-    }
-
-    /**
-     * Determine whether the user can permanently delete the model.
-     */
-    public function forceDelete(User $user, Department $department): bool
-    {
-        //
-    }
-}
diff --git a/database/factories/DepartmentFactory.php b/database/factories/DepartmentFactory.php
index 78b3686..a337b42 100644
--- a/database/factories/DepartmentFactory.php
+++ b/database/factories/DepartmentFactory.php
@@ -3,21 +3,19 @@
 namespace Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Department>
- */
 class DepartmentFactory 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()->randomNumber(),
+            'faculty_id' => fake()->realTextBetween(1,5,1),
         ];
     }
 }
diff --git a/database/migrations/2024_02_08_074258_create_departments_table.php b/database/migrations/2024_02_08_074258_create_departments_table.php
index ab751c8..1850030 100644
--- a/database/migrations/2024_02_08_074258_create_departments_table.php
+++ b/database/migrations/2024_02_08_074258_create_departments_table.php
@@ -14,8 +14,9 @@ return new class extends Migration
         Schema::create('departments', function (Blueprint $table) {
             $table->id();
             $table->string('name');
-            $table->string('description');
+            $table->text('description');
             $table->integer('position');
+            $table->string('slug');
             $table->foreignId('faculty_id')->constrained('faculties');
             $table->timestamps();
         });
diff --git a/database/seeders/DepartmentSeeder.php b/database/seeders/DepartmentSeeder.php
index ce35944..281fa0b 100644
--- a/database/seeders/DepartmentSeeder.php
+++ b/database/seeders/DepartmentSeeder.php
@@ -20,12 +20,14 @@ class DepartmentSeeder extends Seeder
                 'name' => 'Кафедра инф. без.',
                 'description' => 'Кафедра инф. без. описание',
                 'position' => 1,
+                'slug' => 'departmentInfWithout',
                 'faculty_id' => 1,
             ],
             [
                 'name' => 'кафедра стоматологии',
                 'description' => 'кафедра стоматологии описание',
                 'position' => 2,
+                'slug' => 'departmentOfDentistry',
                 'faculty_id' => 2,
             ],
         ]);
diff --git a/resources/views/catalog/department/edit.blade.php b/resources/views/admin/catalog/department/edit.blade.php
similarity index 100%
rename from resources/views/catalog/department/edit.blade.php
rename to resources/views/admin/catalog/department/edit.blade.php
diff --git a/resources/views/catalog/department/index.blade.php b/resources/views/admin/catalog/department/index.blade.php
similarity index 95%
rename from resources/views/catalog/department/index.blade.php
rename to resources/views/admin/catalog/department/index.blade.php
index b97cf3d..8d1d651 100644
--- a/resources/views/catalog/department/index.blade.php
+++ b/resources/views/admin/catalog/department/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">{{ $department->position }}</th>
                     <td><a href="{{ route('departments.show', $department) }}">{{ $department->name }}</a></td>
                     <td>{{ Str::words($department->description, 10, '...') }}</td>
+                    <td>{{ $department->slug }}</td>
                     <td>{{ $department->faculty->name }}</td>
                     <td>
                         <a href="{{ route("departments.edit", $department) }}"
diff --git a/resources/views/catalog/department/show.blade.php b/resources/views/admin/catalog/department/show.blade.php
similarity index 50%
rename from resources/views/catalog/department/show.blade.php
rename to resources/views/admin/catalog/department/show.blade.php
index 18b9a8c..513e5dd 100644
--- a/resources/views/catalog/department/show.blade.php
+++ b/resources/views/admin/catalog/department/show.blade.php
@@ -1,17 +1,9 @@
-@php
-    use App\Models\Department;
-    use App\Models\Faculty;
-    use Illuminate\Support\Collection;
-    /** @var Collection|Department[] $department */
-
-    $faculty = Faculty::find($department->faculty->id)
-@endphp
 @extends('layouts.admin-layout')
 @section('content')
     @auth()
         <h6>
-            <a href="{{ route('educational-institutions.show', $faculty->educationalInstitution) }}">
-                {{ $faculty->educationalInstitution->name }}
+            <a href="{{ route('educational-institutions.show', $educationalInstitution) }}">
+                {{ $educationalInstitution->name }}
             </a>-> <a href="{{ route('faculties.show', $faculty) }}">{{ $faculty->name }}</a>
             -> {{ $department->name }}
         </h6>
@@ -22,10 +14,10 @@
             <p>{{ $department->description }}</p>
             <h2>Позиция</h2>
             <p>{{ $department->position }}</p>
-            {{--            <h2>Факультеты</h2>--}}
-            {{--            @foreach($department->faculties as $faculty)--}}
-            {{--                <p><a href="{{ route('faculties.show', $faculty) }}">{{ $faculty->name }}</a></p>--}}
-            {{--            @endforeach--}}
+            <h2>Направления подготовки</h2>
+            @foreach($department->directions as $direction)
+                <p><a href="{{ route('faculties.show', $direction) }}">{{ $direction->name }}</a></p>
+            @endforeach
         </div>
     @endauth
 @endsection
diff --git a/routes/admin.php b/routes/admin.php
index 70bdf4a..c4071b6 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -1,31 +1,33 @@
 <?php
 
-use App\Http\Controllers\Catalog\DepartmentController;
-use App\Http\Controllers\Catalog\DirectionController;
-use App\Http\Controllers\Catalog\EducationalInstitutionController;
-use App\Http\Controllers\Catalog\FacultyController;
-use App\Http\Controllers\DocumentController;
-use App\Http\Controllers\ReceptionScreenController;
-use App\Http\Controllers\UserController;
+use App\Http\Controllers\admin\Catalog\DepartmentController;
+use App\Http\Controllers\admin\Catalog\DirectionController;
+use App\Http\Controllers\admin\Catalog\EducationalInstitutionController;
+use App\Http\Controllers\admin\Catalog\FacultyController;
+use App\Http\Controllers\admin\DocumentController;
+use App\Http\Controllers\admin\ReceptionScreenController;
+use App\Http\Controllers\admin\UserController;
 
 Route::middleware(['auth', 'verified'])->prefix('admin')->group(function () {
     Route::get('/dashboard', function () {
         return view('admin');
     })->name('dashboard');
 
-    Route::get('/files/create/{document?}', [DocumentController::class, 'create'])->name('document_create');
-    Route::get('/files/download/{Document}', [DocumentController::class, 'download'])->name('document.download');
+    Route::get('/documents/create/{document?}', [DocumentController::class, 'create'])->name('documents_create');
+    Route::get('/documents/download/{Document}', [DocumentController::class, 'download'])->name('documents_download');
 
     Route::resource('/educational-institutions', EducationalInstitutionController::class)
         ->scoped(['educational_institution' => 'slug']);
     Route::resource('/directions', DirectionController::class)
-        ->scoped(['educational_institution' => 'slug']);
+        ->scoped(['directions' => 'slug']);
+
+    Route::resource('/departments', DepartmentController::class)
+        ->scoped(['department' => 'slug']);
 
     Route::resources([
-        '/files' => DocumentController::class,
+        '/documents' => DocumentController::class,
         '/users' => UserController::class,
         '/admin-reception-screen' => ReceptionScreenController::class,
         '/faculties' => FacultyController::class,
-        '/departments' => DepartmentController::class,
     ]);
 });