From 27611a38cdad5d71862da2159da1fdf213b59361 Mon Sep 17 00:00:00 2001
From: bernardhanna <bernard@matrixinternet.ie>
Date: Fri, 14 Mar 2025 09:29:09 +0000
Subject: [PATCH] Update ExcellenceController and ReportableEventsQuery

---
 app/Http/Controllers/ExcellenceController.php | 25 ++++++-------------
 app/Queries/ReportableEventsQuery.php         | 13 +++++++---
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/ExcellenceController.php b/app/Http/Controllers/ExcellenceController.php
index 5d025ad75..67febbf4e 100644
--- a/app/Http/Controllers/ExcellenceController.php
+++ b/app/Http/Controllers/ExcellenceController.php
@@ -1,11 +1,17 @@
 <?php
 
+/**
+ * @Author: Bernard Hanna
+ * @Date:   2025-01-29 14:25:28
+ * @Last Modified by:   Bernard Hanna
+ * @Last Modified time: 2025-03-13 17:52:44
+ */
+
 namespace App\Http\Controllers;
 
 use App\CertificateExcellence;
 use App\Excellence;
 use App\Queries\ExcellenceQuery;
-use Gate;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
@@ -14,27 +20,11 @@ class ExcellenceController extends Controller
 {
     public function report($edition): View
     {
-
-        // Check if user is a winner for this edition
-        if (Gate::denies('report-excellence', $edition)) {
-            // The current user can't report for excellence...
-            abort(403, 'You are not eligible to receive a Codeweek4All Excellence Certificate.');
-
-        }
-
         return view('excellence.report', compact('edition'));
-
     }
 
     public function generate($edition, Request $request): RedirectResponse
     {
-
-        if (Gate::denies('report-excellence', $edition)) {
-            // The current user can't report for excellence...
-            abort(403, 'You are not eligible to receive a Codeweek4All Excellence Certificate.');
-
-        }
-
         $rules = [
             'name_for_certificate' => 'required|max:40|regex:/^[^ə]*$/u',
         ];
@@ -56,6 +46,5 @@ public function generate($edition, Request $request): RedirectResponse
             ]);
 
         return redirect('certificates');
-
     }
 }
diff --git a/app/Queries/ReportableEventsQuery.php b/app/Queries/ReportableEventsQuery.php
index 89c2cbe9e..4685a87d5 100644
--- a/app/Queries/ReportableEventsQuery.php
+++ b/app/Queries/ReportableEventsQuery.php
@@ -1,4 +1,13 @@
 <?php
+
+/**
+ * @Author: Bernard Hanna
+ * @Date:   2025-01-29 14:25:28
+ * @Last Modified by:   Bernard Hanna
+ * @Last Modified time: 2025-03-12 17:57:08
+ */
+
+
 /**
  * Created by PhpStorm.
  * User: doris
@@ -25,7 +34,6 @@ public static function reportable()
             })
             ->where('start_date', '<=', Carbon::now())
             ->orderBy('end_date', 'desc')->paginate(20);
-
     }
 
     public static function reported()
@@ -33,9 +41,8 @@ public static function reported()
 
         return Event::where('status', 'APPROVED')
             ->where('creator_id', '=', Auth::user()->id)
-            ->where('reported_at', '<>', null)
+            ->whereNotNull('reported_at')
             ->where('start_date', '<=', Carbon::now())
             ->orderBy('created_at', 'desc')->paginate(20);
-
     }
 }