Fix consultation report proposed term (#123)

EscolaLMS · Dec 6, 2024 · 9f86ec7 · 9f86ec7
1 parent 31248f6
commit 9f86ec7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Services/ConsultationService.php b/src/Services/ConsultationService.php
@@ -156,7 +156,10 @@ public function reportTerm(int $consultationTermId, string $executedAt): bool
             $userTerm = $this->consultationUserTermRepository->createUserTerm($consultationTerm, $data);
 
             $consultationTerm->consultation->teachers
-                ->push($consultationTerm->consultation->author)
+                ->when(
+                    $consultationTerm->consultation->author_id !== null,
+                    fn ($teachers) => $teachers->push($consultationTerm->consultation->author)
+                )
                 ->filter()
                 ->each(function ($author) use ($consultationTerm, $userTerm) {
                     event(new ReportTerm($author, $consultationTerm, $userTerm));

diff --git a/tests/APIs/ConsultationReportTermTest.php b/tests/APIs/ConsultationReportTermTest.php
@@ -4,6 +4,8 @@
 
 use EscolaLms\Consultations\Events\ApprovedTermWithTrainer;
 use EscolaLms\Consultations\Events\RejectTermWithTrainer;
+use EscolaLms\Consultations\Events\ReportTerm;
+use EscolaLms\Consultations\Models\ConsultationProposedTerm;
 use EscolaLms\Consultations\Models\ConsultationUserTerm;
 use EscolaLms\Consultations\Tests\Models\User;
 use EscolaLms\Consultations\Enum\ConsultationTermStatusEnum;
@@ -59,6 +61,35 @@ public function testConsultationReportTerm(): void
         $this->response->assertOk();
     }
 
+    public function testConsultationReportProposedTerm(): void
+    {
+        Event::fake([ReportTerm::class]);
+        $this->initVariable();
+        $this->consultation->update(['author_id' => null]);
+        $this->consultation->teachers()->attach([
+            User::factory()->create()->getKey(),
+            User::factory()->create()->getKey(),
+        ]);
+
+        $proposedTerm = ConsultationProposedTerm::factory()
+            ->state([
+                'proposed_at' => now()->addDays(2),
+            ])
+            ->for($this->consultation)
+            ->create();
+
+        $this->response = $this->actingAs($this->user, 'api')
+            ->json('POST',
+                '/api/consultations/report-term/' . $this->consultationUserPivot->getKey(),
+                [
+                    'term' => $proposedTerm->proposed_at,
+                ]
+            )
+            ->assertOk();
+
+        Event::assertDispatchedTimes(ReportTerm::class, 2);
+    }
+
     public function testConsultationReportTermMultipleTerm(): void
     {
         $this->initVariable();