Merge pull request #11951 from notbakaneko/feature/beatmaps-include-own-tags

Include custom beatmap tags set by own user in response

Author: nanaya

app/Http/Controllers/BeatmapsetsController.php

@@ -392,6 +392,7 @@ private function showJson($beatmapset)
             ? 'allBeatmaps'
             : 'beatmaps';
         $beatmapset->load([
+            "{$beatmapRelation}" => fn ($q) => $q->withUserTagIds(\Auth::id()),
             "{$beatmapRelation}.baseDifficultyRatings",
             "{$beatmapRelation}.baseMaxCombo",
             "{$beatmapRelation}.failtimes",
@@ -409,6 +410,7 @@ private function showJson($beatmapset)
             'beatmaps.failtimes',
             'beatmaps.max_combo',
             'beatmaps.owners',
+            'beatmaps.current_user_tag_ids',
             'beatmaps.top_tag_ids',
             'converts',
             'converts.failtimes',

app/Models/Beatmap.php

@@ -183,6 +183,20 @@ public function scopeWithMaxCombo($query)
             ) AS attrib_max_combo"));
     }
 
+    public function scopeWithUserTagIds($query, ?int $userId)
+    {
+        if ($userId === null) {
+            $tagQuery = \DB::query()->selectRaw('null');
+        } else {
+            $tagQuery = BeatmapTag
+                ::where('user_id', $userId)
+                ->whereColumn('beatmap_id', $this->qualifyColumn('beatmap_id'));
+            $tagQuery->selectRaw("json_arrayagg({$tagQuery->qualifyColumn('tag_id')})");
+        }
+
+        return $query->addSelect(['user_tag_ids' => $tagQuery]);
+    }
+
     public function failtimes()
     {
         return $this->hasMany(BeatmapFailtimes::class);
@@ -290,6 +304,16 @@ public function getAttribute($key)
         };
     }
 
+    /**
+     * Requires calling withUserTagIds scope to populate user_tag_ids
+     *
+     * @return int[]
+     */
+    public function getUserTagIds(): array
+    {
+        return json_decode($this->attributes['user_tag_ids'] ?? '', true) ?? [];
+    }
+
     /**
      * @return Collection<User>
      */

app/Transformers/BeatmapCompactTransformer.php

@@ -15,6 +15,7 @@ class BeatmapCompactTransformer extends TransformerAbstract
     protected array $availableIncludes = [
         'beatmapset',
         'checksum',
+        'current_user_tag_ids',
         'failtimes',
         'max_combo',
         'owners',
@@ -52,6 +53,11 @@ public function includeChecksum(Beatmap $beatmap)
         return $this->primitive($beatmap->checksum);
     }
 
+    public function includeCurrentUserTagIds(Beatmap $beatmap)
+    {
+        return $this->primitive($beatmap->getUserTagIds());
+    }
+
     public function includeFailtimes(Beatmap $beatmap)
     {
         $failtimes = $beatmap->failtimes;

app/Transformers/BeatmapsetCompactTransformer.php

@@ -92,7 +92,6 @@ public function includeAvailability(Beatmapset $beatmapset)
 
     public function includeBeatmaps(Beatmapset $beatmapset, Fractal\ParamBag $params)
     {
-
         return $this->collection($this->beatmaps($beatmapset, $params), new $this->beatmapTransformer());
     }