soeren/fotospiel-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

updated table structure for photobooth/sparkbooth settings. now there's a separate table for it. update all references and tests. also fixed the notification panel and the lightbox in the guest app.

Browse Source
This commit is contained in:
Codex Agent
2025-12-18 08:49:56 +01:00
parent ece38fc009
commit 1c4acda332
30 changed files with 734 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/Http/Resources/Tenant/PhotoboothStatusResource.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Resources\Tenant;
use App\Models\Event;
use App\Models\EventPhotoboothSetting;
use App\Models\PhotoboothSetting;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -20,31 +21,32 @@ class PhotoboothStatusResource extends JsonResource
/** @var PhotoboothSetting $settings */
$settings = $payload['settings'];
$mode = $event->photobooth_mode ?? 'ftp';
$event->loadMissing('photoboothSetting');
$eventSetting = $event->photoboothSetting;
$mode = $eventSetting?->mode ?? 'ftp';
$isSparkbooth = $mode === 'sparkbooth';
$password = $isSparkbooth
? $event->getAttribute('plain_sparkbooth_password') ?? $event->sparkbooth_password
: $event->getAttribute('plain_photobooth_password') ?? $event->photobooth_password;
$password = $eventSetting?->getAttribute('plain_password') ?? $eventSetting?->password;
$activeUsername = $isSparkbooth ? $event->sparkbooth_username : $event->photobooth_username;
$activeStatus = $isSparkbooth ? $event->sparkbooth_status : $event->photobooth_status;
$activeExpires = $isSparkbooth ? $event->sparkbooth_expires_at : $event->photobooth_expires_at;
$activeUsername = $eventSetting?->username;
$activeStatus = $eventSetting?->status ?? 'inactive';
$activeExpires = $eventSetting?->expires_at;
$sparkMetrics = [
'last_upload_at' => optional($event->sparkbooth_last_upload_at)->toIso8601String(),
'uploads_24h' => (int) ($event->sparkbooth_uploads_last_24h ?? 0),
'uploads_total' => (int) ($event->sparkbooth_uploads_total ?? 0),
'last_upload_at' => optional($eventSetting?->last_upload_at)->toIso8601String(),
'uploads_24h' => (int) ($eventSetting?->uploads_last_24h ?? 0),
'uploads_total' => (int) ($eventSetting?->uploads_total ?? 0),
];
return [
'mode' => $mode,
'enabled' => (bool) $event->photobooth_enabled,
'enabled' => (bool) ($eventSetting?->enabled),
'status' => $activeStatus,
'username' => $activeUsername,
'password' => $password,
'path' => $event->photobooth_path,
'ftp_url' => $isSparkbooth ? null : $this->buildFtpUrl($event, $settings, $password),
'path' => $eventSetting?->path,
'ftp_url' => $isSparkbooth ? null : $this->buildFtpUrl($eventSetting, $settings, $password),
'upload_url' => $isSparkbooth ? route('api.v1.photobooth.sparkbooth.upload') : null,
'expires_at' => optional($activeExpires)->toIso8601String(),
'rate_limit_per_minute' => (int) $settings->rate_limit_per_minute,
@@ -55,13 +57,13 @@ class PhotoboothStatusResource extends JsonResource
],
'metrics' => $isSparkbooth ? $sparkMetrics : null,
'sparkbooth' => [
'enabled' => $mode === 'sparkbooth' && $event->photobooth_enabled,
'status' => $event->sparkbooth_status,
'username' => $event->sparkbooth_username,
'password' => $event->getAttribute('plain_sparkbooth_password') ?? $event->sparkbooth_password,
'expires_at' => optional($event->sparkbooth_expires_at)->toIso8601String(),
'enabled' => $mode === 'sparkbooth' && (bool) ($eventSetting?->enabled),
'status' => $mode === 'sparkbooth' ? ($eventSetting?->status) : 'inactive',
'username' => $mode === 'sparkbooth' ? $eventSetting?->username : null,
'password' => $mode === 'sparkbooth' ? $password : null,
'expires_at' => $mode === 'sparkbooth' ? optional($eventSetting?->expires_at)->toIso8601String() : null,
'upload_url' => route('api.v1.photobooth.sparkbooth.upload'),
'response_format' => $event->photobooth_metadata['sparkbooth_response_format'] ?? config('photobooth.sparkbooth.response_format', 'json'),
'response_format' => ($eventSetting?->metadata ?? [])['sparkbooth_response_format'] ?? config('photobooth.sparkbooth.response_format', 'json'),
'metrics' => $sparkMetrics,
],
];
@@ -87,10 +89,10 @@ class PhotoboothStatusResource extends JsonResource
];
}
protected function buildFtpUrl(Event $event, PhotoboothSetting $settings, ?string $password): ?string
protected function buildFtpUrl(?EventPhotoboothSetting $eventSetting, PhotoboothSetting $settings, ?string $password): ?string
{
$host = config('photobooth.ftp.host');
$username = $event->photobooth_username;
$username = $eventSetting?->username;
if (! $host || ! $username || ! $password) {
return null;