From 41d4bfe2b7cd35899cb1b2a85c6a609b286d163f Mon Sep 17 00:00:00 2001
From: Thorsten Bus <thorsten@buss-labs.de>
Date: Mon, 4 May 2026 06:33:04 +0200
Subject: [PATCH] fix: rename song_group_id to label_id in Vue, add data-testid
 to MacroIcon, fix Pint style

---
 app/Http/Controllers/ProFileController.php                 | 2 +-
 app/Services/ProExportService.php                          | 3 +--
 .../migrations/2026_05_03_100100_create_labels_table.php   | 3 ++-
 .../migrations/2026_05_03_100200_create_macros_tables.php  | 3 ++-
 .../2026_05_03_100300_create_macro_assignments_table.php   | 3 ++-
 ...6_05_03_100400_create_service_macro_override_tables.php | 3 ++-
 .../migrations/2026_05_03_100500_wipe_legacy_song_data.php | 3 ++-
 .../2026_05_03_100600_refactor_songs_to_labels.php         | 3 ++-
 .../2026_05_03_100700_migrate_legacy_macro_settings.php    | 7 +++----
 resources/js/Components/MacroIcon.vue                      | 1 +
 resources/js/Components/SongEditModal.vue                  | 4 ++--
 resources/js/Pages/Services/Edit.vue                       | 4 ++--
 12 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/ProFileController.php b/app/Http/Controllers/ProFileController.php
