Resolve conflicts + test tweaks

Author: tiagof

domains/Discussions/Controllers/QuestionsUpdateController.php

@@ -6,15 +6,21 @@
 use Domains\Discussions\Models\Question;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
 
 class QuestionsUpdateController extends Controller
 {
+    private Question $questions;
+
+    public function __construct(Question $questions)
+    {
+        $this->questions = $questions;
+    }
+
     public function __invoke(int $questionId, Request $request): Response
     {
-        $question = Question::findOrFail($questionId);
+        $question = $this->questions->newModelQuery()->findOrFail($questionId);
 
-        if (Auth::user()->cannot('update', $question)) {
+        if ($request->user()->cannot('update', $question)) {
             abort(Response::HTTP_FORBIDDEN);
         }
 

domains/Discussions/Tests/Feature/QuestionsUpdateTest.php

@@ -40,7 +40,11 @@ public function it_updates_questions(): void
         ];
 
         $this->actingAs($this->user);
-        $response = $this->call('PATCH', '/questions/' . $this->question->id, $payload);
+        $response = $this->call(
+            'PATCH',
+            route('discussions.questions.update', ['questionId' => $this->question->id]),
+            $payload
+        );
         self::assertTrue($response->isEmpty());
 
         $this->seeInDatabase('questions', [
@@ -56,7 +60,7 @@ public function it_updates_questions(): void
     public function it_fails_to_update_if_title_is_missing(): void
     {
         $this->actingAs($this->user);
-        $this->patch('/questions/' . $this->question->id)
+        $this->patch(route('discussions.questions.update', ['questionId' => $this->question->id]))
             ->seeJsonStructure([
                 'title',
             ]);
@@ -66,9 +70,13 @@ public function it_fails_to_update_if_title_is_missing(): void
     public function it_keeps_previous_description_if_none_is_sent(): void
     {
         $this->actingAs($this->user);
-        $response = $this->call('PATCH', '/questions/' . $this->question->id, [
-            'title' => $this->faker->title,
-        ]);
+        $response = $this->call(
+            'PATCH',
+            route('discussions.questions.update', ['questionId' => $this->question->id]),
+            [
+                'title' => $this->faker->title,
+            ]
+        );
 
         self::assertTrue($response->isEmpty());
         self::assertEquals($this->question->description, $this->question->refresh()->description);
@@ -78,9 +86,11 @@ public function it_keeps_previous_description_if_none_is_sent(): void
     public function it_forbids_non_owner_to_update_questions(): void
     {
         $this->actingAs(UserFactory::new()->make()); // make another user
-        $this->patch('/questions/' . $this->question->id, [
-            'title' => $this->faker->title,
-        ])
-            ->assertResponseStatus(Response::HTTP_FORBIDDEN);
+        $this->patch(
+            route('discussions.questions.update', ['questionId' => $this->question->id]),
+            [
+                'title' => $this->faker->title,
+            ]
+        )->assertResponseStatus(Response::HTTP_FORBIDDEN);
     }
 }