Fix Permission issue and Code improvement

Author: AHS12

app/Http/Controllers/Api/V1/Auth/PermissionController.php

@@ -28,7 +28,7 @@ public function __construct(
      */
     public function index()
     {
-        Gate::authorize('viewAny', Permission::class);
+        // Gate::authorize('viewAny', Permission::class);
         $permissions = Permission::all();
         return $this->sendSuccessCollectionResponse(
             PermissionResource::collection($permissions),

app/Http/Controllers/Controller.php

@@ -24,9 +24,9 @@ class Controller extends BaseController
     public function sendSuccessResponse($result = [], $message = '', $code = Response::HTTP_OK)
     {
         $response = [
-            'data'      => $result,
-            'success'   => true,
-            'message'   => $message,
+            'data' => $result,
+            'success' => true,
+            'message' => $message,
         ];
         if (empty($result)) {
             unset($response['data']);
@@ -46,9 +46,9 @@ public function sendSuccessResponse($result = [], $message = '', $code = Respons
     public function sendSuccessCollectionResponse($collection, $message, $code = Response::HTTP_OK)
     {
         $response = [
-            'data'      => $collection,
-            'success'   => true,
-            'message'   => $message,
+            'data' => $collection,
+            'success' => true,
+            'message' => $message,
         ];
 
         return new JsonResponse($response, $code);
@@ -155,6 +155,32 @@ public function applySelectFilters(
         });
     }
 
+    /**
+     * Apply Select filters to a model relation.
+     *
+     * @param string               $relation     The relation to filter within.
+     * @param Builder              $model        The model to search on.
+     * @param array<string, mixed> $selectFields The fields to search in.
+     *
+     * @return Builder The filtered model.
+     */
+    public function applyRelationSelectFilters(
+        string $relation,
+        Builder $model,
+        array $selectFields
+    ): Builder {
+        $selectFields = array_filter($selectFields, function ($value) {
+            return !is_null($value) && $value !== '';
+        });
+        return $model->whereHas($relation, function (Builder $query) use ($selectFields) {
+            $query->where(function ($query) use ($selectFields) {
+                foreach ($selectFields as $field => $value) {
+                    $query->orWhere($field, '=', $value);
+                }
+            });
+        });
+    }
+
     /**
      * Apply Filters to a model.
      *
@@ -170,21 +196,14 @@ public function applyFilters(
         array $searchFields,
         array $selectFields,
         Builder $model,
-        ?string $relation = null,
     ): Builder {
-
         if ($searchText && !empty($searchFields)) {
-            if($relation) {
-                $model = $this->applyRelationSearchFilters($relation, $searchText, $searchFields, $model);
-            } else {
-                $model = $this->applySearchFilters($searchText, $model, $searchFields);
-            }
+            $model = $this->applySearchFilters($searchText, $model, $searchFields);
         }
 
         if (!empty($selectFields)) {
-            return $this->applySelectFilters($model, $selectFields);
+            $model = $this->applySelectFilters($model, $selectFields);
         }
-
         return $model;
     }
 }

tests/Pest.php

@@ -1,5 +1,6 @@
 <?php
 use App\Enums\UserRole;
+use App\Enums\UserRoleID;
 use App\Models\User;
 
 /*
@@ -62,7 +63,10 @@ function generateUser()
 
 function generateSuperAdmin()
 {
+    DB::table('users')->where('id', '=', UserRoleID::SUPER_ADMIN_ID->value)->delete();
     $user = User::factory()->create();
+    $user->id = UserRoleID::SUPER_ADMIN_ID->value;
+    $user->save();
     $user->assignRole(UserRole::SUPER_ADMIN);
     return $user;
 }
@@ -98,7 +102,10 @@ function generateAdminUserAndAuthToken()
 
 function generateSuperAdminUserAndAuthToken()
 {
+    DB::table('users')->where('id', '=', UserRoleID::SUPER_ADMIN_ID->value)->delete();
     $user = User::factory()->create();
+    $user->id = UserRoleID::SUPER_ADMIN_ID->value;
+    $user->save();
     $user->assignRole(UserRole::SUPER_ADMIN);
     $token = $user->createToken('test')->plainTextToken;
     return [