Fix tests

EscolaLMS · Nov 7, 2024 · f6e96bb · f6e96bb
1 parent c6278c2
commit f6e96bb
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/tests/Api/Admin/ConsultationAccessEnquiryAdminApproveApiTest.php b/tests/Api/Admin/ConsultationAccessEnquiryAdminApproveApiTest.php
@@ -54,8 +54,14 @@ public function testConsultationAccessEnquiryAdminApprove(): void
         $this->assertDatabaseHas('consultation_user', [
             'user_id' => $proposedTerm->consultationAccessEnquiry->user_id,
             'consultation_id' => $proposedTerm->consultationAccessEnquiry->consultation_id,
+        ]);
+
+        $proposedTerm->refresh();
+
+        $this->assertDatabaseHas('consultation_user_terms', [
             'executed_at' => $proposedTerm->proposed_at,
             'executed_status' => ConsultationTermStatusEnum::APPROVED,
+            'consultation_user_id' => $proposedTerm->consultationAccessEnquiry->consultation_user_id,
         ]);
     }
 
@@ -83,14 +89,18 @@ public function testConsultationAccessEnquiryAdminApproveProposedTermIsBusyExcep
         $proposedTerm = ConsultationAccessEnquiryProposedTerm::factory()
             ->create();
 
-        ConsultationUserPivot::factory()
+        /** @var ConsultationUserPivot $consultationUser */
+        $consultationUser = ConsultationUserPivot::factory()
             ->state([
                 'user_id' => $this->makeStudent()->getKey(),
                 'consultation_id' => $proposedTerm->consultationAccessEnquiry->consultation_id,
-                'executed_at' => $proposedTerm->proposed_at,
-                'executed_status' => ConsultationTermStatusEnum::APPROVED,
             ])->create();
 
+        $consultationUser->userTerms()->create([
+            'executed_at' => $proposedTerm->proposed_at,
+            'executed_status' => ConsultationTermStatusEnum::APPROVED,
+        ]);
+
         $this->actingAs($this->makeAdmin(), 'api')
             ->postJson('api/admin/consultation-access-enquiries/approve/' . $proposedTerm->getKey())
             ->assertStatus(400)

diff --git a/tests/Api/Admin/ConsultationAccessEnquiryAdminListSortApiTest.php b/tests/Api/Admin/ConsultationAccessEnquiryAdminListSortApiTest.php
@@ -39,16 +39,24 @@ public function testConsultationAccessEnquiryListSorting(): void
         $consultationOne = Consultation::factory()->create(['name' => 'A Consultation']);
         $consultationTwo = Consultation::factory()->create(['name' => 'B Consultation']);
 
+        /** @var ConsultationUserPivot $consultationUserOne */
         $consultationUserOne = ConsultationUserPivot::factory()->create([
             'user_id' => $studentOne->getKey(),
             'consultation_id' => $consultationOne->getKey(),
+        ]);
+
+        $consultationUserOne->userTerms()->create([
             'executed_status' => 'approved',
             'executed_at' => Carbon::today()->addDays(1),
         ]);
 
+        /** @var ConsultationUserPivot $consultationUserTwo */
         $consultationUserTwo = ConsultationUserPivot::factory()->create([
             'user_id' => $studentTwo->getKey(),
             'consultation_id' => $consultationTwo->getKey(),
+        ]);
+
+        $consultationUserTwo->userTerms()->create([
             'executed_status' => 'approved',
             'executed_at' => Carbon::today()->addDays(2),
         ]);

diff --git a/tests/Feature/SpaceTitleStrategyTest.php b/tests/Feature/SpaceTitleStrategyTest.php
@@ -10,6 +10,7 @@
 use EscolaLms\ConsultationAccess\Tests\TestCase;
 use EscolaLms\Consultations\Models\Consultation;
 use EscolaLms\Consultations\Models\ConsultationUserPivot;
+use EscolaLms\Consultations\Models\ConsultationUserTerm;
 use EscolaLms\Courses\Models\Course;
 use EscolaLms\Courses\Models\Lesson;
 use EscolaLms\Courses\Models\Topic;
@@ -18,6 +19,7 @@ class SpaceTitleStrategyTest extends TestCase
 {
     private ConsultationAccessEnquiry $enquiry;
     private ConsultationUserPivot $consultationUser;
+    private ConsultationUserTerm $consultationUserTerm;
 
     protected function setUp(): void
     {
@@ -30,15 +32,21 @@ protected function setUp(): void
             ])
             ->create();
 
+        $this->consultationUserTerm = $this->consultationUser->userTerms()->create([
+           'executed_at' => now()->format('Y-m-d H:i:s'),
+        ]);
+
         /** @var ConsultationAccessEnquiry $enquiry */
         $this->enquiry = ConsultationAccessEnquiry::factory()
             ->state([
                 'status' => EnquiryStatusEnum::APPROVED,
                 'meeting_link' => null,
                 'meeting_link_type' => null,
                 'consultation_user_id' => $this->consultationUser->getKey(),
+                'consultation_user_term_id' => $this->consultationUserTerm->getKey(),
             ])
             ->create();
+
     }
 
     public function testDefaultSpaceTitle(): void
@@ -106,7 +114,7 @@ private function getDefaultTitle(): string
             '%s (%d) %s',
             $this->enquiry->user->name,
             $this->enquiry->user->getKey(),
-            Carbon::make($this->consultationUser->executed_at)->format('d-m-Y')
+            Carbon::make($this->enquiry->consultationUserTerm->executed_at)->format('d-m-Y')
         );
     }
 }