diff --git a/app/Http/Controllers/Api/ContentApiController.php b/app/Http/Controllers/Api/ContentApiController.php index 81e53e5..6b261ec 100644 --- a/app/Http/Controllers/Api/ContentApiController.php +++ b/app/Http/Controllers/Api/ContentApiController.php @@ -22,7 +22,7 @@ class ContentApiController extends Controller public function settings(): JsonResponse { - $settings = Cache::remember('api_all_settings', 60, fn () => WebsiteSetting::all()->pluck('value', 'key')); + $settings = Cache::remember('api_all_settings', 60, fn () => WebsiteSetting::pluck('value', 'key')); return response()->json(['data' => $settings]); } diff --git a/app/Http/Controllers/Articles/ArticleController.php b/app/Http/Controllers/Articles/ArticleController.php index 7534c43..59e6abf 100755 --- a/app/Http/Controllers/Articles/ArticleController.php +++ b/app/Http/Controllers/Articles/ArticleController.php @@ -29,6 +29,8 @@ class ArticleController extends Controller public function show(WebsiteArticle $article): View { + $article->load('user:id,username,look'); + $reactions = $article->reactions() ->with('user:id,username') ->get(); diff --git a/app/Http/Controllers/Miscellaneous/InstallationController.php b/app/Http/Controllers/Miscellaneous/InstallationController.php index 950bc30..a8b8630 100755 --- a/app/Http/Controllers/Miscellaneous/InstallationController.php +++ b/app/Http/Controllers/Miscellaneous/InstallationController.php @@ -111,7 +111,8 @@ class InstallationController extends Controller private function getSettingsForStep(int $step): Collection { - $settingsData = array_chunk(WebsiteSetting::all()->pluck('key')->toArray(), (int) ceil(WebsiteSetting::count() / 4)); + $allKeys = WebsiteSetting::pluck('key')->toArray(); + $settingsData = array_chunk($allKeys, (int) ceil(count($allKeys) / 4)); $settings = match ($step) { 1 => $settingsData[0] ?? [], diff --git a/app/Models/Articles/WebsiteArticle.php b/app/Models/Articles/WebsiteArticle.php index f12b3a2..f191708 100755 --- a/app/Models/Articles/WebsiteArticle.php +++ b/app/Models/Articles/WebsiteArticle.php @@ -44,10 +44,6 @@ class WebsiteArticle extends Model use BelongsToUser; use HasSlug, \Illuminate\Database\Eloquent\Factories\HasFactory, SoftDeletes; - /** @var array */ - #[\Override] - protected $with = ['user']; - protected static function newFactory() { return WebsiteArticleFactory::new(); diff --git a/app/Models/Help/WebsiteHelpCenterTicket.php b/app/Models/Help/WebsiteHelpCenterTicket.php index 72bda68..2eb4912 100755 --- a/app/Models/Help/WebsiteHelpCenterTicket.php +++ b/app/Models/Help/WebsiteHelpCenterTicket.php @@ -41,10 +41,6 @@ class WebsiteHelpCenterTicket extends Model #[\Override] protected $guarded = ['id', 'created_at', 'updated_at', 'user_id', 'status', 'subject', 'category_id']; - /** @var array */ - #[\Override] - protected $with = ['user', 'category']; - #[\Override] public $timestamps = false; diff --git a/app/Models/RadioShout.php b/app/Models/RadioShout.php index af21190..70e599c 100755 --- a/app/Models/RadioShout.php +++ b/app/Models/RadioShout.php @@ -13,10 +13,6 @@ class RadioShout extends Model use BelongsToUser; use HasFactory; - /** @var array */ - #[\Override] - protected $with = ['user']; - #[\Override] protected $fillable = [ 'user_id', diff --git a/database/migrations/2022_08_25_225959_change_user_id_on_website_articles_table.php b/database/migrations/2022_08_25_225959_change_user_id_on_website_articles_table.php index ad66388..cdf2c9a 100755 --- a/database/migrations/2022_08_25_225959_change_user_id_on_website_articles_table.php +++ b/database/migrations/2022_08_25_225959_change_user_id_on_website_articles_table.php @@ -13,4 +13,12 @@ return new class extends Migration $table->foreign('user_id')->references('id')->on('users')->cascadeOnDelete(); }); } + + public function down(): void + { + Schema::table('website_articles', function (Blueprint $table) { + $table->dropForeign(['user_id']); + $table->string('user_id')->change(); + }); + } }; diff --git a/database/migrations/2024_06_16_184358_change_value_column_type_on_website_settings_table.php b/database/migrations/2024_06_16_184358_change_value_column_type_on_website_settings_table.php index 6ce48aa..fa85551 100755 --- a/database/migrations/2024_06_16_184358_change_value_column_type_on_website_settings_table.php +++ b/database/migrations/2024_06_16_184358_change_value_column_type_on_website_settings_table.php @@ -12,4 +12,11 @@ return new class extends Migration $table->text('value')->change(); }); } + + public function down(): void + { + Schema::table('website_settings', function (Blueprint $table) { + $table->string('value')->change(); + }); + } }; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 88c370a..a6c12e2 100755 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -31,13 +31,27 @@ class DatabaseSeeder extends Seeder WebsiteRuleCategorySeeder::class, WebsiteRuleSeeder::class, WebsiteHelperCenterCategorySeeder::class, - WebsiteHelperCenterCategorySeeder::class, // Values WebsiteRareValuesCategorySeeder::class, // Housekeeping permissions HousekeepingPermissionSeeder::class, + + // Features + WebsiteArticleFeatureSeeder::class, + + // Games + GameRankSeeder::class, + DailyChallengeSeeder::class, + + // Radio + RadioSettingsSeeder::class, + RadioContestSeeder::class, + RadioGiveawaySeeder::class, + RadioListenerPointSeeder::class, + RadioSongRequestSeeder::class, + RadioSongVoteSeeder::class, ]); // \App\Models\User::factory(10)->create();