ae42b48753
Refactor lyric storage so each song owns its sections instead of sharing global labels. Adds song_sections (per song+label) owning song_slides; labels stay global ProPresenter group tags (name/color/macro). Arrangements now reference sections, so editing/importing one song no longer corrupts others that share a label name. - New: song_sections table + migration with safe backfill; SongSection, SongArrangementSection models; SongSectionController (edit/add/delete sections, immediate persistence) wired into SongEditModal. - Refactor writers/readers: CcliImport, ProImport, SongService, ArrangementController, SongController, ProExport, PDF, Translation (translation reset now section-scoped), CCLI pairing. - CCLI import fixes: parse SongSelect copy-icon format (German "Vers" abbrev + trailing author), fill empty CTS-synced songs instead of blocking as duplicate, distinct label colors per section kind, import&edit/existing-song open the edit modal (no 404/405), teleport paste dialog above assign dialog, preview shows section content, correct SongSelect search URL, copy-icon instructions. - Bookmarklet clicks #generalCopyLyricsButton and captures clipboard; serves correct host from request. - Export: embed key-visual/background under fixed bundle-relative names. - Tests updated for the section model; new section + isolation coverage.
365 lines
11 KiB
PHP
365 lines
11 KiB
PHP
<?php
|
|
|
|
use App\Models\Label;
|
|
use App\Models\Song;
|
|
use App\Models\SongArrangement;
|
|
use App\Models\SongArrangementLabel;
|
|
use App\Models\SongSlide;
|
|
use App\Models\User;
|
|
|
|
beforeEach(function () {
|
|
$this->user = User::factory()->create();
|
|
});
|
|
|
|
test('song pdf download returns pdf with correct content type', function () {
|
|
$song = Song::factory()->create(['title' => 'Amazing Grace']);
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
$label = Label::factory()->create([
|
|
'name' => 'Verse 1',
|
|
'color' => '#3B82F6',
|
|
]);
|
|
$section = songSectionFor($song, $label);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
'text_content' => 'Amazing grace how sweet the sound',
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
});
|
|
|
|
test('song pdf contains song title in filename', function () {
|
|
$song = Song::factory()->create(['title' => 'Amazing Grace']);
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$contentDisposition = $response->headers->get('Content-Disposition');
|
|
expect($contentDisposition)->toContain('amazing-grace');
|
|
expect($contentDisposition)->toContain('normal');
|
|
});
|
|
|
|
test('song pdf includes arrangement groups in order', function () {
|
|
$song = Song::factory()->create(['title' => 'Großer Gott']);
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
$verse = Label::factory()->create([
|
|
'name' => 'Strophe 1',
|
|
'color' => '#3B82F6',
|
|
]);
|
|
|
|
$chorus = Label::factory()->create([
|
|
'name' => 'Refrain',
|
|
'color' => '#10B981',
|
|
]);
|
|
$verseSection = songSectionFor($song, $verse, 1);
|
|
$chorusSection = songSectionFor($song, $chorus, 2);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $verseSection->id,
|
|
'order' => 1,
|
|
'text_content' => 'Großer Gott wir loben dich',
|
|
]);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $chorusSection->id,
|
|
'order' => 1,
|
|
'text_content' => 'Heilig heilig heilig',
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $verseSection->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $chorusSection->id,
|
|
'order' => 2,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
});
|
|
|
|
test('song pdf includes translated text when present', function () {
|
|
$song = Song::factory()->create([
|
|
'title' => 'Amazing Grace',
|
|
'has_translation' => true,
|
|
]);
|
|
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
$label = Label::factory()->create([
|
|
'name' => 'Verse 1',
|
|
]);
|
|
$section = songSectionFor($song, $label);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
'text_content' => 'Amazing grace how sweet the sound',
|
|
'text_content_translated' => 'Erstaunliche Gnade wie süß der Klang',
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
});
|
|
|
|
test('song pdf includes copyright footer', function () {
|
|
$song = Song::factory()->create([
|
|
'title' => 'Amazing Grace',
|
|
'copyright_text' => 'John Newton, 1779',
|
|
'ccli_id' => '22025',
|
|
]);
|
|
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
});
|
|
|
|
test('song pdf returns 404 when arrangement does not belong to song', function () {
|
|
$song = Song::factory()->create();
|
|
$otherSong = Song::factory()->create();
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $otherSong->id,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertNotFound();
|
|
});
|
|
|
|
test('song pdf requires authentication', function () {
|
|
$song = Song::factory()->create();
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
]);
|
|
|
|
$response = $this->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertRedirect(route('login'));
|
|
});
|
|
|
|
test('song pdf handles german umlauts correctly', function () {
|
|
$song = Song::factory()->create([
|
|
'title' => 'Großer Gott wir loben dich',
|
|
'copyright_text' => 'Überliefert',
|
|
]);
|
|
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Übung',
|
|
]);
|
|
|
|
$label = Label::factory()->create([
|
|
'name' => 'Strophe 1',
|
|
]);
|
|
$section = songSectionFor($song, $label);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
'text_content' => 'Großer Gott wir loben dich',
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
|
|
$contentDisposition = $response->headers->get('Content-Disposition');
|
|
expect($contentDisposition)->toContain('.pdf');
|
|
});
|
|
|
|
test('song pdf works with empty arrangement (no groups)', function () {
|
|
$song = Song::factory()->create(['title' => 'Empty Song']);
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Leer',
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)
|
|
->get(route('songs.pdf', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertHeader('Content-Type', 'application/pdf');
|
|
});
|
|
|
|
test('song preview returns json with groups in arrangement order', function () {
|
|
$song = Song::factory()->create([
|
|
'title' => 'Testlied',
|
|
'copyright_text' => 'Test Copyright',
|
|
'ccli_id' => '123456',
|
|
]);
|
|
|
|
$verse = Label::factory()->create([
|
|
'name' => 'Strophe 1',
|
|
'color' => '#3b82f6',
|
|
]);
|
|
|
|
$chorus = Label::factory()->create([
|
|
'name' => 'Refrain',
|
|
'color' => '#ef4444',
|
|
]);
|
|
$verseSection = songSectionFor($song, $verse, 1);
|
|
$chorusSection = songSectionFor($song, $chorus, 2);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $verseSection->id,
|
|
'order' => 1,
|
|
'text_content' => 'Strophe Text',
|
|
]);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $chorusSection->id,
|
|
'order' => 1,
|
|
'text_content' => 'Refrain Text',
|
|
]);
|
|
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
'name' => 'Normal',
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $chorusSection->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $verseSection->id,
|
|
'order' => 2,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)->getJson(route('songs.preview', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$response->assertJsonStructure([
|
|
'song' => ['id', 'title', 'copyright_text', 'ccli_id'],
|
|
'arrangement' => ['id', 'name'],
|
|
'groups' => [
|
|
'*' => [
|
|
'name',
|
|
'color',
|
|
'slides' => [
|
|
'*' => ['text_content', 'text_content_translated'],
|
|
],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$data = $response->json();
|
|
expect($data['groups'][0]['name'])->toBe('Refrain');
|
|
expect($data['groups'][1]['name'])->toBe('Strophe 1');
|
|
expect($data['groups'][0]['slides'][0]['text_content'])->toBe('Refrain Text');
|
|
});
|
|
|
|
test('song preview includes translation text when slides have translations', function () {
|
|
$song = Song::factory()->create(['title' => 'Lied mit Übersetzung']);
|
|
|
|
$label = Label::factory()->create([
|
|
'name' => 'Verse',
|
|
]);
|
|
$section = songSectionFor($song, $label);
|
|
|
|
SongSlide::factory()->create([
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
'text_content' => 'Original Text',
|
|
'text_content_translated' => 'Translated Text',
|
|
]);
|
|
|
|
$arrangement = SongArrangement::factory()->create([
|
|
'song_id' => $song->id,
|
|
]);
|
|
|
|
SongArrangementLabel::factory()->create([
|
|
'song_arrangement_id' => $arrangement->id,
|
|
'song_section_id' => $section->id,
|
|
'order' => 1,
|
|
]);
|
|
|
|
$response = $this->actingAs($this->user)->getJson(route('songs.preview', [$song, $arrangement]));
|
|
|
|
$response->assertOk();
|
|
$data = $response->json();
|
|
expect($data['groups'][0]['slides'][0]['text_content'])->toBe('Original Text');
|
|
expect($data['groups'][0]['slides'][0]['text_content_translated'])->toBe('Translated Text');
|
|
});
|
|
|
|
test('song preview returns 404 when arrangement does not belong to song', function () {
|
|
$song = Song::factory()->create();
|
|
$otherSong = Song::factory()->create();
|
|
$arrangement = SongArrangement::factory()->create(['song_id' => $otherSong->id]);
|
|
|
|
$response = $this->actingAs($this->user)->getJson(route('songs.preview', [$song, $arrangement]));
|
|
|
|
$response->assertNotFound();
|
|
});
|
|
|
|
test('song preview requires authentication', function () {
|
|
$song = Song::factory()->create();
|
|
$arrangement = SongArrangement::factory()->create(['song_id' => $song->id]);
|
|
|
|
$response = $this->getJson(route('songs.preview', [$song, $arrangement]));
|
|
|
|
$response->assertUnauthorized();
|
|
});
|