index 4ff1599..c899c7f 100644
--- a/app/Http/Controllers/ProFileController.php
+++ b/app/Http/Controllers/ProFileController.php
@@ -27,7 +27,7 @@ public function importPro(Request $request): JsonResponse
         }
 
         try {
-            $service = new ProImportService();
+            $service = new ProImportService;
             $songs = $service->import($file);
 
             return response()->json([
diff --git a/app/Services/ProExportService.php b/app/Services/ProExportService.php
index 315a82d..b73ba1d 100644
--- a/app/Services/ProExportService.php
+++ b/app/Services/ProExportService.php
@@ -10,8 +10,7 @@ class ProExportService
 {
     public function __construct(
         private readonly MacroResolutionService $macroResolutionService,
-    ) {
-    }
+    ) {}
 
     public function generateProFile(Song $song, ?Service $service = null): string
     {
diff --git a/database/migrations/2026_05_03_100100_create_labels_table.php b/database/migrations/2026_05_03_100100_create_labels_table.php
index 1eccceb..a749c1c 100644
--- a/database/migrations/2026_05_03_100100_create_labels_table.php
+++ b/database/migrations/2026_05_03_100100_create_labels_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         Schema::create('labels', function (Blueprint $table) {
diff --git a/database/migrations/2026_05_03_100200_create_macros_tables.php b/database/migrations/2026_05_03_100200_create_macros_tables.php
index b77a4ab..5adf0c1 100644
--- a/database/migrations/2026_05_03_100200_create_macros_tables.php
+++ b/database/migrations/2026_05_03_100200_create_macros_tables.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         Schema::create('macros', function (Blueprint $table) {
diff --git a/database/migrations/2026_05_03_100300_create_macro_assignments_table.php b/database/migrations/2026_05_03_100300_create_macro_assignments_table.php
index 0620914..e0aa1f6 100644
--- a/database/migrations/2026_05_03_100300_create_macro_assignments_table.php
+++ b/database/migrations/2026_05_03_100300_create_macro_assignments_table.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         Schema::create('macro_assignments', function (Blueprint $table) {
diff --git a/database/migrations/2026_05_03_100400_create_service_macro_override_tables.php b/database/migrations/2026_05_03_100400_create_service_macro_override_tables.php
index 09b092d..d1e1822 100644
--- a/database/migrations/2026_05_03_100400_create_service_macro_override_tables.php
+++ b/database/migrations/2026_05_03_100400_create_service_macro_override_tables.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         Schema::create('service_macro_overrides', function (Blueprint $table) {
diff --git a/database/migrations/2026_05_03_100500_wipe_legacy_song_data.php b/database/migrations/2026_05_03_100500_wipe_legacy_song_data.php
index 4116583..7f2760b 100644
--- a/database/migrations/2026_05_03_100500_wipe_legacy_song_data.php
+++ b/database/migrations/2026_05_03_100500_wipe_legacy_song_data.php
@@ -4,7 +4,8 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         if (! Schema::hasTable('song_groups')) {
diff --git a/database/migrations/2026_05_03_100600_refactor_songs_to_labels.php b/database/migrations/2026_05_03_100600_refactor_songs_to_labels.php
index 29c5c20..d851f7d 100644
--- a/database/migrations/2026_05_03_100600_refactor_songs_to_labels.php
+++ b/database/migrations/2026_05_03_100600_refactor_songs_to_labels.php
@@ -4,7 +4,8 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         Schema::table('song_slides', function (Blueprint $table) {
diff --git a/database/migrations/2026_05_03_100700_migrate_legacy_macro_settings.php b/database/migrations/2026_05_03_100700_migrate_legacy_macro_settings.php
index 557fa28..bb3c9bf 100644
--- a/database/migrations/2026_05_03_100700_migrate_legacy_macro_settings.php
+++ b/database/migrations/2026_05_03_100700_migrate_legacy_macro_settings.php
@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     public function up(): void
     {
         $name = DB::table('settings')->where('key', 'macro_name')->value('value');
@@ -66,7 +67,5 @@ public function up(): void
         });
     }
 
-    public function down(): void
-    {
-    }
+    public function down(): void {}
 };
diff --git a/resources/js/Components/MacroIcon.vue b/resources/js/Components/MacroIcon.vue
index c2bbae8..7b914a0 100644
--- a/resources/js/Components/MacroIcon.vue
+++ b/resources/js/Components/MacroIcon.vue
@@ -10,6 +10,7 @@ defineEmits(['click'])
 <template>
     <button
         v-if="count > 0"
+        data-testid="macro-icon"
         class="relative flex items-center justify-center rounded-lg bg-amber-100 px-2 py-1 text-xs font-medium text-amber-700 transition-colors hover:bg-amber-200"
         :aria-label="`${count} Makro-Zuweisungen`"
         @click="$emit('click')"
diff --git a/resources/js/Components/SongEditModal.vue b/resources/js/Components/SongEditModal.vue
index 42a2420..6f6b590 100644
--- a/resources/js/Components/SongEditModal.vue
+++ b/resources/js/Components/SongEditModal.vue
@@ -150,10 +150,10 @@ const arrangements = computed(() => {
         name: arr.name,
         is_default: arr.is_default,
         groups: arr.arrangement_groups.map((ag) => {
-            const group = songData.value.groups.find((g) => g.id === ag.song_group_id)
+            const group = songData.value.groups.find((g) => g.id === ag.label_id)
 
             return {
-                id: ag.song_group_id,
+                id: ag.label_id,
                 name: group?.name ?? 'Unbekannt',
                 color: group?.color ?? '#6b7280',
                 order: ag.order,
diff --git a/resources/js/Pages/Services/Edit.vue b/resources/js/Pages/Services/Edit.vue
index c489535..6305be9 100644
--- a/resources/js/Pages/Services/Edit.vue
+++ b/resources/js/Pages/Services/Edit.vue
@@ -116,9 +116,9 @@ function getArrangements(item) {
         name: arr.name,
         is_default: arr.is_default,
         groups: (arr.arrangement_groups ?? []).map((ag) => {
-            const group = song.groups?.find((g) => g.id === ag.song_group_id) ?? ag.group ?? {}
+            const group = song.groups?.find((g) => g.id === ag.label_id) ?? ag.group ?? {}
             return {
-                id: ag.song_group_id ?? group.id,
+                id: ag.label_id ?? group.id,
                 name: group.name ?? 'Unbekannt',
                 color: group.color ?? '#6b7280',
                 order: ag.order,