diff --git a/app/Containers/AdditionalEducation/Models/AdditionalEducation.php b/app/Containers/AdditionalEducation/Models/AdditionalEducation.php index 9e1c2fb..75ab689 100755 --- a/app/Containers/AdditionalEducation/Models/AdditionalEducation.php +++ b/app/Containers/AdditionalEducation/Models/AdditionalEducation.php @@ -5,13 +5,15 @@ namespace App\Containers\AdditionalEducation\Models; use App\Ship\Enums\Education\FormEducation; use App\Ship\Models\Model; use App\Ship\Models\Seo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphOne; class AdditionalEducation extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\AdditionalEducationFactory::class; protected $guarded = false; diff --git a/app/Containers/AdditionalEducation/Models/AdditionalEducationCategory.php b/app/Containers/AdditionalEducation/Models/AdditionalEducationCategory.php index 71fe0fe..8321d7f 100755 --- a/app/Containers/AdditionalEducation/Models/AdditionalEducationCategory.php +++ b/app/Containers/AdditionalEducation/Models/AdditionalEducationCategory.php @@ -3,14 +3,16 @@ namespace App\Containers\AdditionalEducation\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; class AdditionalEducationCategory extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\AdditionalEducationCategoryFactory::class; protected $guarded = false; diff --git a/app/Containers/AdditionalEducation/Models/DirectionAdditionalEducation.php b/app/Containers/AdditionalEducation/Models/DirectionAdditionalEducation.php index 797ebaf..d3d9641 100755 --- a/app/Containers/AdditionalEducation/Models/DirectionAdditionalEducation.php +++ b/app/Containers/AdditionalEducation/Models/DirectionAdditionalEducation.php @@ -3,12 +3,14 @@ namespace App\Containers\AdditionalEducation\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class DirectionAdditionalEducation extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\DirectionAdditionalEducationFactory::class; protected $guarded = false; diff --git a/app/Containers/AppStructure/Models/MainSection.php b/app/Containers/AppStructure/Models/MainSection.php index 7d3df58..94792e2 100755 --- a/app/Containers/AppStructure/Models/MainSection.php +++ b/app/Containers/AppStructure/Models/MainSection.php @@ -3,12 +3,14 @@ namespace App\Containers\AppStructure\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class MainSection extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\MainSectionFactory::class; protected $guarded = false; diff --git a/app/Containers/AppStructure/Models/Page.php b/app/Containers/AppStructure/Models/Page.php index 60d9cb3..ef9c21d 100755 --- a/app/Containers/AppStructure/Models/Page.php +++ b/app/Containers/AppStructure/Models/Page.php @@ -4,13 +4,15 @@ namespace App\Containers\AppStructure\Models; use App\Ship\Models\Model; use App\Ship\Models\Seo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphOne; class Page extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\PageFactory::class; protected $guarded = false; diff --git a/app/Containers/AppStructure/Models/SubSection.php b/app/Containers/AppStructure/Models/SubSection.php index 00fb4f0..0d29d05 100755 --- a/app/Containers/AppStructure/Models/SubSection.php +++ b/app/Containers/AppStructure/Models/SubSection.php @@ -3,13 +3,15 @@ namespace App\Containers\AppStructure\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; class SubSection extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\SubSectionFactory::class; protected $guarded = false; diff --git a/app/Containers/Article/Models/Category.php b/app/Containers/Article/Models/Category.php index c8be759..1348a37 100755 --- a/app/Containers/Article/Models/Category.php +++ b/app/Containers/Article/Models/Category.php @@ -3,12 +3,14 @@ namespace App\Containers\Article\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class Category extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\CategoryFactory::class; protected $guarded = false; diff --git a/app/Containers/Article/Models/Post.php b/app/Containers/Article/Models/Post.php index cc2f624..11118f1 100755 --- a/app/Containers/Article/Models/Post.php +++ b/app/Containers/Article/Models/Post.php @@ -6,7 +6,7 @@ use App\Containers\Article\Enums\PostStatus; use App\Containers\User\Models\User; use App\Containers\Widget\Models\Slide; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\MorphOne; @@ -14,7 +14,9 @@ use Spatie\Tags\HasTags; class Post extends Model { - use HasFactory, HasTags, HasSeo; + use HasContainerFactory, HasTags, HasSeo; + + protected static string $factory = \Database\Factories\PostFactory::class; protected $guarded = false; diff --git a/app/Containers/Article/Models/Tag.php b/app/Containers/Article/Models/Tag.php index 27ec426..e04ef26 100755 --- a/app/Containers/Article/Models/Tag.php +++ b/app/Containers/Article/Models/Tag.php @@ -3,9 +3,16 @@ namespace App\Containers\Article\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class Tag extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\TagFactory::class; + + protected $casts = [ + 'name' => 'array', + 'slug' => 'array', + ]; } diff --git a/app/Containers/Dashboard/Models/IntegrationCredential.php b/app/Containers/Dashboard/Models/IntegrationCredential.php index e207f3e..44c4853 100644 --- a/app/Containers/Dashboard/Models/IntegrationCredential.php +++ b/app/Containers/Dashboard/Models/IntegrationCredential.php @@ -2,10 +2,15 @@ namespace App\Containers\Dashboard\Models; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; class IntegrationCredential extends Model { + use HasContainerFactory; + + protected static string $factory = \Database\Factories\IntegrationCredentialFactory::class; + protected $guarded = false; protected $casts = [ diff --git a/app/Containers/Education/Models/AdmissionCampaign.php b/app/Containers/Education/Models/AdmissionCampaign.php index 9ada2c2..be04a59 100755 --- a/app/Containers/Education/Models/AdmissionCampaign.php +++ b/app/Containers/Education/Models/AdmissionCampaign.php @@ -3,13 +3,15 @@ namespace App\Containers\Education\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasManyThrough; class AdmissionCampaign extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\AdmissionCampaignFactory::class; protected $guarded = false; diff --git a/app/Containers/Education/Models/AdmissionPlan.php b/app/Containers/Education/Models/AdmissionPlan.php index 0396af8..6e973c4 100755 --- a/app/Containers/Education/Models/AdmissionPlan.php +++ b/app/Containers/Education/Models/AdmissionPlan.php @@ -3,12 +3,14 @@ namespace App\Containers\Education\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; class AdmissionPlan extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\AdmissionPlanFactory::class; protected $guarded = false; diff --git a/app/Containers/Education/Models/DirectionStudy.php b/app/Containers/Education/Models/DirectionStudy.php index ee48147..2c237f2 100755 --- a/app/Containers/Education/Models/DirectionStudy.php +++ b/app/Containers/Education/Models/DirectionStudy.php @@ -5,13 +5,15 @@ namespace App\Containers\Education\Models; use App\Ship\Enums\Education\LevelEducational; use App\Ship\Models\Model; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class DirectionStudy extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\DirectionStudyFactory::class; protected $guarded = false; diff --git a/app/Containers/Education/Models/EducationalProgram.php b/app/Containers/Education/Models/EducationalProgram.php index 970f531..36db2f1 100755 --- a/app/Containers/Education/Models/EducationalProgram.php +++ b/app/Containers/Education/Models/EducationalProgram.php @@ -6,14 +6,16 @@ use App\Containers\InstituteStructure\Models\Department; use App\Ship\Enums\Education\LevelEducational; use App\Ship\Models\Model; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; class EducationalProgram extends Model { - use HasFactory, HasSeo; + use HasContainerFactory, HasSeo; + + protected static string $factory = \Database\Factories\EducationalProgramFactory::class; protected $guarded = false; diff --git a/app/Containers/Event/Models/Event.php b/app/Containers/Event/Models/Event.php index 324ad4a..deeb596 100755 --- a/app/Containers/Event/Models/Event.php +++ b/app/Containers/Event/Models/Event.php @@ -4,13 +4,15 @@ namespace App\Containers\Event\Models; use App\Ship\Models\Model; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Spatie\Tags\HasTags; class Event extends Model { - use HasFactory, HasTags, HasSeo; + use HasContainerFactory, HasTags, HasSeo; + + protected static string $factory = \Database\Factories\EventFactory::class; protected $guarded = false; diff --git a/app/Containers/Event/Models/EventCategory.php b/app/Containers/Event/Models/EventCategory.php index 64a8cef..a725afa 100755 --- a/app/Containers/Event/Models/EventCategory.php +++ b/app/Containers/Event/Models/EventCategory.php @@ -3,12 +3,14 @@ namespace App\Containers\Event\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class EventCategory extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\EventCategoryFactory::class; protected $guarded = false; diff --git a/app/Containers/InstituteStructure/Models/Department.php b/app/Containers/InstituteStructure/Models/Department.php index 1cc02da..4d20b47 100755 --- a/app/Containers/InstituteStructure/Models/Department.php +++ b/app/Containers/InstituteStructure/Models/Department.php @@ -6,13 +6,15 @@ use App\Containers\Education\Models\EducationalProgram; use App\Containers\User\Models\User; use App\Ship\Models\Model; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Department extends Model { - use HasFactory, HasSeo; + use HasContainerFactory, HasSeo; + + protected static string $factory = \Database\Factories\DepartmentFactory::class; protected $guarded = false; diff --git a/app/Containers/InstituteStructure/Models/Division.php b/app/Containers/InstituteStructure/Models/Division.php index 051e3c5..e66ab9c 100755 --- a/app/Containers/InstituteStructure/Models/Division.php +++ b/app/Containers/InstituteStructure/Models/Division.php @@ -6,11 +6,13 @@ use App\Containers\User\Models\User; use App\Ship\Contracts\SeoDescriptionInterface; use App\Ship\Models\Model; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class Division extends Model implements SeoDescriptionInterface { - use HasFactory, HasSeo; + use HasContainerFactory, HasSeo; + + protected static string $factory = \Database\Factories\DivisionFactory::class; protected $guarded = false; diff --git a/app/Containers/Schedule/Models/EducationalGroup.php b/app/Containers/Schedule/Models/EducationalGroup.php index 23b745c..0529d2d 100755 --- a/app/Containers/Schedule/Models/EducationalGroup.php +++ b/app/Containers/Schedule/Models/EducationalGroup.php @@ -4,11 +4,13 @@ namespace App\Containers\Schedule\Models; use App\Containers\InstituteStructure\Models\Faculty; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class EducationalGroup extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\EducationalGroupFactory::class; protected $guarded = false; diff --git a/app/Containers/Schedule/Models/Schedule.php b/app/Containers/Schedule/Models/Schedule.php index ed56f8c..d473fca 100755 --- a/app/Containers/Schedule/Models/Schedule.php +++ b/app/Containers/Schedule/Models/Schedule.php @@ -4,11 +4,13 @@ namespace App\Containers\Schedule\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class Schedule extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\ScheduleFactory::class; protected $guarded = false; diff --git a/app/Containers/Science/Models/AcademicJournal.php b/app/Containers/Science/Models/AcademicJournal.php index c1870e9..6877d67 100755 --- a/app/Containers/Science/Models/AcademicJournal.php +++ b/app/Containers/Science/Models/AcademicJournal.php @@ -5,12 +5,14 @@ namespace App\Containers\Science\Models; use App\Ship\Contracts\SeoDescriptionInterface; use App\Ship\Models\Model; use App\Ship\Traits\HasSeo; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Relations\HasMany; class AcademicJournal extends Model implements SeoDescriptionInterface { - use HasFactory, HasSeo; + use HasContainerFactory, HasSeo; + + protected static string $factory = \Database\Factories\AcademicJournalFactory::class; protected $guarded = false; diff --git a/app/Containers/Science/Models/JournalIssue.php b/app/Containers/Science/Models/JournalIssue.php index aeced35..c34b4e1 100755 --- a/app/Containers/Science/Models/JournalIssue.php +++ b/app/Containers/Science/Models/JournalIssue.php @@ -3,11 +3,13 @@ namespace App\Containers\Science\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class JournalIssue extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\JournalIssueFactory::class; protected $guarded = false; } diff --git a/app/Containers/User/Models/UserDetail.php b/app/Containers/User/Models/UserDetail.php index 8225e11..198bae4 100755 --- a/app/Containers/User/Models/UserDetail.php +++ b/app/Containers/User/Models/UserDetail.php @@ -3,11 +3,13 @@ namespace App\Containers\User\Models; use App\Ship\Models\Model; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; class UserDetail extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\UserDetailFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/ContactWidget.php b/app/Containers/Widget/Models/ContactWidget.php index 6b5440b..a33be32 100755 --- a/app/Containers/Widget/Models/ContactWidget.php +++ b/app/Containers/Widget/Models/ContactWidget.php @@ -2,12 +2,14 @@ namespace App\Containers\Widget\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; class ContactWidget extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\ContactWidgetFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/CustomForm.php b/app/Containers/Widget/Models/CustomForm.php index 53a58ab..15b9d2e 100755 --- a/app/Containers/Widget/Models/CustomForm.php +++ b/app/Containers/Widget/Models/CustomForm.php @@ -3,13 +3,15 @@ namespace App\Containers\Widget\Models; use App\Containers\Widget\Enums\CustomFormStatus; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; class CustomForm extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\CustomFormFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/CustomFormResponse.php b/app/Containers/Widget/Models/CustomFormResponse.php index 5b9bd85..d3d21ee 100755 --- a/app/Containers/Widget/Models/CustomFormResponse.php +++ b/app/Containers/Widget/Models/CustomFormResponse.php @@ -2,12 +2,14 @@ namespace App\Containers\Widget\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; class CustomFormResponse extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\CustomFormResponseFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/PageReferenceList.php b/app/Containers/Widget/Models/PageReferenceList.php index 87ce465..dfa389d 100755 --- a/app/Containers/Widget/Models/PageReferenceList.php +++ b/app/Containers/Widget/Models/PageReferenceList.php @@ -2,12 +2,14 @@ namespace App\Containers\Widget\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; class PageReferenceList extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\PageReferenceListFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/Slide.php b/app/Containers/Widget/Models/Slide.php index e1913f4..3d4b637 100755 --- a/app/Containers/Widget/Models/Slide.php +++ b/app/Containers/Widget/Models/Slide.php @@ -3,13 +3,15 @@ namespace App\Containers\Widget\Models; use App\Containers\Widget\Data\Factories\SlideFactory; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; class Slide extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \App\Containers\Widget\Data\Factories\SlideFactory::class; protected $guarded = false; diff --git a/app/Containers/Widget/Models/Slider.php b/app/Containers/Widget/Models/Slider.php index 0b62f6f..24a670d 100755 --- a/app/Containers/Widget/Models/Slider.php +++ b/app/Containers/Widget/Models/Slider.php @@ -2,13 +2,15 @@ namespace App\Containers\Widget\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; +use App\Ship\Traits\HasContainerFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; class Slider extends Model { - use HasFactory; + use HasContainerFactory; + + protected static string $factory = \Database\Factories\SliderFactory::class; protected $guarded = false;