Resolved - A guest or an authenticated user can list questions (laravel-portugal#26) - Refactoring

Author: dleicam

domains/Discussions/Controllers/QuestionsGetController.php

@@ -6,20 +6,21 @@
 use Domains\Discussions\Models\Question;
 use Domains\Discussions\Resources\QuestionResource;
 use Illuminate\Contracts\Auth\Factory as Auth;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class QuestionsGetController extends Controller
 {
-    protected $query;
+    protected Question $question;
 
     public function __construct(Auth $auth, Question $question)
     {
         if ($auth->guard()->guest()) {
             $this->middleware('throttle:30,1');
         }
 
-        $this->query = $question::query();
+        $this->question = $question;
     }
 
     public function __invoke(Request $request): AnonymousResourceCollection
@@ -33,28 +34,19 @@ public function __invoke(Request $request): AnonymousResourceCollection
             'resolved' => 'sometimes|boolean'
         ]);
 
-        $author = $request->get('author');
-        if ($author != '') {
-            $this->query->where('author_id', $author);
-        }
-
-        $title = strtoupper($request->get('title'));
-        if ($title != '') {
-            $this->query->where('title', 'like', '%'.$title.'%');
-        }
-
-        $created = $request->get('created');
-        if ($created != null) {
-            $this->query->whereBetween('created_at', [$created['from'], $created['to']]);
-        }
-
-        $resolved = $request->get('resolved');
-        if ($resolved == true) {
-            $this->query->whereNotNull('resolved_at');
-        } elseif ($resolved == false) {
-            $this->query->whereNull('resolved_at');
-        }
-
-        return QuestionResource::collection($this->query->paginate(15));
+        $question = $this->question
+            ->when($authorId = $request->get('author'),
+                fn(Builder $query, int $authorId) => $query->where('author_id', $authorId))
+            ->when($request->get('title'),
+                fn(Builder $query, string $title) => $query->where('title', 'like', '%'.strtoupper($title).'%'))
+            ->when($request->get('created'),
+                fn(Builder $query, array $created) => $query->whereBetween('created_at', [$created['from'], $created['to']]))
+            ->when($request->get('resolved'),
+                fn(Builder $query, bool $resolved) => $query->whereNotNull('resolved_at'))
+            ->when(!$request->get('resolved'),
+                fn(Builder $query, bool $resolved) => $query->whereNull('resolved_at'))
+            ->simplePaginate(15);
+
+        return QuestionResource::collection($question);
     }
 }

domains/Discussions/Tests/Feature/QuestionsGetTest.php

@@ -86,7 +86,6 @@ public function it_supports_pagination_navigation(): void
     {
         $response = $this->get(route('discussions.questions.index', ['page' => 2]));
         $response->assertResponseOk();
-
         self::assertEquals(2, $response->decodedJsonResponse()['meta']['current_page']);
     }
 
@@ -98,7 +97,7 @@ public function it_searchable_by_author(): void
 
         $response = $this->get(route('discussions.questions.index', ['author' => $user->id]));
 
-        $this->assertEquals(1, $response->decodedJsonResponse()['meta']['total']);
+        $this->assertEquals(1, count($response->decodedJsonResponse()['data']));
     }
 
     /** @test */
@@ -109,7 +108,7 @@ public function it_searchable_by_title(): void
 
         $response = $this->get(route('discussions.questions.index', ['title' => 'LArAvEL-pt']));
 
-        $this->assertEquals(2, $response->decodedJsonResponse()['meta']['total']);
+        $this->assertEquals(2, count($response->decodedJsonResponse()['data']));
     }
 
     /** @test */
@@ -122,13 +121,13 @@ public function it_searchable_by_created_at(): void
             'created[from]' => Carbon::now()->subMonth()->subYears(2)->toDateString(),
             'created[to]' => Carbon::now()->addMonth()->subYears(2)->toDateString()
         ]));
-        $this->assertEquals(1, $response->decodedJsonResponse()['meta']['total']);
+        $this->assertEquals(1, count($response->decodedJsonResponse()['data']));
 
         $response = $this->get(route('discussions.questions.index', [
             'created[from]' => Carbon::now()->subMonth()->subYears(3)->toDateString(),
             'created[to]' => Carbon::now()->addMonth()->subYears(2)->toDateString()
         ]));
-        $this->assertEquals(2, $response->decodedJsonResponse()['meta']['total']);
+        $this->assertEquals(2, count($response->decodedJsonResponse()['data']));
     }
 
     /** @test */
@@ -137,7 +136,7 @@ public function it_searchable_by_resolved(): void
         QuestionFactory::new(['resolved_at' => Carbon::now()->toDateString()])->create();
 
         $response = $this->get(route('discussions.questions.index', ['resolved' => true]));
-        $this->assertEquals(1, $response->decodedJsonResponse()['meta']['total']);
+        $this->assertEquals(1, count($response->decodedJsonResponse()['data']));
     }
 
     /** @test */