Merge pull request #11952 from nanaya/beatmapset-pack-query

Simplify beatmapset pack tags query

Author: notbakaneko

app/Models/Beatmapset.php

@@ -330,21 +330,18 @@ public function scopeNeverQualified($query)
 
     public function scopeWithPackTags(Builder $query): Builder
     {
-        $idColumn = $this->qualifyColumn('beatmapset_id');
-        $packTagColumn = (new BeatmapPack())->qualifyColumn('tag');
-        $packItemBeatmapsetIdColumn = (new BeatmapPackItem())->qualifyColumn('beatmapset_id');
         $packQuery = BeatmapPack
-            ::selectRaw("GROUP_CONCAT({$packTagColumn} SEPARATOR ',')")
-            ->default()
-            ->whereRelation(
+            ::default()
+            ->whereHas(
                 'items',
-                DB::raw($packItemBeatmapsetIdColumn),
-                DB::raw($idColumn),
-            )->toRawSql();
-
-        return $query
-            ->select('*')
-            ->selectRaw("({$packQuery}) as pack_tags");
+                fn ($q) => $q->whereColumn(
+                    $q->qualifyColumn('beatmapset_id'),
+                    $this->qualifyColumn('beatmapset_id')
+                ),
+            );
+        $packQuery->selectRaw("GROUP_CONCAT({$packQuery->qualifyColumn('tag')} SEPARATOR ',')");
+
+        return $query->addSelect(['pack_tags' => $packQuery]);
     }
 
     public function scopeWithStates($query, $states)