Add meeting link field (#7)

EscolaLMS · Mar 15, 2023 · 0031bde · 0031bde
1 parent 7b2e6a5
commit 0031bde
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 8 deletions.
diff --git a/...tions/2023_03_15_101928_add_meeting_link_field_to_consultation_access_enquiries_table.php b/...tions/2023_03_15_101928_add_meeting_link_field_to_consultation_access_enquiries_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMeetingLinkFieldToConsultationAccessEnquiriesTable extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('consultation_access_enquiries', function (Blueprint $table) {
+            $table->string('meeting_link')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('consultation_access_enquiries', function (Blueprint $table) {
+            $table->dropColumn('meeting_link');
+        });
+    }
+}
diff --git a/src/Dtos/ApproveConsultationAccessEnquiryDto.php b/src/Dtos/ApproveConsultationAccessEnquiryDto.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace EscolaLms\ConsultationAccess\Dtos;
+
+use EscolaLms\Core\Dtos\Contracts\DtoContract;
+use EscolaLms\Core\Dtos\Contracts\InstantiateFromRequest;
+use Illuminate\Http\Request;
+
+class ApproveConsultationAccessEnquiryDto implements DtoContract, InstantiateFromRequest
+{
+    private int $proposedTermId;
+    private ?string $meetingLink;
+
+    public function __construct(int $proposedTermId, ?string $meetingLink)
+    {
+        $this->proposedTermId = $proposedTermId;
+        $this->meetingLink = $meetingLink;
+    }
+
+    public function toArray(): array
+    {
+        return [];
+    }
+
+    public function getProposedTermId(): int
+    {
+        return $this->proposedTermId;
+    }
+
+    public function getMeetingLink(): ?string
+    {
+        return $this->meetingLink;
+    }
+
+    public static function instantiateFromRequest(Request $request): ApproveConsultationAccessEnquiryDto
+    {
+        return new static(
+            $request->input('proposed_term_id'),
+            $request->input('meeting_link')
+        );
+    }
+}
diff --git a/src/Events/ConsultationAccessEnquiryApprovedEvent.php b/src/Events/ConsultationAccessEnquiryApprovedEvent.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace EscolaLms\ConsultationAccess\Events;
+
+class ConsultationAccessEnquiryApprovedEvent extends ConsultationAccessEnquiryEvent
+{
+}
diff --git a/src/Http/Controllers/Admin/ConsultationAccessEnquiryAdminApiController.php b/src/Http/Controllers/Admin/ConsultationAccessEnquiryAdminApiController.php
@@ -31,7 +31,7 @@ public function index(AdminListConsultationAccessEnquiryRequest $request): JsonR
     public function approve(AdminApproveConsultationAccessEnquiryRequest $request): JsonResponse
     {
         try {
-            $this->service->approveByProposedTerm($request->getProposedTermId());
+            $this->service->approveByProposedTerm($request->getApproveConsultationAccessEnquiryDto());
             return $this->sendSuccess(__('Approved successfully.'));
         } catch (ConsultationAccessException $e) {
             return $this->sendError($e->getMessage(), $e->getCode());

diff --git a/src/Http/Controllers/Admin/Swagger/ConsultationAccessEnquiryAdminApiSwagger.php b/src/Http/Controllers/Admin/Swagger/ConsultationAccessEnquiryAdminApiSwagger.php
@@ -132,6 +132,13 @@ public function index(AdminListConsultationAccessEnquiryRequest $request): JsonR
      *          required=true,
      *          in="path"
      *      ),
+     *      @OA\RequestBody(
+     *          required=true,
+     *          @OA\MediaType(
+     *              mediaType="application/json",
+     *              @OA\Schema(ref="#/components/schemas/AdminApproveConsultationAccessEnquiryRequest")
+     *          ),
+     *      ),
      *      @OA\Response(
      *          response=200,
      *          description="successful operation",

diff --git a/src/Http/Requests/Admin/AdminApproveConsultationAccessEnquiryRequest.php b/src/Http/Requests/Admin/AdminApproveConsultationAccessEnquiryRequest.php
@@ -2,10 +2,23 @@
 
 namespace EscolaLms\ConsultationAccess\Http\Requests\Admin;
 
+use EscolaLms\ConsultationAccess\Dtos\ApproveConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Models\ConsultationAccessEnquiry;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;
 
+/**
+ * @OA\Schema(
+ *      schema="AdminApproveConsultationAccessEnquiryRequest",
+ *      required={"meeting_link"},
+ *      @OA\Property(
+ *          property="meeting_link",
+ *          description="meeting_link",
+ *          type="string"
+ *      ),
+ * )
+ *
+ */
 class AdminApproveConsultationAccessEnquiryRequest extends FormRequest
 {
     public function authorize(): bool
@@ -17,6 +30,7 @@ public function rules(): array
     {
         return [
             'proposed_term_id' => ['required', 'integer', 'exists:consultation_access_enquiry_proposed_terms,id'],
+            'meeting_link' => ['sometimes', 'string', 'url'],
         ];
     }
 
@@ -29,4 +43,9 @@ protected function prepareForValidation(): void
     {
         $this->merge(['proposed_term_id' => $this->getProposedTermId()]);
     }
+
+    public function getApproveConsultationAccessEnquiryDto(): ApproveConsultationAccessEnquiryDto
+    {
+        return ApproveConsultationAccessEnquiryDto::instantiateFromRequest($this);
+    }
 }
diff --git a/src/Http/Resources/ConsultationAccessEnquiryResource.php b/src/Http/Resources/ConsultationAccessEnquiryResource.php
@@ -39,6 +39,11 @@
  *          type="string"
  *      ),
  *      @OA\Property(
+ *          property="meeting_link",
+ *          description="meeting_link",
+ *          type="string"
+ *      ),
+ *      @OA\Property(
  *          property="proposed_terms",
  *          ref="#/components/schemas/ConsultationAccessEnquiryProposedTermsResource"
  *      ),
@@ -66,6 +71,7 @@ public function toArray($request): array
             'proposed_terms' => ConsultationAccessEnquiryProposedTermsResource::collection($this->consultationAccessEnquiryProposedTerms),
             'description' => $this->description,
             'consultation_term' => $this->consultationUser ? ConsultationTermsResource::make($this->consultationUser) : null,
+            'meeting_link' => $this->meeting_link,
         ];
     }
 }
