boban
/
CluPilotCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(admin): retry path for missed maintenance emails; lock Owner role to serialize last-owner guard 

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
feat/portal-design
nexxo 2026-07-25 16:04:31 +02:00
parent bc2e95ba18
commit 6593dae946
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Livewire/Admin/Maintenance.php
View File

@ -124,6 +124,22 @@ class Maintenance extends Component
$this->dispatch('notify', message: __('maintenance.published'));
}
/**
* Re-run announcements for a published window. Idempotent (ledger-guarded),
* so it only fills gaps — the retry path when a transient queue outage left
* some affected customers un-notified.
*/
public function resend(string $uuid): void
{
$this->authorize('maintenance.manage');
$window = MaintenanceWindow::query()->where('uuid', $uuid)->first();
if ($window === null || $window->state !== 'scheduled') {
return;
}
$this->sendAnnouncements($window);
$this->dispatch('notify', message: __('maintenance.notified'));
}
public function cancel(string $uuid): void
{
$this->authorize('maintenance.manage');
@ -176,6 +192,7 @@ class Maintenance extends Component
'hosts' => $w->hosts_count,
'affected' => $w->affectedCustomers()->count(),
'is_draft' => $w->state === 'draft',
'notifiable' => $w->state === 'scheduled' && in_array($w->derivedState(), ['upcoming', 'active'], true),
'cancellable' => in_array($w->derivedState(), ['draft', 'upcoming', 'active'], true),
]);

7
app/Livewire/Admin/Settings.php
View File

@ -7,6 +7,7 @@ use App\Models\User;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;
use Spatie\Permission\Models\Role;
use Livewire\Attributes\Layout;
use Livewire\Attributes\Validate;
use Livewire\Component;
@ -105,6 +106,10 @@ class Settings extends Component
}
$result = DB::transaction(function () use ($id, $role) {
// Serialize on the Owner role so the global owner count can't be
// raced to zero by concurrent demotions of different owners.
Role::query()->where('name', 'Owner')->lockForUpdate()->first();
$target = User::query()->whereKey($id)->lockForUpdate()->first();
if ($target === null) {
return 'gone';
@ -138,6 +143,8 @@ class Settings extends Component
$this->authorize('staff.manage');
$result = DB::transaction(function () use ($id) {
Role::query()->where('name', 'Owner')->lockForUpdate()->first();
$target = User::query()->whereKey($id)->lockForUpdate()->first();
if ($target === null || ! $target->isOperator()) {
return 'gone';

2
lang/de/maintenance.php
View File

@ -31,6 +31,8 @@ return [
'cancel' => 'Stornieren',
'mail_note' => 'Beim Veröffentlichen erhalten betroffene Kunden eine Ankündigungs-E-Mail (aktuell Log/Mock).',
'notify_again' => 'Erneut benachrichtigen',
'notified' => 'Benachrichtigungen versendet.',
'draft_saved' => 'Entwurf gespeichert.',
'published' => 'Wartung veröffentlicht — Kunden werden benachrichtigt.',
'cancelled' => 'Wartung storniert.',

2
lang/en/maintenance.php
View File

@ -31,6 +31,8 @@ return [
'cancel' => 'Cancel',
'mail_note' => 'On publish, affected customers receive an announcement email (currently log/mock).',
'notify_again' => 'Notify again',
'notified' => 'Notifications sent.',
'draft_saved' => 'Draft saved.',
'published' => 'Maintenance published — customers are being notified.',
'cancelled' => 'Maintenance cancelled.',

3
resources/views/livewire/admin/maintenance.blade.php
View File

@ -34,6 +34,9 @@
@if ($w['is_draft'])
<button type="button" wire:click="publishExisting('{{ $w['uuid'] }}')" class="rounded-md border border-line px-2.5 py-1.5 text-xs font-semibold text-body hover:border-accent-border hover:text-accent-text">{{ __('maintenance.publish') }}</button>
@endif
@if ($w['notifiable'])
<button type="button" wire:click="resend('{{ $w['uuid'] }}')" class="rounded-md border border-line px-2.5 py-1.5 text-xs font-semibold text-body hover:border-accent-border hover:text-accent-text">{{ __('maintenance.notify_again') }}</button>
@endif
@if ($w['cancellable'])
<button type="button" wire:click="cancel('{{ $w['uuid'] }}')" class="rounded-md border border-line px-2.5 py-1.5 text-xs font-semibold text-muted hover:border-danger hover:text-danger">{{ __('maintenance.cancel') }}</button>
@endif