fix: update logic challenge

romo4ko · Oct 27, 2024 · bd75348 · bd75348
1 parent 1f0c0c8
commit bd75348
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
@@ -47,7 +47,7 @@ public function team(int $id): array
 
     public function challenge(int $id): array
     {
-        $challenges = User::query()->findOrFail($id);
+        $challenges = User::query()->find($id);
 
         return $this->userService->challenge($challenges);
     }

diff --git a/app/Services/Api/UserService.php b/app/Services/Api/UserService.php
@@ -90,10 +90,14 @@ public function teamIsCaptain(User $user): array
         return UserTeamDTO::collect($team)->toArray();
     }
 
-    public function challenge(User $user): array
+    public function challenge(User|null $user): array
     {
-        $challenges = $user->challenges()->orderBy('end_date', 'desc')->get();
+        if($user) {
+            $challenges = $user->challenges()->orderBy('end_date', 'desc')->get();
+
+            return UserChallengeDTO::collect($challenges)->toArray();
+        }
 
-        return UserChallengeDTO::collect($challenges)->toArray();
+        return [];
     }
 }