Tag scores best search

ppy · Sep 8, 2023 · 58fa22a · 58fa22a
1 parent d2dd0e3
commit 58fa22a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/Libraries/Elasticsearch/Search.php b/app/Libraries/Elasticsearch/Search.php
@@ -22,10 +22,8 @@ abstract class Search extends HasSearch implements Queryable
     /**
      * A tag to use when logging timing of fetches.
      * FIXME: context-based tagging would be nicer.
-     *
-     * @var string|null
      */
-    public $loggingTag;
+    public ?string $loggingTag;
 
     protected $aggregations;
     protected $index;

diff --git a/app/Libraries/Score/FetchDedupedScores.php b/app/Libraries/Score/FetchDedupedScores.php
@@ -15,15 +15,19 @@ class FetchDedupedScores
     private int $limit;
     private array $result;
 
-    public function __construct(private string $dedupeColumn, private ScoreSearchParams $params)
-    {
+    public function __construct(
+        private string $dedupeColumn,
+        private ScoreSearchParams $params,
+        private ?string $searchLoggingTag = null
+    ) {
         $this->limit = $this->params->size;
     }
 
     public function all(): array
     {
         $this->params->size = $this->limit + 50;
         $search = new ScoreSearch($this->params);
+        $search->loggingTag = $this->searchLoggingTag;
 
         $nextCursor = null;
         $hasNext = true;

diff --git a/app/Models/Traits/UserScoreable.php b/app/Models/Traits/UserScoreable.php
@@ -24,7 +24,7 @@ public function aggregatedScoresBest(string $mode, int $size): array
             'ruleset_id' => Beatmap::MODES[$mode],
             'sort' => 'pp_desc',
             'user_id' => $this->getKey(),
-        ])))->all();
+        ]), "aggregatedScoresBest_{$mode}"))->all();
     }
 
     public function beatmapBestScoreIds(string $mode)