diff --git a/src/Models/ConsultationAccessEnquiry.php b/src/Models/ConsultationAccessEnquiry.php
@@ -20,6 +20,7 @@
  * @property string $status
  * @property string $description
  * @property int $consultation_user_id
+ * @property string $meeting_link
  *
  * @property-read User $user
  * @property-read Consultation $consultation
@@ -36,6 +37,7 @@ class ConsultationAccessEnquiry extends Model
         'status',
         'description',
         'consultation_user_id',
+        'meeting_link',
     ];
 
     public function consultation(): BelongsTo

diff --git a/src/Services/ConsultationAccessEnquiryService.php b/src/Services/ConsultationAccessEnquiryService.php
@@ -2,13 +2,15 @@
 
 namespace EscolaLms\ConsultationAccess\Services;
 
+use EscolaLms\ConsultationAccess\Dtos\ApproveConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Dtos\ConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Dtos\CriteriaDto;
 use EscolaLms\ConsultationAccess\Dtos\PageDto;
 use EscolaLms\ConsultationAccess\Dtos\UpdateConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Enum\EnquiryStatusEnum;
 use EscolaLms\ConsultationAccess\Events\ConsultationAccessEnquiryAdminCreatedEvent;
 use EscolaLms\ConsultationAccess\Events\ConsultationAccessEnquiryAdminUpdatedEvent;
+use EscolaLms\ConsultationAccess\Events\ConsultationAccessEnquiryApprovedEvent;
 use EscolaLms\ConsultationAccess\Events\ConsultationAccessEnquiryDisapprovedEvent;
 use EscolaLms\ConsultationAccess\Exceptions\ConsultationAccessException;
 use EscolaLms\ConsultationAccess\Exceptions\EnquiryAlreadyApprovedException;
