Add model fields to course model (#320)

* Add model fields to course model * fix tests * fix tests
EscolaLMS · Mar 18, 2024 · 75609cc · 75609cc
1 parent b823ba9
commit 75609cc
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 41 deletions.
diff --git a/src/Http/Requests/CreateCourseAPIRequest.php b/src/Http/Requests/CreateCourseAPIRequest.php
@@ -4,6 +4,7 @@
 
 use EscolaLms\Courses\Models\Course;
 use EscolaLms\Courses\Rules\ValidAuthor;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Foundation\Http\FormRequest;
 
 class CreateCourseAPIRequest extends FormRequest
@@ -28,7 +29,7 @@ public function rules(): array
  {
  $rules = array_merge(Course::rules(), [
  'title' => ['required', 'string', "min:3"],
- ]);
+ ], ModelFields::getFieldsMetadataRules(Course::class));
  $rules['authors.*'][] = new ValidAuthor();
  return $rules;
  }

diff --git a/src/Http/Requests/UpdateCourseAPIRequest.php b/src/Http/Requests/UpdateCourseAPIRequest.php
@@ -5,6 +5,7 @@
 use EscolaLms\Courses\Models\Course;
 use EscolaLms\Courses\Rules\ValidAuthor;
 use EscolaLms\Files\Rules\FileOrStringRule;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateCourseAPIRequest extends FormRequest
@@ -36,6 +37,6 @@ public function rules()
  'image' => [new FileOrStringRule(['image'], $prefixPath)],
  'video' => [new FileOrStringRule(['mimes:mp4,ogg,webm'], $prefixPath)],
  'poster' => [new FileOrStringRule(['image'], $prefixPath)],
- ]);
+ ], ModelFields::getFieldsMetadataRules(Course::class));
  }
 }
diff --git a/src/Http/Resources/Admin/CourseWithProgramAdminResource.php b/src/Http/Resources/Admin/CourseWithProgramAdminResource.php
@@ -6,6 +6,8 @@
 use EscolaLms\Courses\Http\Resources\ScormScoResource;
 use EscolaLms\Courses\Http\Resources\TutorResource;
 use EscolaLms\Courses\Models\Course;
+use EscolaLms\ModelFields\Enum\MetaFieldVisibilityEnum;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CourseWithProgramAdminResource extends JsonResource
@@ -61,6 +63,7 @@ public function toArray($request): array
  'target_group' => $course->target_group,
  'teaser_url' => $course->teaser_url,
  'public' => $course->public,
+ ...ModelFields::getExtraAttributesValues($this->resource, MetaFieldVisibilityEnum::PUBLIC),
  ];
 
  return self::apply($fields, $this);

diff --git a/src/Http/Resources/CourseListResource.php b/src/Http/Resources/CourseListResource.php
@@ -3,6 +3,8 @@
 namespace EscolaLms\Courses\Http\Resources;
 
 use EscolaLms\Auth\Traits\ResourceExtandable;
+use EscolaLms\ModelFields\Enum\MetaFieldVisibilityEnum;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CourseListResource extends JsonResource
@@ -43,6 +45,7 @@ public function toArray($request)
  'poster_url' => $this->poster_url,
  'teaser_url' => $this->teaser_url,
  'public' => $this->public ?? false,
+ ...ModelFields::getExtraAttributesValues($this->resource, MetaFieldVisibilityEnum::PUBLIC),
  ];
 
  return self::apply($fields, $this);

diff --git a/src/Http/Resources/CourseSimpleResource.php b/src/Http/Resources/CourseSimpleResource.php
@@ -3,6 +3,8 @@
 namespace EscolaLms\Courses\Http\Resources;
 
 use EscolaLms\Auth\Traits\ResourceExtandable;
+use EscolaLms\ModelFields\Enum\MetaFieldVisibilityEnum;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CourseSimpleResource extends JsonResource
@@ -44,6 +46,7 @@ public function toArray($request)
  'poster_url' => $this->poster_url,
  'teaser_url' => $this->teaser_url,
  'public' => $this->public ?? false,
+ ...ModelFields::getExtraAttributesValues($this->resource, MetaFieldVisibilityEnum::PUBLIC),
  ];
  return self::apply($fields, $this);
  }

diff --git a/src/Http/Resources/CourseWithProgramResource.php b/src/Http/Resources/CourseWithProgramResource.php
@@ -5,6 +5,8 @@
 use EscolaLms\Courses\Models\Course;
 use EscolaLms\Courses\Models\Lesson;
 use EscolaLms\Courses\ValueObjects\CourseProgressCollection;
+use EscolaLms\ModelFields\Enum\MetaFieldVisibilityEnum;
+use EscolaLms\ModelFields\Facades\ModelFields;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CourseWithProgramResource extends JsonResource
@@ -58,6 +60,7 @@ public function toArray($request): array
  'target_group' => $course->target_group,
  'teaser_url' => $course->teaser_url,
  'public' => $this->public ?? false,
+ ...ModelFields::getExtraAttributesValues($this->resource, MetaFieldVisibilityEnum::PUBLIC),
  ];
  }
 }
diff --git a/src/Models/Course.php b/src/Models/Course.php
@@ -9,6 +9,7 @@
 use EscolaLms\Courses\Enum\CourseStatusEnum;
 use EscolaLms\Courses\Enum\PlatformVisibility;
 use EscolaLms\Courses\Events\CourseStatusChanged;
+use EscolaLms\ModelFields\Traits\ModelFields;
 use EscolaLms\Tags\Models\Tag;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -166,7 +167,9 @@
 
 class Course extends Model
 {
- use HasFactory, QueryCacheable;
+ use HasFactory;
+ use QueryCacheable;
+ use ModelFields;
 
  public $table = 'courses';