Merge pull request #17 from EscolaLMS/feature/STAR-440

fix
EscolaLMS · Feb 28, 2022 · 1bf32ab · 1bf32ab
2 parents 5877d32 + a0b2a8a
commit 1bf32ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/Http/Requests/QuestionnaireCreateRequest.php b/src/Http/Requests/QuestionnaireCreateRequest.php
@@ -3,8 +3,10 @@
 namespace EscolaLms\Questionnaire\Http\Requests;
 
 use EscolaLms\Questionnaire\Models\Questionnaire;
+use EscolaLms\Questionnaire\Models\QuestionnaireModelType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
 
 class QuestionnaireCreateRequest extends FormRequest
 {
@@ -16,11 +18,11 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'title' => 'string|required',
+            'title' => ['string', 'required'],
             'active' => 'boolean',
             'models' => ['sometimes', 'array'],
             'models.*' => ['sometimes', 'array'],
-            'models.*.model_type_id' => ['integer'],
+            'models.*.model_type_id' => ['integer', Rule::exists(QuestionnaireModelType::class, 'id')],
             'models.*.model_id' => ['integer'],
         ];
     }

diff --git a/src/Http/Resources/QuestionnaireModelResource.php b/src/Http/Resources/QuestionnaireModelResource.php
@@ -14,15 +14,12 @@ public function __construct(QuestionnaireModel $questionnaireModel)
 
     public function toArray($request)
     {
-        //$model = new $this->modelableType->model_class();
-
         return [
             'id' => $this->id,
-            'model_type_title' => $this->modelableType->title,
-            'model_type_class' => $this->modelableType->model_class,
+            'model_type_title' => $this->modelableType->title ?? '',
+            'model_type_class' => $this->modelableType->model_class ?? '',
             'model_type_id' => $this->model_type_id,
             'model_id' => $this->model_id,
-            //'model' => $model::find($this->model_id),
         ];
     }
 }