Merge pull request #117 from EscolaLMS/feature/REK-38

Added consultation_id to resource
EscolaLMS · Nov 8, 2024 · 5b08230 · 5b08230
2 parents b20ee20 + 20dbfba
commit 5b08230
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/Dto/FinishTermDto.php b/src/Dto/FinishTermDto.php
@@ -5,7 +5,7 @@
 class FinishTermDto extends BaseDto
 {
     protected string $term;
-    protected ?string $finishedAt;
+    protected ?string $finishedAt = null;
 
     protected function setTerm(string $term): void
     {

diff --git a/src/Http/Resources/ConsultationTermsResource.php b/src/Http/Resources/ConsultationTermsResource.php
@@ -65,6 +65,17 @@ class ConsultationTermsResource extends JsonResource
      *             ),
      *          ),
      *      ),
+     *      @OA\Property(
+     *          property="finished_at",
+     *          description="consultation term finished date",
+     *          type="datetime",
+     *          example="2022-04-15T04:00:00.000Z",
+     *      ),
+     *      @OA\Property(
+     *          property="consultation_id",
+     *          description="consultation ID",
+     *          type="int",
+     *      ),
      * )
      *
      */
@@ -96,6 +107,7 @@ public function toArray($request)
             'busy_terms' => ConsultationTermResource::collection($consultationServiceContract->getBusyTermsFormatDate($this->resource->consultation_id)),
             'author' =>  $this->resource->author ? ConsultationAuthorResource::make($this->resource->author) : null,
             'finished_at' => $this->resource->finished_at,
+            'consultation_id' => $this->resource->consultation_id,
         ];
         return self::apply($fields, $this);
     }

diff --git a/src/Http/Resources/ConsultationUserTermsResource.php b/src/Http/Resources/ConsultationUserTermsResource.php
@@ -65,6 +65,17 @@ class ConsultationUserTermsResource extends JsonResource
      *             ),
      *          ),
      *      ),
+     *     @OA\Property(
+     *          property="finished_at",
+     *          description="consultation term finished date",
+     *          type="datetime",
+     *          example="2022-04-15T04:00:00.000Z",
+     *      ),
+     *      @OA\Property(
+     *          property="consultation_id",
+     *          description="consultation ID",
+     *          type="int",
+     *      ),
      * )
      *
      */
@@ -100,6 +111,7 @@ public function toArray($request)
             'busy_terms' => ConsultationTermResource::collection($consultationServiceContract->getBusyTermsFormatDate($consultation->getKey())),
             'author' =>  $consultation->author ? ConsultationAuthorResource::make($consultation->author) : null,
             'finished_at' => $this->resource->finished_at,
+            'consultation_id' => $consultation->getKey(),
         ];
         return self::apply($fields, $this);
     }