Use eager-loaded user data for submission avatars, include user flags in featured submissions, and fix sitemap lesson fields

- Add users.is_pro, users.is_admin and users.settings to the featured submissions user select so avatar resource has required attributes
- Replace manual user query in ChallengeUserCardResource with relationLoaded() check and pass the loaded user to UserAvatarResource (avoids extra query)
- Update workshop lessons select for sitemap to include id, lessonable_id and lessonable_type

Author: robertotcestari

app/Http/Controllers/HomeController.php

@@ -110,7 +110,10 @@ public function index()
                                     'users.id',
                                     'users.avatar_url',
                                     'users.name',
-                                    'users.github_user'
+                                    'users.github_user',
+                                    'users.is_pro',
+                                    'users.is_admin',
+                                    'users.settings'
                                 );
                             },
                         ])
@@ -193,7 +196,7 @@ protected function getSitemapItems()
             ->withCount('lessons')
             ->with([
                 'lessons' => function ($query) {
-                    $query->select('workshop_id', 'slug', 'updated_at');
+                    $query->select('id', 'lessonable_id', 'lessonable_type', 'slug', 'updated_at');
                 },
             ])
             ->get();

app/Http/Resources/ChallengeUserCardResource.php

@@ -17,27 +17,22 @@ public function toArray(Request $request): array
         return [
             'id' => $this->id,
             'submission_image_url' => $this->submission_image_url,
-            'avatar' => new UserAvatarResource(
-                $this->user
-                    ->query()
-                    ->select(
-                        'avatar_url',
-                        'name',
-                        'github_user',
-                        'is_pro',
-                        'is_admin',
-                        'settings'
-                    )
-                    ->find($this->user_id)
+            'avatar' => $this->when(
+                $this->relationLoaded('user') && $this->user,
+                fn () => new UserAvatarResource($this->user)
             ),
-            'challenge' => $this->whenLoaded('challenge', [
-                'name' => $this->challenge->name,
-                'slug' => $this->challenge->slug,
-            ]),
-            'user' => $this->whenLoaded('user', [
-                'name' => $this->user->name,
-                'github_user' => $this->user->github_user,
-            ]),
+            'challenge' => $this->whenLoaded('challenge', function () {
+                return [
+                    'name' => $this->challenge->name,
+                    'slug' => $this->challenge->slug,
+                ];
+            }),
+            'user' => $this->whenLoaded('user', function () {
+                return [
+                    'name' => $this->user->name,
+                    'github_user' => $this->user->github_user,
+                ];
+            }),
         ];
     }
 }