loads of progress

app/Models/Exercise.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class Exercise extends Model
 {
@@ -44,4 +45,25 @@ class Exercise extends Model
     {
         return $this->belongsToMany(User::class, 'exercise_favorites')->withTimestamps();
     }
+
+    public function aliases()
+    {
+        return $this->hasMany(ExerciseAlias::class);
+    }
+
+    public function getDisplayNameAttribute(): string
+    {
+        $name = (string) $this->attributes['name'] ?? '';
+        $userId = Auth::id();
+        if (!$userId) {
+            return $name;
+        }
+        // Use already loaded relation if present to avoid querying N+1
+        if ($this->relationLoaded('aliases')) {
+            $alias = $this->aliases->firstWhere('user_id', $userId);
+            return $alias?->name ?: $name;
+        }
+        $alias = $this->aliases()->where('user_id', $userId)->first();
+        return $alias?->name ?: $name;
+    }
 }

app/Models/ExerciseAlias.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class ExerciseAlias extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_id',
+        'exercise_id',
+        'name',
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function exercise(): BelongsTo
+    {
+        return $this->belongsTo(Exercise::class);
+    }
+}