Fix handling of team leader

nanaya · Dec 6, 2024 · b194ea3 · b194ea3
1 parent a0c02ab
commit b194ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -9,6 +9,7 @@
 
 use App\Libraries\BBCodeForDB;
 use App\Libraries\Uploader;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Team extends Model

diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php
@@ -6,13 +6,12 @@
     use App\Transformers\UserCompactTransformer;
 
     $userTransformer = new UserCompactTransformer();
-    $teamMembers = array_map(
-        fn ($users) => json_collection($users, $userTransformer, UserCompactTransformer::CARD_INCLUDES),
-        $team->members->mapToGroups(fn ($member) => [
-            $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->user,
-        ])->all(),
-    );
+    $toJson = fn ($users) => json_collection($users, $userTransformer, UserCompactTransformer::CARD_INCLUDES);
+    $teamMembers = array_map($toJson, $team->members->mapToGroups(fn ($member) => [
+        $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->user,
+    ])->all());
     $teamMembers['member'] ??= [];
+    $teamMembers['leader'] ??= $toJson([$team->leader ?? new DeletedUser(['user_id' => $team->leader_id])]);
     $headerUrl = $team->header()->url();
 @endphp