Include custom beatmap tags set by own user in response #11951
Merged
+32
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
notbakaneko
commented
Feb 28, 2025
•
notbakaneko
commented
- shouldn't query every beatmap separately
nanaya
reviewed
Feb 28, 2025
| @@ -396,6 +398,7 @@ private function showJson($beatmapset) | |||
| "{$beatmapRelation}.baseMaxCombo", | |||
| "{$beatmapRelation}.failtimes", | |||
| "{$beatmapRelation}.beatmapOwners.user", | |||
| "{$beatmapRelation}.ownBeatmapTags" => fn ($q) => $user !== null ? $q->where('user_id', $user->getKey()) : $q->none(), | |||
There was a problem hiding this comment.
so this kinda works but I don't know if better 🤔 less fake ownBeatmapTags at least, and maybe call it current_user_tag_ids and always use Auth::user() in the scope.
Or maybe JSON_OBJECTAGG($userId, JSON_ARRAYAGG(...)) and pass the current user all the way again.
public function scopeWithUserTagIds($query, $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("GROUP_CONCAT({$tagQuery->qualifyColumn('tag_id')} SEPARATOR ',')");
}
return $query->addSelect(['user_tag_ids' => $tagQuery]);
}There was a problem hiding this comment.
can use at least a comment on this...
There was a problem hiding this comment.
I haven't gotten around to checking it yet 😔
nanaya
requested changes
Mar 4, 2025
| @@ -12,12 +12,15 @@ | |||
|
|
|||
| class BeatmapCompactTransformer extends TransformerAbstract | |||
| { | |||
| public ?User $user = null; | |||
| @@ -396,6 +398,7 @@ private function showJson($beatmapset) | |||
| "{$beatmapRelation}.baseMaxCombo", | |||
| "{$beatmapRelation}.failtimes", | |||
| "{$beatmapRelation}.beatmapOwners.user", | |||
| "{$beatmapRelation}.ownBeatmapTags" => fn ($q) => $user !== null ? $q->where('user_id', $user->getKey()) : $q->none(), | |||
There was a problem hiding this comment.
can use at least a comment on this...
bdach
added a commit
to bdach/osu
that referenced
this pull request
Mar 4, 2025
Visual part for ppy#31913. Opening separately for appropriate visual UI adjustments. Also mostly ready to be hooked up to the results screen, pending merge of ppy/osu-web#11951.
1 task
nanaya
approved these changes
Mar 5, 2025
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.