Resolved - A guest or an authenticated user can list questions (laravel-portugal#26) - add resolved_at to QuestionResource, code style

Author: dleicam

domains/Discussions/Controllers/QuestionsIndexController.php

@@ -40,10 +40,13 @@ public function __invoke(Request $request): AnonymousResourceCollection
             ->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, array $created) => $query->whereBetween('created_at', [
+                    $created['from'],
+                    $created['to'],
+                ]))
+            ->when($request->get('resolved') == "1",
                 fn(Builder $query, bool $resolved) => $query->whereNotNull('resolved_at'))
-            ->when(!$request->get('resolved'),
+            ->when($request->get('resolved') == "0",
                 fn(Builder $query, bool $resolved) => $query->whereNull('resolved_at'))
             ->simplePaginate(15);
 

domains/Discussions/Resources/QuestionResource.php

@@ -17,6 +17,7 @@ public function toArray($request): array
             'author' => UserResource::make($this->author),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
+            'resolved_at' => $this->resolved_at,
             'deleted_at' => $this->deleted_at,
         ];
     }

domains/Discussions/Tests/Feature/QuestionsIndexTest.php

@@ -43,6 +43,7 @@ public function it_list_non_deleted_question(): void
                         'author',
                         'created_at',
                         'updated_at',
+                        'resolved_at',
                         'deleted_at',
                     ]
                 ],
@@ -172,12 +173,24 @@ public function it_search_by_resolved(): void
             ->count(5)
             ->create();
 
+        $this->json('GET', route('discussions.questions.index'))
+            ->seeJsonContains([
+                'to' => 15,
+            ]);
+
         $this->json('GET', route('discussions.questions.index', [
             'resolved' => true,
         ]))
             ->seeJsonContains([
                 'to' => 5,
             ]);
+
+        $this->json('GET', route('discussions.questions.index', [
+            'resolved' => false,
+        ]))
+            ->seeJsonContains([
+                'to' => 10,
+            ]);
     }
 
     /** @test */

domains/Discussions/Tests/Feature/QuestionsViewTest.php

@@ -46,6 +46,7 @@ public function it_allow_guest_see_a_question(): void
                     ],
                     'created_at' => $this->question->created_at,
                     'updated_at' => $this->question->updated_at,
+                    'resolved_at' => $this->question->resolved_at,
                     'deleted_at' => $this->question->deleted_at
                 ]
             ]);
@@ -65,6 +66,7 @@ public function it_allow_authenticated_user_see_a_question(): void
                     'author',
                     'created_at',
                     'updated_at',
+                    'resolved_at',
                     'deleted_at'
                 ]
             ]);