refactor: use eloquent relations directly

HDInnovations · Aug 17, 2024 · 165f161 · 165f161
1 parent 498c4ab
commit 165f161
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 105 deletions.
diff --git a/app/Helpers/TorrentHelper.php b/app/Helpers/TorrentHelper.php
@@ -79,15 +79,15 @@ public static function approveHelper(int $id): void
         switch (true) {
             case $torrent->category->movie_meta:
                 User::query()
-                    ->whereHas('wishes', fn ($query) => $query->where('movie_id', '=', $torrent->tmdb))
+                    ->whereRelation('wishes', 'movie_id', '=', $torrent->tmdb)
                     ->get()
                     ->each
                     ->notify(new NewWishListNotice($torrent));
 
                 break;
             case $torrent->category->tv_meta:
                 User::query()
-                    ->whereHas('wishes', fn ($query) => $query->where('tv_id', '=', $torrent->tmdb))
+                    ->whereRelation('wishes', 'tv_id', '=', $torrent->tmdb)
                     ->get()
                     ->each
                     ->notify(new NewWishListNotice($torrent));

diff --git a/app/Http/Controllers/Staff/AuditController.php b/app/Http/Controllers/Staff/AuditController.php
@@ -31,9 +31,7 @@ class AuditController extends Controller
     public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     {
         return view('Staff.audit.index', ['staffActivities' => Audit::with(['user', 'user.group'])
-            ->whereHas('user.group', function ($query): void {
-                $query->where('is_modo', true);
-            })
+            ->whereRelation('user.group', 'is_modo', '=', true)
             ->where('action', '!=', 'create') // Exclude audits with action 'create'
             ->select('user_id')
             ->selectRaw('COUNT(*) as total_actions')

diff --git a/app/Http/Controllers/Staff/InternalController.php b/app/Http/Controllers/Staff/InternalController.php
@@ -37,7 +37,7 @@ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vie
             'internalGroups' => Internal::orderBy('name')->get(),
             'internalUsers'  => User::with(['group', 'internals'])
                 ->withCount('torrents as total_uploads')
-                ->whereIn('group_id', Group::select('id')->where('is_internal', '=', true))
+                ->whereRelation('group', 'is_internal', '=', true)
                 ->orWhereHas('internals')
                 // Count recent uploads for current user
                 ->withCount(['torrents as recent_uploads' => fn ($query) => $query

diff --git a/app/Http/Controllers/Staff/UploaderController.php b/app/Http/Controllers/Staff/UploaderController.php
@@ -17,7 +17,6 @@
 namespace App\Http\Controllers\Staff;
 
 use App\Http\Controllers\Controller;
-use App\Models\Group;
 use App\Models\User;
 
 class UploaderController extends Controller
@@ -30,7 +29,7 @@ public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vie
         return view('Staff.uploader.index', [
             'uploaders' => User::with(['group'])
                 ->withCount('torrents as total_uploads')
-                ->whereIn('group_id', Group::select('id')->where('is_uploader', '=', true))
+                ->whereRelation('group', 'is_uploader', '=', true)
                 // Count recent uploads for current user
                 ->withCount(['torrents as recent_uploads' => fn ($query) => $query
                     ->where('created_at', '>', now()->subDays(60))

diff --git a/app/Http/Controllers/StatsController.php b/app/Http/Controllers/StatsController.php
@@ -59,7 +59,7 @@ public function uploaded(): \Illuminate\Contracts\View\Factory|\Illuminate\View\
     {
         return view('stats.users.uploaded', [
             'uploaded' => User::orderByDesc('uploaded')
-                ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+                ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
                 ->take(100)
                 ->get(),
         ]);
@@ -74,7 +74,7 @@ public function downloaded(): \Illuminate\Contracts\View\Factory|\Illuminate\Vie
     {
         return view('stats.users.downloaded', [
             'downloaded' => User::orderByDesc('downloaded')
-                ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+                ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
                 ->take(100)
                 ->get(),
         ]);
@@ -139,7 +139,7 @@ public function bankers(): \Illuminate\Contracts\View\Factory|\Illuminate\View\V
     {
         return view('stats.users.bankers', [
             'bankers' => User::orderByDesc('seedbonus')
-                ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+                ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
                 ->take(100)
                 ->get(),
         ]);

diff --git a/app/Http/Controllers/YearlyOverviewController.php b/app/Http/Controllers/YearlyOverviewController.php
@@ -16,7 +16,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Category;
 use App\Models\Comment;
 use App\Models\Group;
 use App\Models\History;
@@ -76,7 +75,7 @@ public function show(int $year): \Illuminate\Contracts\View\View|\Illuminate\Fou
                         fn ($join) => $join->on('torrents.id', '=', 'h.torrent_id')
                     )
                     ->where('tmdb', '!=', 0)
-                    ->whereIn('category_id', Category::select('id')->where('movie_meta', '=', true))
+                    ->whereRelation('category', 'movie_meta', '=', true)
                     ->groupBy('tmdb')
                     ->orderByDesc('download_count')
                     ->take(10)
@@ -99,7 +98,7 @@ public function show(int $year): \Illuminate\Contracts\View\View|\Illuminate\Fou
                         fn ($join) => $join->on('torrents.id', '=', 'h.torrent_id')
                     )
                     ->where('tmdb', '!=', 0)
-                    ->whereIn('category_id', Category::select('id')->where('movie_meta', '=', true))
+                    ->whereRelation('category', 'movie_meta', '=', true)
                     ->groupBy('tmdb')
                     ->orderBy('download_count')
                     ->take(5)
@@ -122,7 +121,7 @@ public function show(int $year): \Illuminate\Contracts\View\View|\Illuminate\Fou
                         fn ($join) => $join->on('torrents.id', '=', 'h.torrent_id')
                     )
                     ->where('tmdb', '!=', 0)
-                    ->whereIn('category_id', Category::select('id')->where('tv_meta', '=', true))
+                    ->whereRelation('category', 'tv_meta', '=', true)
                     ->groupBy('tmdb')
                     ->orderByDesc('download_count')
                     ->take(10)
@@ -145,7 +144,7 @@ public function show(int $year): \Illuminate\Contracts\View\View|\Illuminate\Fou
                         fn ($join) => $join->on('torrents.id', '=', 'h.torrent_id')
                     )
                     ->where('tmdb', '!=', 0)
-                    ->whereIn('category_id', Category::select('id')->where('tv_meta', '=', true))
+                    ->whereRelation('category', 'tv_meta', '=', true)
                     ->groupBy('tmdb')
                     ->orderBy('download_count')
                     ->take(5)
@@ -243,15 +242,15 @@ public function show(int $year): \Illuminate\Contracts\View\View|\Illuminate\Fou
                 fn () => Torrent::query()
                     ->where('created_at', '>=', $year.'-01-01 00:00:00')
                     ->where('created_at', '<=', $year.'-12-31 23:59:59')
-                    ->whereIn('category_id', Category::select('id')->where('movie_meta', '=', true))
+                    ->whereRelation('category', 'movie_meta', '=', true)
                     ->count()
             ),
             'tvUploads' => cache()->rememberForever(
                 'yearly-overview:'.$year.':tv-uploads',
                 fn () => Torrent::query()
                     ->where('created_at', '>=', $year.'-01-01 00:00:00')
                     ->where('created_at', '<=', $year.'-12-31 23:59:59')
-                    ->whereIn('category_id', Category::select('id')->where('tv_meta', '=', true))
+                    ->whereRelation('category', 'tv_meta', '=', true)
                     ->count()
             ),
             'totalUploads' => cache()->rememberForever(

diff --git a/app/Http/Livewire/ConversationSearch.php b/app/Http/Livewire/ConversationSearch.php
@@ -17,7 +17,6 @@
 namespace App\Http\Livewire;
 
 use App\Models\Conversation;
-use App\Models\User;
 use App\Traits\LivewireSort;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Rule;
@@ -76,8 +75,7 @@ final public function conversations(): \Illuminate\Pagination\LengthAwarePaginat
                 fn ($query) => $query
                     ->whereHas(
                         'messages',
-                        fn ($query) => $query
-                            ->whereIn('sender_id', User::select('id')->where('username', 'LIKE', $this->username))
+                        fn ($query) => $query->whereRelation('sender', 'username', 'LIKE', $this->username)
                     )
             )
             ->when(

diff --git a/app/Http/Livewire/ForumCategoryTopicSearch.php b/app/Http/Livewire/ForumCategoryTopicSearch.php
@@ -16,7 +16,6 @@
 
 namespace App\Http\Livewire;
 
-use App\Models\Forum;
 use App\Models\ForumCategory;
 use App\Models\Topic;
 use Livewire\Attributes\Computed;
@@ -77,7 +76,7 @@ final public function topics(): \Illuminate\Pagination\LengthAwarePaginator
                 'forum',
                 'reads' => fn ($query) => $query->whereBelongsto(auth()->user()),
             ])
-            ->whereIn('forum_id', Forum::where('forum_category_id', '=', $this->category->id)->select('id'))
+            ->whereRelation('forum', 'forum_category_id', '=', $this->category->id)
             ->authorized(canReadTopic: true)
             ->when($this->search !== '', fn ($query) => $query->where('name', 'LIKE', '%'.$this->search.'%'))
             ->when($this->label !== '', fn ($query) => $query->where($this->label, '=', 1))

diff --git a/app/Http/Livewire/PersonCredit.php b/app/Http/Livewire/PersonCredit.php
@@ -17,7 +17,6 @@
 namespace App\Http\Livewire;
 
 use App\Enums\Occupation;
-use App\Models\Category;
 use App\Models\Person;
 use App\Models\Torrent;
 use App\Models\User;
@@ -197,12 +196,12 @@ final public function medias(): \Illuminate\Support\Collection
                 fn ($query) => $query
                     ->where(
                         fn ($query) => $query
-                            ->whereIn('category_id', Category::select('id')->where('movie_meta', '=', 1))
+                            ->whereRelation('category', 'movie_meta', '=', 1)
                             ->whereIntegerInRaw('tmdb', $movieIds)
                     )
                     ->orWhere(
                         fn ($query) => $query
-                            ->whereIn('category_id', Category::select('id')->where('tv_meta', '=', 1))
+                            ->whereRelation('category', 'tv_meta', '=', 1)
                             ->whereIntegerInRaw('tmdb', $tvIds)
                     )
             )

diff --git a/app/Http/Livewire/SimilarTorrent.php b/app/Http/Livewire/SimilarTorrent.php
@@ -116,11 +116,11 @@ final public function torrents(): \Illuminate\Support\Collection
             ])
             ->when(
                 $this->category->movie_meta,
-                fn ($query) => $query->whereHas('category', fn ($query) => $query->where('movie_meta', '=', 1)),
+                fn ($query) => $query->whereRelation('category', 'movie_meta', '=', 1),
             )
             ->when(
                 $this->category->tv_meta,
-                fn ($query) => $query->whereHas('category', fn ($query) => $query->where('tv_meta', '=', 1)),
+                fn ($query) => $query->whereRelation('category', 'tv_meta', '=', 1),
             )
             ->when(
                 $this->category->tv_meta || $this->category->movie_meta,

diff --git a/app/Http/Livewire/SubtitleSearch.php b/app/Http/Livewire/SubtitleSearch.php
@@ -17,8 +17,6 @@
 namespace App\Http\Livewire;
 
 use App\Models\Subtitle;
-use App\Models\Torrent;
-use App\Models\User;
 use App\Traits\LivewireSort;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Url;
@@ -70,16 +68,12 @@ final public function subtitles(): \Illuminate\Pagination\LengthAwarePaginator
         return Subtitle::with(['user.group', 'torrent.category', 'language'])
             ->whereHas('torrent')
             ->when($this->search, fn ($query) => $query->where('title', 'like', '%'.$this->search.'%'))
-            ->when($this->categories, function ($query) {
-                $torrents = Torrent::whereIntegerInRaw('category_id', $this->categories)->pluck('id');
-
-                return $query->whereIntegerInRaw('torrent_id', $torrents);
-            })
+            ->when($this->categories, fn ($query) => $query->whereHas('torrent', fn ($query) => $query->whereIn('category_id', $this->categories)))
             ->when($this->language, fn ($query) => $query->where('language_id', '=', $this->language))
             ->when(
                 $this->username,
                 fn ($query) => $query
-                    ->whereIn('user_id', User::select('id')->where('username', '=', $this->username))
+                    ->whereRelation('user', 'username', '=', $this->username)
                     ->when(
                         !auth()->user()->group->is_modo,
                         fn ($query) => $query->where(fn ($query) => $query->where('anon', '=', false)->orWhere('user_id', '=', auth()->id()))

diff --git a/app/Http/Livewire/Top10.php b/app/Http/Livewire/Top10.php
@@ -79,7 +79,7 @@ final public function works(): Collection
 
         return cache()->remember(
             'top10-'.$this->interval.'-'.($this->from ?? '').'-'.($this->until ?? '').'-'.$this->metaType,
-            3600,
+            0, //3600,
             fn () => Torrent::query()
                 ->when(
                     $this->metaType === 'tv_meta',
@@ -99,7 +99,7 @@ final public function works(): Collection
                 ->when($this->interval === 'year', fn ($query) => $query->whereBetween('history.completed_at', [now()->subYear(), now()]))
                 ->when($this->interval === 'all', fn ($query) => $query->whereNotNull('history.completed_at'))
                 ->when($this->interval === 'custom', fn ($query) => $query->whereBetween('history.completed_at', [$this->from ?: now(), $this->until ?: now()]))
-                ->whereIn('torrents.category_id', Category::select('id')->where($this->metaType, '=', true))
+                ->whereRelation('category', $this->metaType, '=', true)
                 // Small torrents screw the stats since users download them only to farm bon.
                 ->where('torrents.size', '>', 1024 * 1024 * 1024)
                 ->groupBy('tmdb')

diff --git a/app/Http/Livewire/TopUsers.php b/app/Http/Livewire/TopUsers.php
@@ -5,7 +5,6 @@
 namespace App\Http\Livewire;
 
 use App\Models\Comment;
-use App\Models\Group;
 use App\Models\History;
 use App\Models\Peer;
 use App\Models\Post;
@@ -61,7 +60,7 @@ final public function uploaded(): \Illuminate\Support\Collection
         return User::select(['id', 'group_id', 'username', 'uploaded', 'image'])
             ->with('group')
             ->where('id', '!=', User::SYSTEM_USER_ID)
-            ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+            ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
             ->orderByDesc('uploaded')
             ->take(8)
             ->get();
@@ -76,7 +75,7 @@ final public function downloaded(): \Illuminate\Support\Collection
         return User::select(['id', 'group_id', 'username', 'downloaded', 'image'])
             ->with('group')
             ->where('id', '!=', User::SYSTEM_USER_ID)
-            ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+            ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
             ->orderByDesc('downloaded')
             ->take(8)
             ->get();
@@ -108,7 +107,7 @@ final public function seedtimes(): \Illuminate\Support\Collection
         return User::withSum('history as seedtime', 'seedtime')
             ->with('group')
             ->where('id', '!=', User::SYSTEM_USER_ID)
-            ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+            ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
             ->orderByDesc('seedtime')
             ->take(8)
             ->get();
@@ -123,7 +122,7 @@ final public function served(): \Illuminate\Support\Collection
         return User::withCount('uploadSnatches')
             ->with('group')
             ->where('id', '!=', User::SYSTEM_USER_ID)
-            ->whereNotIn('group_id', Group::select('id')->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
+            ->whereDoesntHave('group', fn ($query) => $query->whereIn('slug', ['banned', 'validating', 'disabled', 'pruned']))
             ->orderByDesc('upload_snatches_count')
             ->take(8)
             ->get();

diff --git a/app/Http/Livewire/TorrentRequestSearch.php b/app/Http/Livewire/TorrentRequestSearch.php
@@ -21,8 +21,6 @@
 use App\Models\Movie;
 use App\Models\Resolution;
 use App\Models\TorrentRequest;
-use App\Models\TorrentRequestBounty;
-use App\Models\TorrentRequestClaim;
 use App\Models\Type;
 use App\Traits\CastLivewireProperties;
 use App\Traits\LivewireSort;
@@ -250,12 +248,10 @@ final public function torrentRequests(): \Illuminate\Pagination\LengthAwarePagin
                 $query->where('user_id', '=', $user->id);
             })
             ->when($this->myClaims, function ($query) use ($user): void {
-                $requestClaims = TorrentRequestClaim::where('user_id', '=', $user->id)->pluck('request_id');
-                $query->whereIntegerInRaw('id', $requestClaims)->whereNull('torrent_id')->whereNull('approved_by');
+                $query->whereRelation('claim', 'user_id', '=', $user->id)->whereNull('approved_by');
             })
             ->when($this->myVoted, function ($query) use ($user): void {
-                $requestVotes = TorrentRequestBounty::where('user_id', '=', $user->id)->pluck('requests_id');
-                $query->whereIntegerInRaw('id', $requestVotes);
+                $query->whereRelation('bounties', 'user_id', '=', $user->id);
             })
             ->when($this->myFilled, function ($query) use ($user): void {
                 $query->where('filled_by', '=', $user->id);

diff --git a/app/Http/Livewire/TorrentSearch.php b/app/Http/Livewire/TorrentSearch.php
@@ -572,12 +572,12 @@ final public function groupedTorrents()
                 fn ($query) => $query
                     ->where(
                         fn ($query) => $query
-                            ->whereIn('category_id', Category::select('id')->where('movie_meta', '=', 1))
+                            ->whereRelation('category', 'movie_meta', '=', 1)
                             ->whereIntegerInRaw('tmdb', $movieIds)
                     )
                     ->orWhere(
                         fn ($query) => $query
-                            ->whereIn('category_id', Category::select('id')->where('tv_meta', '=', 1))
+                            ->whereRelation('category', 'tv_meta', '=', 1)
                             ->whereIntegerInRaw('tmdb', $tvIds)
                     )
             )

diff --git a/app/Models/Movie.php b/app/Models/Movie.php
@@ -137,18 +137,14 @@ public function recommendedMovies(): \Illuminate\Database\Eloquent\Relations\Bel
      */
     public function torrents(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(Torrent::class, 'tmdb', 'id')->whereHas('category', function ($q): void {
-            $q->where('movie_meta', '=', true);
-        });
+        return $this->hasMany(Torrent::class, 'tmdb', 'id')->whereRelation('category', 'movie_meta', '=', true);
     }
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany<TorrentRequest, $this>
      */
     public function requests(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(TorrentRequest::class, 'tmdb', 'id')->whereHas('category', function ($q): void {
-            $q->where('movie_meta', '-', true);
-        });
+        return $this->hasMany(TorrentRequest::class, 'tmdb', 'id')->whereRelation('category', 'movie_meta', '=', true);
     }
 }
diff --git a/app/Models/Season.php b/app/Models/Season.php
@@ -48,9 +48,7 @@ class Season extends Model
      */
     public function torrents(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
-        return $this->hasMany(Torrent::class, 'tmdb', 'tv_id')->whereHas('category', function ($q): void {
-            $q->where('tv_meta', '=', true);
-        });
+        return $this->hasMany(Torrent::class, 'tmdb', 'tv_id')->whereRelation('category', 'tv_meta', '=', true);
     }
 
     /**