Dev/v1.2 (#4)

Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local>
Reviewed-on: #4

be/Modules/ActivityLog/Http/Controllers/ActivityLogController.php

@@ -3,17 +3,22 @@
 namespace Modules\ActivityLog\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
 use Spatie\Activitylog\Models\Activity;
 use App\Services\ActivityLogger;
 
 class ActivityLogController extends Controller
 {
+    use AuthorizesRequests;
+
     /**
      * Display a listing of the resource.
      */
     public function index(Request $request)
     {
+        $this->authorize('viewAny', Activity::class);
+
         // ActivityLogger::logView(new Activity, 'Viewed activity logs');
 
         $perPage = $request->get('per_page', 10);
@@ -27,8 +32,10 @@ class ActivityLogController extends Controller
                 $q->where('description', 'ILIKE', "%{$search}%")
                     ->orWhere('subject_type', 'ILIKE', "%{$search}%")
                     ->orWhere('event', 'ILIKE', "%{$search}%")
-                    ->orWhere('causer.name', 'ILIKE', "%{$search}%")
-                    ->orWhere('causer.email', 'ILIKE', "%{$search}%");
+                    ->orWhereHas('causer', function ($causerQuery) use ($search) {
+                        $causerQuery->where('name', 'ILIKE', "%{$search}%")
+                            ->orWhere('email', 'ILIKE', "%{$search}%");
+                    });
             });
         }
 

be/Modules/ActivityLog/Providers/ActivityLogServiceProvider.php

@@ -3,7 +3,10 @@
 namespace Modules\ActivityLog\Providers;
 
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
+use Modules\ActivityLog\Policies\ActivityLogPolicy;
+use Spatie\Activitylog\Models\Activity;
 use Nwidart\Modules\Traits\PathNamespace;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -21,6 +24,8 @@ class ActivityLogServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        Gate::policy(Activity::class, ActivityLogPolicy::class);
+
         $this->registerCommands();
         $this->registerCommandSchedules();
         $this->registerTranslations();