loads of progress

app/Http/Controllers/ExerciseController.php

@@ -7,6 +7,7 @@ use App\Models\Equipment;
 use App\Models\Exercise;
 use App\Models\Muscle;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ExerciseController extends Controller
 {
@@ -20,7 +21,8 @@ class ExerciseController extends Controller
         if ($perPage < 6 || $perPage > 60) { $perPage = 12; }
 
         $query = Exercise::query()
-            ->with(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'secondaryMuscles:id,name,slug', 'equipments:id,name,slug'])
+            ->with(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'secondaryMuscles:id,name,slug', 'equipments:id,name,slug']
+                + (Auth::check() ? ['aliases' => function($rel){ $rel->where('user_id', Auth::id()); }] : []))
             ->when($q !== '', function ($qBuilder) use ($q) {
                 $qBuilder->where(function ($sub) use ($q) {
                     $sub->where('name', 'like', "%{$q}%")
@@ -68,7 +70,8 @@ class ExerciseController extends Controller
 
     public function show(Exercise $exercise)
     {
-        $exercise->load(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'secondaryMuscles:id,name,slug', 'equipments:id,name,slug']);
+        $exercise->load(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'secondaryMuscles:id,name,slug', 'equipments:id,name,slug']
+            + (Auth::check() ? ['aliases' => function($rel){ $rel->where('user_id', Auth::id()); }] : []));
 
         // Find similar exercises by shared target muscles, body parts, or equipment
         $targetIds = $exercise->targetMuscles->pluck('id')->all();
@@ -76,7 +79,8 @@ class ExerciseController extends Controller
         $equipmentIds = $exercise->equipments->pluck('id')->all();
 
         $similarQuery = Exercise::query()
-            ->with(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'equipments:id,name,slug'])
+            ->with(['bodyParts:id,name,slug', 'targetMuscles:id,name,slug', 'equipments:id,name,slug']
+                + (Auth::check() ? ['aliases' => function($rel){ $rel->where('user_id', Auth::id()); }] : []))
             ->where('id', '!=', $exercise->id)
             ->where(function ($q) use ($targetIds, $bodyPartIds, $equipmentIds) {
                 if (!empty($targetIds)) {