Resolves a batch of bugs and feature requests across songs, services, settings and export: Songs & sections - Every song now carries permanent, empty, locked PREFIX (COPYRIGHT) and POSTFIX (BLANK) sections, deduplicated on import; locked sections cannot be edited or deleted via UI or API. - Song edit modal: explicit Speichern/Schließen with dirty-tracking, editable section headline (combobox + custom values), and a fix for the 419 CSRF errors after CCLI "Importieren & Bearbeiten" (token read fresh per request). - CCLI bookmarklet "Importieren & Bearbeiten" now opens the edit dialog. Service schedule & arrangements - Fixed assigned songs showing no sections (slides loaded for all arrangements, not just the default). - Added "Song entfernen / neu zuordnen" to reassign an assigned song. - Worship-leader arrangement is created/selected lazily when the arrangement dialog opens (only when not user-overridden); the leader is resolved from the "Lobpreis" agenda item, and manual create/clone names are prefixed with the leader name. Navigation - "/" redirects to the next upcoming service's edit page (or the list). - Service titles link to the edit page. Settings - Renamed "Makro-Import"/"Label-Import" menu items; fixed drag-and-drop imports (were downloading the dropped file); added label-import hint; made the panel scrollable. - Nametag now uses a single MacroPicker; added song prefix/postfix label defaults (COPYRIGHT #24B34C / BLANK #000000); new "Export-Dateien" menu to upload prefix/postfix .pro files added to every export. Export - Filenames/playlist names are date-first ("YYYY-MM-DD <Title>"). - Keyvisual slide only for the first content-less item after real content; all other content-less items render as headlines. - New "Vorschau herunterladen" for non-finalized services (filename and import name prefixed "Vorschau" with export timestamp). - Uploaded prefix/postfix .pro files wrap every export. Tests updated to the new behavior; full suite green (569 passed).
180 lines
5.2 KiB
PHP
180 lines
5.2 KiB
PHP
<?php
|
|
|
|
use App\Models\Service;
|
|
use App\Models\ServiceAgendaItem;
|
|
use App\Models\Setting;
|
|
use App\Services\NameTagResolver;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('moderator override wins', function () {
|
|
$service = Service::factory()->create([
|
|
'moderator_name' => 'Override Mod',
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->moderatorFor($service);
|
|
|
|
expect($name)->toBe('Override Mod');
|
|
});
|
|
|
|
test('moderator falls back to first visible agenda item responsibles', function () {
|
|
$service = Service::factory()->create([
|
|
'moderator_name' => null,
|
|
]);
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Vorprogramm',
|
|
'is_before_event' => true,
|
|
'responsible' => [['name' => 'Ignored Person']],
|
|
'sort_order' => 1,
|
|
]);
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Begrüßung',
|
|
'is_before_event' => false,
|
|
'responsible' => [
|
|
['name' => 'Anna Müller'],
|
|
['name' => 'Tom Klein'],
|
|
],
|
|
'sort_order' => 2,
|
|
]);
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Später',
|
|
'is_before_event' => false,
|
|
'responsible' => [['name' => 'Späte Person']],
|
|
'sort_order' => 3,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->moderatorFor($service);
|
|
|
|
expect($name)->toBe('Anna Müller, Tom Klein');
|
|
});
|
|
|
|
test('moderator returns null without override or visible agenda item', function () {
|
|
$service = Service::factory()->create([
|
|
'moderator_name' => null,
|
|
]);
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'is_before_event' => true,
|
|
'responsible' => [['name' => 'Ignored Person']],
|
|
'sort_order' => 1,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->moderatorFor($service);
|
|
|
|
expect($name)->toBeNull();
|
|
});
|
|
|
|
test('preacher override wins', function () {
|
|
$service = Service::factory()->create([
|
|
'preacher_name_override' => 'Gast Sprecher',
|
|
'preacher_name' => 'Pfr. Lang',
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->preacherFor($service);
|
|
|
|
expect($name)->toBe('Gast Sprecher');
|
|
});
|
|
|
|
test('preacher falls back to cts preacher name', function () {
|
|
$service = Service::factory()->create([
|
|
'preacher_name_override' => null,
|
|
'preacher_name' => 'Pfr. Lang',
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->preacherFor($service);
|
|
|
|
expect($name)->toBe('Pfr. Lang');
|
|
});
|
|
|
|
test('preacher falls back to sermon agenda item responsibles', function () {
|
|
Setting::set('agenda_sermon_matching', 'Predigt*,Sermon*');
|
|
$service = Service::factory()->create([
|
|
'preacher_name_override' => null,
|
|
'preacher_name' => null,
|
|
]);
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Lied vor der Predigt',
|
|
'service_song_id' => null,
|
|
'responsible' => [['name' => 'Ignored Person']],
|
|
'sort_order' => 1,
|
|
]);
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Predigt',
|
|
'service_song_id' => null,
|
|
'responsible' => [['name' => 'Diakon Bauer']],
|
|
'sort_order' => 2,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->preacherFor($service);
|
|
|
|
expect($name)->toBe('Diakon Bauer');
|
|
});
|
|
|
|
test('preacher returns null without override cts name or sermon responsibles', function () {
|
|
Setting::set('agenda_sermon_matching', 'Predigt*');
|
|
$service = Service::factory()->create([
|
|
'preacher_name_override' => null,
|
|
'preacher_name' => null,
|
|
]);
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Begrüßung',
|
|
'service_song_id' => null,
|
|
'responsible' => [['name' => 'Moderation']],
|
|
'sort_order' => 1,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->preacherFor($service);
|
|
|
|
expect($name)->toBeNull();
|
|
});
|
|
|
|
test('worship leader resolves from lobpreis agenda item responsibles', function () {
|
|
$service = Service::factory()->create();
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Begrüßung',
|
|
'is_before_event' => false,
|
|
'responsible' => [['name' => 'Moderator Max']],
|
|
'sort_order' => 1,
|
|
]);
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Lobpreis',
|
|
'is_before_event' => false,
|
|
'responsible' => [['name' => 'Lea Leiter']],
|
|
'sort_order' => 2,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->worshipLeaderFor($service);
|
|
|
|
expect($name)->toBe('Lea Leiter');
|
|
});
|
|
|
|
test('worship leader returns null without a lobpreis agenda item', function () {
|
|
$service = Service::factory()->create();
|
|
|
|
ServiceAgendaItem::factory()->create([
|
|
'service_id' => $service->id,
|
|
'title' => 'Begrüßung',
|
|
'is_before_event' => false,
|
|
'responsible' => [['name' => 'Moderator Max']],
|
|
'sort_order' => 1,
|
|
]);
|
|
|
|
$name = app(NameTagResolver::class)->worshipLeaderFor($service);
|
|
|
|
expect($name)->toBeNull();
|
|
});
|