From 091cae1e52841d1ce9743010ab4084b4b7d27c0d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 1 Nov 2017 23:16:22 +0100 Subject: [PATCH] Update models --- Changelog | 1 + app/Models/AnidbEpisode.php | 4 +- app/Models/AnidbInfo.php | 4 +- app/Models/AnidbTitle.php | 4 +- app/Models/Category.php | 6 +-- app/Models/DnzbFailure.php | 4 +- app/Models/Genre.php | 2 +- app/Models/Group.php | 2 +- app/Models/Invitation.php | 2 +- app/Models/MusicInfo.php | 2 +- app/Models/Predb.php | 4 +- app/Models/PredbHash.php | 2 +- app/Models/Release.php | 22 +++++------ app/Models/ReleaseComment.php | 4 +- app/Models/ReleaseExtraFull.php | 2 +- app/Models/ReleaseFile.php | 2 +- app/Models/ReleaseNfo.php | 2 +- app/Models/ReleasesGroups.php | 35 ------------------ app/Models/RoleExcludedCategory.php | 4 +- app/Models/SteamApps.php | 57 ----------------------------- app/Models/User.php | 16 ++++---- app/Models/UserDownload.php | 4 +- app/Models/UserExcludedCategory.php | 4 +- app/Models/UserRequest.php | 2 +- app/Models/UserRole.php | 4 +- app/Models/UsersRelease.php | 4 +- 26 files changed, 54 insertions(+), 145 deletions(-) delete mode 100644 app/Models/ReleasesGroups.php delete mode 100644 app/Models/SteamApps.php diff --git a/Changelog b/Changelog index 44c5ef7b2..6f5267206 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-11-01 DariusIII + * Chg: Update models * Chg: Send 503 Service Unavailable header in showApiError function * Chg: Further change some queries to ease unnecessary loading of releases table columns that are not used later * Chg: Load only required columns from releases table for api searches diff --git a/app/Models/AnidbEpisode.php b/app/Models/AnidbEpisode.php index 3bfbb39bf..073a6d0fc 100644 --- a/app/Models/AnidbEpisode.php +++ b/app/Models/AnidbEpisode.php @@ -33,11 +33,11 @@ class AnidbEpisode extends Model public function title() { - return $this->belongsTo('App\Models\AnidbTitle', 'anidbid'); + return $this->belongsTo(AnidbTitle::class, 'anidbid'); } public function info() { - return $this->hasMany('App\Modles\AnidbInfo', 'anidbid'); + return $this->hasMany(AnidbInfo::class, 'anidbid'); } } diff --git a/app/Models/AnidbInfo.php b/app/Models/AnidbInfo.php index dd460daa6..eaf41c4c1 100644 --- a/app/Models/AnidbInfo.php +++ b/app/Models/AnidbInfo.php @@ -33,11 +33,11 @@ class AnidbInfo extends Model public function title() { - return $this->belongsTo('App\Models\AnidbTitle', 'anidbid'); + return $this->belongsTo(AnidbTitle::class, 'anidbid'); } public function episode() { - return $this->belongsTo('App\Models\AnidbEpisode', 'anidbid'); + return $this->belongsTo(AnidbEpisode::class, 'anidbid'); } } diff --git a/app/Models/AnidbTitle.php b/app/Models/AnidbTitle.php index e831fd80a..c439fcf7a 100644 --- a/app/Models/AnidbTitle.php +++ b/app/Models/AnidbTitle.php @@ -33,11 +33,11 @@ class AnidbTitle extends Model public function episode() { - return $this->hasMany('App\Models\AnidbEpisode', 'anidbid'); + return $this->hasMany(AnidbEpisode::class, 'anidbid'); } public function info() { - return $this->hasMany('App\Models\AnidbInfo', 'anidbid'); + return $this->hasMany(AnidbInfo::class, 'anidbid'); } } diff --git a/app/Models/Category.php b/app/Models/Category.php index 10df3ba51..d1734f4ca 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -23,7 +23,7 @@ class Category extends Model public function releases() { - return $this->hasMany('App\Models\Release', 'categories_id'); + return $this->hasMany(Release::class, 'categories_id'); } public function parent() @@ -38,11 +38,11 @@ class Category extends Model public function userExcludedCategory() { - return $this->hasMany('App\Models\UserExcludedCategory', 'categories_id'); + return $this->hasMany(UserExcludedCategory::class, 'categories_id'); } public function roleExcludedCategory() { - return $this->belongsTo('App\Models\RoleExcludedCategory', 'categories_id'); + return $this->belongsTo(RoleExcludedCategory::class, 'categories_id'); } } diff --git a/app/Models/DnzbFailure.php b/app/Models/DnzbFailure.php index 33932a8e0..1ee69039d 100644 --- a/app/Models/DnzbFailure.php +++ b/app/Models/DnzbFailure.php @@ -35,11 +35,11 @@ class DnzbFailure extends Model public function release() { - return $this->belongsTo('App\Models\Release', 'release_id'); + return $this->belongsTo(Release::class, 'release_id'); } public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } } diff --git a/app/Models/Genre.php b/app/Models/Genre.php index 0b1c3c385..7cda6210c 100644 --- a/app/Models/Genre.php +++ b/app/Models/Genre.php @@ -22,6 +22,6 @@ class Genre extends Model public function music() { - return $this->hasMany('App\Models\MusicInfo', 'genres_id'); + return $this->hasMany(MusicInfo::class, 'genres_id'); } } diff --git a/app/Models/Group.php b/app/Models/Group.php index c710674a7..5d6190cad 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -23,6 +23,6 @@ class Group extends Model public function release() { - return $this->hasMany('App\Models\Release', 'groups_id'); + return $this->hasMany(Release::class, 'groups_id'); } } diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php index c04d83ca5..6189723a3 100644 --- a/app/Models/Invitation.php +++ b/app/Models/Invitation.php @@ -23,6 +23,6 @@ class Invitation extends Model public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } } diff --git a/app/Models/MusicInfo.php b/app/Models/MusicInfo.php index 88943c495..8236a5ca7 100644 --- a/app/Models/MusicInfo.php +++ b/app/Models/MusicInfo.php @@ -27,6 +27,6 @@ class MusicInfo extends Model public function genre() { - return $this->belongsTo('App\Models\Genre', 'genres_id'); + return $this->belongsTo(Genre::class, 'genres_id'); } } diff --git a/app/Models/Predb.php b/app/Models/Predb.php index f30083a0b..aea39540f 100644 --- a/app/Models/Predb.php +++ b/app/Models/Predb.php @@ -32,11 +32,11 @@ class Predb extends Model public function hash() { - return $this->hasMany('App\Models\PredbHash', 'predb_id'); + return $this->hasMany(PredbHash::class, 'predb_id'); } public function release() { - return $this->hasOne('App\Models\Release', 'predb_id'); + return $this->hasMany(Release::class, 'predb_id'); } } diff --git a/app/Models/PredbHash.php b/app/Models/PredbHash.php index 3d0ce0e70..bb948ac03 100644 --- a/app/Models/PredbHash.php +++ b/app/Models/PredbHash.php @@ -36,6 +36,6 @@ class PredbHash extends Model */ public function predb() { - return $this->belongsTo('App\Models\Predb', 'predb_id'); + return $this->belongsTo(Predb::class, 'predb_id'); } } diff --git a/app/Models/Release.php b/app/Models/Release.php index b21838d25..168fb142d 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -26,7 +26,7 @@ class Release extends Model */ public function group() { - return $this->belongsTo('App\Models\Group', 'groups_id'); + return $this->belongsTo(Group::class, 'groups_id'); } /** @@ -34,7 +34,7 @@ class Release extends Model */ public function download() { - return $this->hasMany('App\Models\UserDownload', 'releases_id'); + return $this->hasMany(UserDownload::class, 'releases_id'); } /** @@ -42,12 +42,12 @@ class Release extends Model */ public function userRelease() { - return $this->hasMany('App\Models\UsersRelease', 'releases_id'); + return $this->hasMany(UsersRelease::class, 'releases_id'); } public function file() { - return $this->hasMany('App\Models\ReleaseFile', 'releases_id'); + return $this->hasMany(ReleaseFile::class, 'releases_id'); } /** @@ -55,7 +55,7 @@ class Release extends Model */ public function category() { - return $this->belongsTo('App\Models\Category', 'categories_id'); + return $this->belongsTo(Category::class, 'categories_id'); } /** @@ -63,7 +63,7 @@ class Release extends Model */ public function predb() { - return $this->belongsTo('App\Models\Predb', 'predb_id'); + return $this->belongsTo(Predb::class, 'predb_id'); } /** @@ -71,15 +71,15 @@ class Release extends Model */ public function failed() { - return $this->hasMany('App\Models\DnzbFailure', 'release_id'); + return $this->hasMany(DnzbFailure::class, 'release_id'); } /** - * @return \Illuminate\Database\Eloquent\Relations\HasOne + * @return \Illuminate\Database\Eloquent\Relations\HasMany */ public function releaseExtra() { - return $this->hasOne('App\Models\Release', 'releases_id'); + return $this->hasMany(ReleaseExtraFull::class, 'releases_id'); } /** @@ -87,7 +87,7 @@ class Release extends Model */ public function nfo() { - return $this->hasOne('App\Models\ReleaseNfo', 'releases_id'); + return $this->hasOne(ReleaseNfo::class, 'releases_id'); } /** @@ -95,6 +95,6 @@ class Release extends Model */ public function comment() { - return $this->hasMany('App\Models\ReleaseComment', 'releases_id'); + return $this->hasMany(ReleaseComment::class, 'releases_id'); } } diff --git a/app/Models/ReleaseComment.php b/app/Models/ReleaseComment.php index d7def94d5..f293344c8 100644 --- a/app/Models/ReleaseComment.php +++ b/app/Models/ReleaseComment.php @@ -21,7 +21,7 @@ class ReleaseComment extends Model */ public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } /** @@ -29,6 +29,6 @@ class ReleaseComment extends Model */ public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } } diff --git a/app/Models/ReleaseExtraFull.php b/app/Models/ReleaseExtraFull.php index aec233ad7..463c0e40a 100644 --- a/app/Models/ReleaseExtraFull.php +++ b/app/Models/ReleaseExtraFull.php @@ -38,6 +38,6 @@ class ReleaseExtraFull extends Model public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } } diff --git a/app/Models/ReleaseFile.php b/app/Models/ReleaseFile.php index d8bfd9d75..c954feb40 100644 --- a/app/Models/ReleaseFile.php +++ b/app/Models/ReleaseFile.php @@ -23,6 +23,6 @@ class ReleaseFile extends Model public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } } diff --git a/app/Models/ReleaseNfo.php b/app/Models/ReleaseNfo.php index d35b20049..7e887b295 100644 --- a/app/Models/ReleaseNfo.php +++ b/app/Models/ReleaseNfo.php @@ -25,6 +25,6 @@ class ReleaseNfo extends Model public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } } diff --git a/app/Models/ReleasesGroups.php b/app/Models/ReleasesGroups.php deleted file mode 100644 index 8541495ea..000000000 --- a/app/Models/ReleasesGroups.php +++ /dev/null @@ -1,35 +0,0 @@ -. - * @author niel - * @copyright 2016 nZEDb - */ - -namespace App\Models; - -use Illuminate\Database\Eloquent\Model; - -class ReleasesGroups extends Model -{ - protected $table = 'releases_groups'; - - public $incrementing = false; - - public $timestamps = false; - - public $dateFormat = false; - - protected $primaryKey = ['releases_id', 'groups_id']; -} diff --git a/app/Models/RoleExcludedCategory.php b/app/Models/RoleExcludedCategory.php index e7caeed62..add32ea14 100644 --- a/app/Models/RoleExcludedCategory.php +++ b/app/Models/RoleExcludedCategory.php @@ -12,11 +12,11 @@ class RoleExcludedCategory extends Model public function role() { - return $this->belongsTo('App\Models\UserRole', 'user_roles_id'); + return $this->belongsTo(UserRole::class, 'user_roles_id'); } public function category() { - return $this->hasMany('App\Models\Category', 'categories_id'); + return $this->hasMany(Category::class, 'categories_id'); } } diff --git a/app/Models/SteamApps.php b/app/Models/SteamApps.php deleted file mode 100644 index add3d3acb..000000000 --- a/app/Models/SteamApps.php +++ /dev/null @@ -1,57 +0,0 @@ -. - * @author DariusIII - * @copyright 2016 NNTmux/nZEDb - */ - -namespace App\Models; - -use Illuminate\Database\Eloquent\Model; - -class SteamApps extends Model -{ - /** - * @var string - */ - protected $table = 'steam_apps'; - - /** - * @var bool - */ - public $timestamps = false; - - /** - * @var bool - */ - public $dateFormat = false; - - /** - * @var array - */ - protected $fillable = ['name', 'appid']; - - /** - * @var array - */ - protected $primaryKey = 'name'; - - protected $keyType = 'string'; - - /** - * @var bool - */ - public $incrementing = false; -} diff --git a/app/Models/User.php b/app/Models/User.php index 3feae5748..5ca4c7ac0 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -34,7 +34,7 @@ class User extends Authenticatable */ public function role() { - return $this->belongsTo('App\Models\UserRole', 'user_roles_id'); + return $this->belongsTo(UserRole::class, 'user_roles_id'); } /** @@ -42,7 +42,7 @@ class User extends Authenticatable */ public function request() { - return $this->hasMany('App\Models\UserRequest', 'users_id'); + return $this->hasMany(UserRequest::class, 'users_id'); } /** @@ -50,7 +50,7 @@ class User extends Authenticatable */ public function download() { - return $this->hasMany('App\Models\UserDownload', 'users_id'); + return $this->hasMany(UserDownload::class, 'users_id'); } /** @@ -58,7 +58,7 @@ class User extends Authenticatable */ public function release() { - return $this->hasMany('\App\Models\UsersRelease', 'users_id'); + return $this->hasMany(UsersRelease::class, 'users_id'); } /** @@ -66,7 +66,7 @@ class User extends Authenticatable */ public function invitation() { - return $this->hasMany('App\Models\Invitation', 'users_id'); + return $this->hasMany(Invitation::class, 'users_id'); } /** @@ -74,7 +74,7 @@ class User extends Authenticatable */ public function failedRelease() { - return $this->hasMany('App\Models\DnzbFailure', 'users_id'); + return $this->hasMany(DnzbFailure::class, 'users_id'); } /** @@ -82,7 +82,7 @@ class User extends Authenticatable */ public function excludedCategory() { - return $this->hasMany('App\Models\UserExcludedCategory', 'users_id'); + return $this->hasMany(UserExcludedCategory::class, 'users_id'); } /** @@ -90,7 +90,7 @@ class User extends Authenticatable */ public function comment() { - return $this->hasMany('App\Models\ReleaseComment', 'users_id'); + return $this->hasMany(ReleaseComment::class, 'users_id'); } protected static function boot(): void diff --git a/app/Models/UserDownload.php b/app/Models/UserDownload.php index b1a83cc0e..0a6a8a5ad 100644 --- a/app/Models/UserDownload.php +++ b/app/Models/UserDownload.php @@ -23,11 +23,11 @@ class UserDownload extends Model public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } } diff --git a/app/Models/UserExcludedCategory.php b/app/Models/UserExcludedCategory.php index bfaf1bedb..de10fa6ca 100644 --- a/app/Models/UserExcludedCategory.php +++ b/app/Models/UserExcludedCategory.php @@ -12,11 +12,11 @@ class UserExcludedCategory extends Model public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } public function category() { - return $this->belongsTo('App\Models\Category', 'categories_id'); + return $this->belongsTo(Category::class, 'categories_id'); } } diff --git a/app/Models/UserRequest.php b/app/Models/UserRequest.php index 6699560be..4bcd5cb03 100644 --- a/app/Models/UserRequest.php +++ b/app/Models/UserRequest.php @@ -28,6 +28,6 @@ class UserRequest extends Model public function user() { - return $this->belongsTo('App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } } diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php index a65485d13..b0e403d65 100644 --- a/app/Models/UserRole.php +++ b/app/Models/UserRole.php @@ -26,11 +26,11 @@ class UserRole extends Model */ public function users() { - return $this->hasMany('App\Models\User', 'user_roles_id'); + return $this->hasMany(User::class, 'user_roles_id'); } public function roleExcludedCategory() { - return $this->hasMany('App\Models\RoleExcludedCategory', 'user_roles_id'); + return $this->hasMany(RoleExcludedCategory::class, 'user_roles_id'); } } diff --git a/app/Models/UsersRelease.php b/app/Models/UsersRelease.php index 7a22e9eea..d5fe48936 100644 --- a/app/Models/UsersRelease.php +++ b/app/Models/UsersRelease.php @@ -18,11 +18,11 @@ class UsersRelease extends Model public function user() { - return $this->belongsTo('\App\Models\User', 'users_id'); + return $this->belongsTo(User::class, 'users_id'); } public function release() { - return $this->belongsTo('App\Models\Release', 'releases_id'); + return $this->belongsTo(Release::class, 'releases_id'); } }