Feature/94 (#28)

* #94 - permissions renamed * #94 - permissions category_list, category_list Co-authored-by: KD <do> Co-authored-by: krz <[email protected]>
EscolaLMS · Jan 18, 2022 · a19fe7e · a19fe7e
1 parent 1693be4
commit a19fe7e
Show file tree

Hide file tree

Showing 11 changed files with 173 additions and 40 deletions.
diff --git a/database/seeders/CategoriesPermissionSeeder.php b/database/seeders/CategoriesPermissionSeeder.php
@@ -20,11 +20,15 @@ public function run()
  }
 
  $admin->givePermissionTo([
+ CategoriesPermissionsEnum::CATEGORY_LIST,
+ CategoriesPermissionsEnum::CATEGORY_READ,
  CategoriesPermissionsEnum::CATEGORY_CREATE,
  CategoriesPermissionsEnum::CATEGORY_DELETE,
  CategoriesPermissionsEnum::CATEGORY_UPDATE,
  ]);
  $tutor->givePermissionTo([
+ CategoriesPermissionsEnum::CATEGORY_LIST,
+ CategoriesPermissionsEnum::CATEGORY_READ,
  CategoriesPermissionsEnum::CATEGORY_CREATE,
  CategoriesPermissionsEnum::CATEGORY_DELETE,
  CategoriesPermissionsEnum::CATEGORY_UPDATE,

diff --git a/src/Enums/CategoriesPermissionsEnum.php b/src/Enums/CategoriesPermissionsEnum.php
@@ -6,6 +6,8 @@
 
 class CategoriesPermissionsEnum extends BasicEnum
 {
+ const CATEGORY_LIST = 'category_list';
+ const CATEGORY_READ = 'category_list';
  const CATEGORY_UPDATE = 'category_update';
  const CATEGORY_CREATE = 'category_create';
  const CATEGORY_DELETE = 'category_delete';

diff --git a/src/Http/Controllers/CategoryAPIController.php b/src/Http/Controllers/CategoryAPIController.php
@@ -5,6 +5,8 @@
 use EscolaLms\Categories\Dtos\CategoryCreateDto;
 use EscolaLms\Categories\Http\Requests\CategoryCreateRequest;
 use EscolaLms\Categories\Http\Requests\CategoryDeleteRequest;
+use EscolaLms\Categories\Http\Requests\CategoryListRequest;
+use EscolaLms\Categories\Http\Requests\CategoryReadRequest;
 use EscolaLms\Categories\Http\Requests\CategoryUpdateRequest;
 use EscolaLms\Categories\Http\Resources\CategoryResource;
 use EscolaLms\Categories\Http\Resources\CategoryTreeResource;
@@ -28,10 +30,10 @@ public function __construct(CategoriesRepositoryContract $categoryRepository, Ca
  }
 
  /**
- * @param Request $request
+ * @param CategoryListRequest $request
  * @return JsonResponse
  */
- public function index(Request $request): JsonResponse
+ public function index(CategoryListRequest $request): JsonResponse
  {
  $categories = $this->categoryRepository->all(
  $request->except(['skip', 'limit']),
@@ -43,10 +45,10 @@ public function index(Request $request): JsonResponse
  }
 
  /**
- * @param Request $request
+ * @param CategoryListRequest $request
  * @return JsonResponse
  */
- public function tree(Request $request): JsonResponse
+ public function tree(CategoryListRequest $request): JsonResponse
  {
  $categories = $this->categoryRepository->allRoots(
  $request->except(['skip', 'limit']),
@@ -61,7 +63,7 @@ public function tree(Request $request): JsonResponse
  * @param int $id
  * @return JsonResponse
  */
- public function show(int $id): JsonResponse
+ public function show(int $id, CategoryReadRequest $categoryReadRequest): JsonResponse
  {
  $category = $this->categoryRepository->find($id);
 

diff --git a/src/Http/Controllers/Swagger/CategorySwagger.php b/src/Http/Controllers/Swagger/CategorySwagger.php
@@ -4,6 +4,8 @@
 
 use EscolaLms\Categories\Http\Requests\CategoryCreateRequest;
 use EscolaLms\Categories\Http\Requests\CategoryDeleteRequest;
+use EscolaLms\Categories\Http\Requests\CategoryListRequest;
+use EscolaLms\Categories\Http\Requests\CategoryReadRequest;
 use EscolaLms\Categories\Http\Requests\CategoryUpdateRequest;
 use EscolaLms\Categories\Models\Category;
 use Illuminate\Http\JsonResponse;
@@ -32,7 +34,7 @@ interface CategorySwagger
  * )
  * )
  */
- public function index(Request $request): JsonResponse;
+ public function index(CategoryListRequest $request): JsonResponse;
 
  /**
  * @OA\Get(
@@ -55,7 +57,7 @@ public function index(Request $request): JsonResponse;
  * )
  * )
  */
- public function tree(Request $request): JsonResponse;
+ public function tree(CategoryListRequest $request): JsonResponse;
 
  /**
  * @OA\Get(
@@ -86,7 +88,7 @@ public function tree(Request $request): JsonResponse;
  * )
  * )
  */
- public function show(int $id): JsonResponse;
+ public function show(int $id, CategoryReadRequest $categoryReadRequest): JsonResponse;
 
  /**
  * @OA\Post(

diff --git a/src/Http/Requests/CategoryCreateRequest.php b/src/Http/Requests/CategoryCreateRequest.php
@@ -7,7 +7,7 @@
 
 class CategoryCreateRequest extends FormRequest
 {
- public function authorize()
+ public function authorize(): bool
  {
  $user = auth()->user();
  return isset($user) ? $user->can('create', Category::class) : false;
@@ -18,7 +18,7 @@ public function authorize()
  *
  * @return array
  */
- public function rules()
+ public function rules(): array
  {
  return [
  'name' => ['required', 'string', 'max:255']

diff --git a/src/Http/Requests/CategoryDeleteRequest.php b/src/Http/Requests/CategoryDeleteRequest.php
@@ -7,7 +7,7 @@
 
 class CategoryDeleteRequest extends FormRequest
 {
- public function authorize()
+ public function authorize(): bool
  {
  $user = auth()->user();
  $category = Category::find($this->route('category'));
@@ -19,7 +19,7 @@ public function authorize()
  *
  * @return array
  */
- public function rules()
+ public function rules(): array
  {
  return [];
  }

diff --git a/src/Http/Requests/CategoryListRequest.php b/src/Http/Requests/CategoryListRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace EscolaLms\Categories\Http\Requests;
+
+use EscolaLms\Categories\Models\Category;
+use Illuminate\Foundation\Http\FormRequest;
+
+class CategoryListRequest extends FormRequest
+{
+ public function authorize(): bool
+ {
+ $user = auth()->user();
+ return isset($user) ? $user->can('list', Category::class) : false;
+ }
+
+ /**
+ * Get the validation rules that apply to the request.
+ *
+ * @return array
+ */
+ public function rules(): array
+ {
+ return [];
+ }
+}
diff --git a/src/Http/Requests/CategoryReadRequest.php b/src/Http/Requests/CategoryReadRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace EscolaLms\Categories\Http\Requests;
+
+use EscolaLms\Categories\Models\Category;
+use Illuminate\Foundation\Http\FormRequest;
+
+class CategoryReadRequest extends FormRequest
+{
+ public function authorize(): bool
+ {
+ $user = auth()->user();
+ return isset($user) ? $user->can('read', Category::class) : false;
+ }
+
+ /**
+ * Get the validation rules that apply to the request.
+ *
+ * @return array
+ */
+ public function rules(): array
+ {
+ return [];
+ }
+}
diff --git a/src/Http/Requests/CategoryUpdateRequest.php b/src/Http/Requests/CategoryUpdateRequest.php
@@ -7,7 +7,7 @@
 
 class CategoryUpdateRequest extends FormRequest
 {
- public function authorize()
+ public function authorize(): bool
  {
  $user = auth()->user();
  $category = Category::find($this->route('category'));
@@ -19,10 +19,8 @@ public function authorize()
  *
  * @return array
  */
- public function rules()
+ public function rules(): array
  {
- return [
-
- ];
+ return [];
  }
 }
diff --git a/src/Policies/CategoryPolicy.php b/src/Policies/CategoryPolicy.php
@@ -12,12 +12,22 @@ class CategoryPolicy
 {
  use HandlesAuthorization;
 
+ public function list(User $user): bool
+ {
+ return $user->can(CategoriesPermissionsEnum::CATEGORY_LIST);
+ }
+
+ public function read(User $user): bool
+ {
+ return $user->can(CategoriesPermissionsEnum::CATEGORY_READ);
+ }
+
  /**
  * @param User $user
  * @param Category $category
  * @return bool
  */
- public function update(User $user, Category $category)
+ public function update(User $user, Category $category): bool
  {
  return $user->can(CategoriesPermissionsEnum::CATEGORY_UPDATE);
  }
@@ -26,7 +36,7 @@ public function update(User $user, Category $category)
  * @param User $user
  * @return bool
  */
- public function create(User $user)
+ public function create(User $user): bool
  {
  return $user->can(CategoriesPermissionsEnum::CATEGORY_CREATE);
  }
@@ -36,7 +46,7 @@ public function create(User $user)
  * @param Category $category
  * @return bool
  */
- public function delete(User $user, Category $category)
+ public function delete(User $user, Category $category): bool
  {
  return $user->can(CategoriesPermissionsEnum::CATEGORY_DELETE);
  }