@@ -80,9 +82,9 @@ public function create(ConsultationAccessEnquiryDto $dto): ConsultationAccessEnq
     /**
      * @throws ConsultationAccessException
      */
-    public function approveByProposedTerm(int $proposedTermId): void
+    public function approveByProposedTerm(ApproveConsultationAccessEnquiryDto $dto): void
     {
-        $proposedTerm = $this->proposedTermRepository->findById($proposedTermId);
+        $proposedTerm = $this->proposedTermRepository->findById($dto->getProposedTermId());
         $enquiry = $proposedTerm->consultationAccessEnquiry;
 
         if ($enquiry->status === EnquiryStatusEnum::APPROVED) {
@@ -93,12 +95,17 @@ public function approveByProposedTerm(int $proposedTermId): void
             throw new TermIsBusyException();
         }
 
-        DB::transaction(function () use ($enquiry, $proposedTerm) {
+        DB::transaction(function () use ($enquiry, $proposedTerm, $dto) {
             $consultationUser = $this->createConsultationUser($proposedTerm);
-            $this->accessEnquiryRepository->update([
+
+            /** @var ConsultationAccessEnquiry $enquiry */
+            $enquiry = $this->accessEnquiryRepository->update([
                 'consultation_user_id' => $consultationUser->getKey(),
                 'status' => EnquiryStatusEnum::APPROVED,
+                'meeting_link' => $dto->getMeetingLink(),
             ], $enquiry->getKey());
+
+            event(new ConsultationAccessEnquiryApprovedEvent($enquiry->user, $enquiry));
         });
     }
 

diff --git a/src/Services/Contracts/ConsultationAccessEnquiryServiceContract.php b/src/Services/Contracts/ConsultationAccessEnquiryServiceContract.php
@@ -2,6 +2,7 @@
 
 namespace EscolaLms\ConsultationAccess\Services\Contracts;
 
+use EscolaLms\ConsultationAccess\Dtos\ApproveConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Dtos\ConsultationAccessEnquiryDto;
 use EscolaLms\ConsultationAccess\Dtos\CriteriaDto;
 use EscolaLms\ConsultationAccess\Dtos\PageDto;
@@ -17,7 +18,7 @@ public function findAll(CriteriaDto $criteriaDto, PageDto $paginationDto, int $u
     /**
      * @throws ConsultationAccessException
      */
-    public function approveByProposedTerm(int $proposedTermId): void;
+    public function approveByProposedTerm(ApproveConsultationAccessEnquiryDto $dto): void;
 
     public function disapprove(int $id, ?string $message): void;
 

diff --git a/tests/Api/Admin/ConsultationAccessEnquiryAdminApproveApiTest.php b/tests/Api/Admin/ConsultationAccessEnquiryAdminApproveApiTest.php
@@ -31,16 +31,19 @@ public function testConsultationAccessEnquiryAdminApprove(): void
     {
         /** @var ConsultationAccessEnquiryProposedTerm $proposedTerm */
         $proposedTerm = ConsultationAccessEnquiryProposedTerm::factory()->create();
-
+        $meetingLink = $this->faker->url;
         $this->actingAs($this->makeAdmin(), 'api')
-            ->postJson('api/admin/consultation-access-enquiries/approve/' . $proposedTerm->getKey())
+            ->postJson('api/admin/consultation-access-enquiries/approve/' . $proposedTerm->getKey(), [
+                'meeting_link' => $meetingLink,
+            ])
             ->assertOk();
 
         $proposedTerm->refresh();
 
         $this->assertDatabaseHas('consultation_access_enquiries', [
             'status' => EnquiryStatusEnum::APPROVED,
             'consultation_id' => $proposedTerm->consultationAccessEnquiry->consultation_id,
+            'meeting_link' => $meetingLink,
         ]);
 
         $this->assertDatabaseHas('consultation_user', [