Merge pull request #3449 from codeeu/dev

bernardhanna · web-flow · commit c46d1d482f25 · 2026-03-13T12:02:07.000Z
200203 cert edit
diff --git a/app/Console/Commands/CertificateReassignUser.php b/app/Console/Commands/CertificateReassignUser.php
@@ -10,6 +10,7 @@ class CertificateReassignUser extends Command
 {
     protected $signature = 'certificate:reassign-user
                             {--from-email= : Current account email (certificates will be moved FROM this user)}
+                            {--from-user-id= : Alternatively, source user ID (use when the from user no longer exists by email)}
                             {--to-email= : Target account email (certificates will be moved TO this user)}
                             {--dry-run : List what would be moved, do not update}';
 
@@ -18,39 +19,58 @@ class CertificateReassignUser extends Command
     public function handle(): int
     {
         $fromEmail = trim((string) $this->option('from-email'));
+        $fromUserId = $this->option('from-user-id');
         $toEmail = trim((string) $this->option('to-email'));
         $dryRun = (bool) $this->option('dry-run');
 
-        if ($fromEmail === '' || $toEmail === '') {
-            $this->error('Provide both --from-email and --to-email.');
+        if ($toEmail === '') {
+            $this->error('Provide --to-email (target account).');
             return self::FAILURE;
         }
-
-        if (strtolower($fromEmail) === strtolower($toEmail)) {
-            $this->error('From and to email must be different.');
+        if ($fromEmail === '' && ($fromUserId === null || $fromUserId === '')) {
+            $this->error('Provide either --from-email or --from-user-id (source of certificates).');
             return self::FAILURE;
         }
 
-        $fromUser = User::where('email', $fromEmail)->first();
-        $toUser = User::where('email', $toEmail)->first();
+        $fromUser = null;
+        $fromLabel = '';
+        if ($fromUserId !== null && $fromUserId !== '') {
+            $fromUser = User::find((int) $fromUserId);
+            $fromLabel = 'user_id ' . (int) $fromUserId;
+        } else {
+            $fromUser = User::where('email', $fromEmail)->first();
+            $fromLabel = $fromEmail;
+        }
 
         if (! $fromUser) {
-            $this->error("User not found: {$fromEmail}");
+            $this->error('Source user not found: ' . ($fromLabel ?: $fromEmail));
+            return self::FAILURE;
+        }
+
+        if ($fromEmail !== '' && strtolower($fromUser->email) === strtolower($toEmail)) {
+            $this->error('From and to must be different.');
             return self::FAILURE;
         }
+
+        $toUser = User::where('email', $toEmail)->first();
         if (! $toUser) {
             $this->error("User not found: {$toEmail}");
             return self::FAILURE;
         }
 
+        if ($fromUser->id === $toUser->id) {
+            $this->error('From and to user are the same. Nothing to do.');
+            return self::FAILURE;
+        }
+
         $rows = Excellence::where('user_id', $fromUser->id)->orderBy('edition')->orderBy('type')->get();
 
         if ($rows->isEmpty()) {
-            $this->info("No certificate rows found for {$fromEmail} (user_id {$fromUser->id}). Nothing to move.");
+            $this->info("No certificate rows found for {$fromLabel} (user_id {$fromUser->id}). Nothing to move.");
             return self::SUCCESS;
         }
 
-        $this->info("Found {$rows->count()} certificate row(s) for {$fromEmail} (user_id {$fromUser->id}).");
+        $this->info("Found {$rows->count()} certificate row(s) for {$fromLabel} (user_id {$fromUser->id}).");
         $this->info("Target: {$toEmail} (user_id {$toUser->id}).");
         $this->newLine();
 
@@ -63,6 +83,27 @@ public function handle(): int
         ])->toArray();
         $this->table(['id', 'edition', 'type', 'has PDF', 'sent'], $table);
 
+        // Check first: target must not already have an excellence for the same edition+type (unique constraint)
+        $conflicts = [];
+        foreach ($rows as $e) {
+            $exists = Excellence::where('user_id', $toUser->id)
+                ->where('edition', $e->edition)
+                ->where('type', $e->type)
+                ->exists();
+            if ($exists) {
+                $conflicts[] = "edition {$e->edition}, type {$e->type}";
+            }
+        }
+        if (count($conflicts) > 0) {
+            $this->newLine();
+            $this->error('Cannot reassign: target user already has certificate(s) for the same edition+type:');
+            foreach ($conflicts as $c) {
+                $this->line('  - ' . $c);
+            }
+            $this->line('Resolve duplicates (e.g. merge or delete one side) before reassigning.');
+            return self::FAILURE;
+        }
+
         if ($dryRun) {
             $this->newLine();
             $this->warn('Dry run: no changes made. Run without --dry-run to reassign.');
diff --git a/app/Console/Commands/CertificateRegenerateInPlace.php b/app/Console/Commands/CertificateRegenerateInPlace.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\CertificateExcellence;
+use App\Excellence;
+use App\User;
+use Illuminate\Console\Command;
+
+/**
+ * Regenerate a single certificate PDF and overwrite the existing file on S3
+ * so the same URL serves the corrected PDF. No email sent; user does not need to notice.
+ *
+ * Use when the PDF shows the wrong year (e.g. 2024 instead of 2023) and you want
+ * to fix it without changing the link or notifying the recipient.
+ */
+class CertificateRegenerateInPlace extends Command
+{
+    protected $signature = 'certificate:regenerate-in-place
+                            {--email= : User email (certificate owner)}
+                            {--certificate-url= : Exact certificate URL to replace (if user has multiple certs)}
+                            {--edition= : Year to show on the certificate (e.g. 2023); default: use value from DB}
+                            {--dry-run : Show what would be done, do not regenerate}';
+
+    protected $description = 'Regenerate one certificate PDF in place (same URL); no email sent. Use to fix wrong year or content.';
+
+    public function handle(): int
+    {
+        $email = trim((string) $this->option('email'));
+        $certificateUrl = trim((string) $this->option('certificate-url'));
+        $editionOverride = $this->option('edition');
+        $dryRun = (bool) $this->option('dry-run');
+
+        if ($email === '') {
+            $this->error('Provide --email (certificate owner).');
+            return self::FAILURE;
+        }
+
+        $user = User::where('email', $email)->first();
+        if (! $user) {
+            $this->error("User not found: {$email}");
+            return self::FAILURE;
+        }
+
+        $excellence = null;
+        if ($certificateUrl !== '') {
+            $excellence = Excellence::where('user_id', $user->id)
+                ->where(function ($q) use ($certificateUrl) {
+                    $q->where('certificate_url', $certificateUrl)
+                        ->orWhere('certificate_url', 'like', '%' . basename(parse_url($certificateUrl, PHP_URL_PATH)) . '%');
+                })
+                ->first();
+            if (! $excellence) {
+                $this->error('No excellence record found for this user with that certificate URL.');
+                return self::FAILURE;
+            }
+        } else {
+            $candidates = Excellence::where('user_id', $user->id)
+                ->whereNotNull('certificate_url')
+                ->orderBy('edition')
+                ->orderBy('type')
+                ->get();
+            if ($candidates->isEmpty()) {
+                $this->error("No certificate(s) found for {$email}.");
+                return self::FAILURE;
+            }
+            if ($candidates->count() > 1) {
+                $this->error('User has more than one certificate. Specify --certificate-url= to choose which one to regenerate.');
+                $this->table(
+                    ['id', 'edition', 'type', 'certificate_url'],
+                    $candidates->map(fn (Excellence $e) => [$e->id, $e->edition, $e->type, $e->certificate_url])->toArray()
+                );
+                return self::FAILURE;
+            }
+            $excellence = $candidates->first();
+        }
+
+        $excellence->load('user');
+        $edition = $editionOverride !== null && $editionOverride !== ''
+            ? (int) $editionOverride
+            : (int) $excellence->edition;
+        $name = $excellence->name_for_certificate ?? trim(($excellence->user->firstname ?? '') . ' ' . ($excellence->user->lastname ?? ''));
+        $name = $name !== '' ? $name : 'Unknown';
+        $type = $excellence->type === 'SuperOrganiser' ? 'super-organiser' : 'excellence';
+        $numberOfActivities = $type === 'super-organiser' ? (int) $excellence->user->activities($edition) : 0;
+
+        $this->info("Certificate: excellence id {$excellence->id}, edition {$excellence->edition} (will generate with year {$edition}), type {$excellence->type}.");
+        $this->line('URL (unchanged): ' . $excellence->certificate_url);
+
+        if ($dryRun) {
+            $this->warn('Dry run: no regeneration. Run without --dry-run to overwrite the PDF on S3.');
+            return self::SUCCESS;
+        }
+
+        try {
+            $cert = new CertificateExcellence(
+                $edition,
+                $name,
+                $type,
+                $numberOfActivities,
+                (int) $excellence->user->id,
+                (string) ($excellence->user->email ?? '')
+            );
+            $url = $cert->generateReplacing($excellence->certificate_url);
+            $excellence->update([
+                'certificate_url' => $url,
+                'certificate_generation_error' => null,
+            ]);
+            $this->info('Done. PDF regenerated; same link now serves the corrected certificate. No email sent.');
+        } catch (\Throwable $e) {
+            $this->error('Regeneration failed: ' . $e->getMessage());
+            $excellence->update(['certificate_generation_error' => $e->getMessage()]);
+
+            return self::FAILURE;
+        }
+
+        return self::SUCCESS;
+    }
+}
diff --git a/app/Console/Commands/TrainingResourcesReport.php b/app/Console/Commands/TrainingResourcesReport.php
@@ -118,7 +118,7 @@ private function learnTeachResourcesStats(Carbon $baseline): array
             'total_resources_now' => $total,
             'added_since_baseline' => $addedSince,
             'baseline_date' => $baseline->format('Y-m-d'),
-            'note' => 'Learn & Teach resources at /resources/learn-and-teach (ResourceItem). Not the same as the static /training modules; both are "training-related" content.',
+            'note' => 'Learn & Teach resources at /resources/ (ResourceItem). Not the same as the static /training modules; both are "training-related" content.',
         ];
     }
 
diff --git a/app/Http/Controllers/CertificateBackendController.php b/app/Http/Controllers/CertificateBackendController.php
@@ -33,20 +33,23 @@ class CertificateBackendController extends Controller
     public const EDITION_DEFAULT = 2025;
 
     /** In local, send immediately so you see success/failure (e.g. in mail log or Mailtrap). In production, queue. */
-    private function sendCertificateMail(string $email, $mailable): void
+    private function sendCertificateMail(string $email, $mailable, bool $sync = false): void
     {
-        if (app()->environment('local')) {
+        if ($sync || app()->environment('local')) {
             Mail::to($email)->send($mailable);
         } else {
             Mail::to($email)->queue($mailable);
         }
     }
 
-    private function mailSentMessage(): string
+    private function mailSentMessage(bool $sync = false): string
     {
-        return app()->environment('local')
-            ? 'Email sent. (Check storage/logs or your mail catcher.)'
-            : 'Email queued. It will be sent when the queue worker runs.';
+        if ($sync || app()->environment('local')) {
+            return app()->environment('local')
+                ? 'Email sent. (Check storage/logs or your mail catcher.)'
+                : 'Email sent.';
+        }
+        return 'Email queued. It will be sent when the queue worker runs.';
     }
 
     public const TYPES = [
@@ -382,6 +385,7 @@ public function errorsList(Request $request)
      * Manual: generate and/or send for one user by email.
      * generate_only=true: only generate certificate (do not send).
      * send_only=true: only send email (certificate must already exist).
+     * send_sync=true: when sending, send immediately (no queue) so this user gets the email now.
      * Otherwise: generate if needed, then send.
      */
     public function manualCreateSend(Request $request): JsonResponse
@@ -392,6 +396,7 @@ public function manualCreateSend(Request $request): JsonResponse
         $certType = $type === 'SuperOrganiser' ? 'super-organiser' : 'excellence';
         $generateOnly = $request->boolean('generate_only');
         $sendOnly = $request->boolean('send_only');
+        $sendSync = $request->boolean('send_sync');
 
         $excellenceId = $request->get('excellence_id');
         $userEmail = $request->get('user_email');
@@ -455,15 +460,15 @@ public function manualCreateSend(Request $request): JsonResponse
 
         try {
             if ($type === 'SuperOrganiser') {
-                $this->sendCertificateMail($user->email, new NotifySuperOrganiser($user, $edition, $excellence->certificate_url));
+                $this->sendCertificateMail($user->email, new NotifySuperOrganiser($user, $edition, $excellence->certificate_url), $sendSync);
             } else {
-                $this->sendCertificateMail($user->email, new NotifyWinner($user, $edition, $excellence->certificate_url));
+                $this->sendCertificateMail($user->email, new NotifyWinner($user, $edition, $excellence->certificate_url), $sendSync);
             }
             $excellence->update(['notified_at' => Carbon::now(), 'certificate_sent_error' => null]);
 
             return response()->json([
                 'ok' => true,
-                'message' => $this->mailSentMessage(),
+                'message' => $this->mailSentMessage($sendSync),
                 'certificate_url' => $excellence->certificate_url,
             ]);
         } catch (\Throwable $e) {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -154,7 +154,10 @@ function ($view) {
 
          //Livewire::paginationView('vendor.livewire.pagination');
 
-        $this->commands([\App\Console\Commands\CertificateReassignUser::class]);
+        $this->commands([
+            \App\Console\Commands\CertificateReassignUser::class,
+            \App\Console\Commands\CertificateRegenerateInPlace::class,
+        ]);
 
         $this->bootAuth();
         $this->bootEvent();
diff --git a/resources/views/certificate-backend/index.blade.php b/resources/views/certificate-backend/index.blade.php
@@ -92,8 +92,10 @@
             <input type="email" id="manual-email" placeholder="user@example.com" style="margin-left: 0.5rem; padding: 0.25rem;">
             <button type="button" id="btn-manual-generate" class="px-6 py-3 ml-2 font-semibold text-white rounded-full duration-300 cursor-pointer bg-primary hover:opacity-90">Generate certificate only</button>
             <button type="button" id="btn-manual-send" class="px-6 py-3 ml-2 font-semibold text-white rounded-full duration-300 cursor-pointer bg-primary hover:opacity-90">Send email only</button>
+            <label style="margin-left: 1rem; cursor: pointer;"><input type="checkbox" id="manual-send-now" checked style="margin-right: 0.25rem;">Send now (no queue)</label>
             <span id="manual-result" style="margin-left: 0.5rem;"></span>
         </div>
+        <p style="margin-top: 0.25rem; font-size: 0.9rem; color: #666;">Use <strong>Send now (no queue)</strong> to send the email immediately for this user only, so they get it without running the queue worker.</p>
     </details>
 
     {{-- Search --}}
@@ -467,7 +469,8 @@ function onResendAllFailedClick(e) {
         if (!email) { showError('Enter email.'); return; }
         clearError();
         if (resultEl) resultEl.textContent = 'Sending…';
-        postJson(apiUrl('/manual-create-send'), { user_email: email, send_only: true }).then(function(r) {
+        var sendNow = document.getElementById('manual-send-now') && document.getElementById('manual-send-now').checked;
+        postJson(apiUrl('/manual-create-send'), { user_email: email, send_only: true, send_sync: sendNow }).then(function(r) {
             if (resultEl) resultEl.textContent = r.ok ? (r.message || 'Email sent.') : r.message;
             if (!r.ok) showError(r.message);
             if (r.ok) { loadStatus(); loadList(currentPage); }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private function learnTeachResourcesStats(Carbon $baseline): array`
`118`	`118`	`'total_resources_now' => $total,`
`119`	`119`	`'added_since_baseline' => $addedSince,`
`120`	`120`	`'baseline_date' => $baseline->format('Y-m-d'),`
`121`		`- 'note' => 'Learn & Teach resources at /resources/learn-and-teach (ResourceItem). Not the same as the static /training modules; both are "training-related" content.',`
	`121`	`+ 'note' => 'Learn & Teach resources at /resources/ (ResourceItem). Not the same as the static /training modules; both are "training-related" content.',`
`122`	`122`	`];`
`123`	`123`	`}`
`124`	`124`