Merge pull request #11086 from bdach/challenge-pack-check

Exclude scores without pp when displaying pack item pass indicator

Author: nanaya

Diff for: app/Libraries/Search/ScoreSearch.php

@@ -56,6 +56,9 @@ public function getQuery(): BoolQuery
                 $query->mustNot(['term' => ['mods' => $excludedMod]]);
             }
         }
+        if ($this->params->excludeWithoutPp === true) {
+            $query->filter(['exists' => ['field' => 'pp']]);
+        }
 
         $this->addModsFilter($query);
 

Diff for: app/Libraries/Search/ScoreSearchParams.php

@@ -24,6 +24,7 @@ class ScoreSearchParams extends SearchParams
     public bool $excludeConverts = false;
     public ?array $excludeMods = null;
     public ?bool $isLegacy = null;
+    public bool $excludeWithoutPp = false;
     public ?array $mods = null;
     public ?int $rulesetId = null;
     public $size = 50;
@@ -39,6 +40,7 @@ public static function fromArray(array $rawParams): static
         $params->beatmapIds = $rawParams['beatmap_ids'] ?? null;
         $params->excludeConverts = $rawParams['exclude_converts'] ?? $params->excludeConverts;
         $params->excludeMods = $rawParams['exclude_mods'] ?? null;
+        $params->excludeWithoutPp = $rawParams['exclude_without_pp'] ?? $params->excludeWithoutPp;
         $params->isLegacy = $rawParams['is_legacy'] ?? null;
         $params->mods = $rawParams['mods'] ?? null;
         $params->rulesetId = $rawParams['ruleset_id'] ?? null;

Diff for: app/Models/BeatmapPack.php

@@ -117,6 +117,13 @@ public function userCompletionData($user, ?bool $isLegacy)
             ];
             if ($this->no_diff_reduction) {
                 $params['exclude_mods'] = app('mods')->difficultyReductionIds->toArray();
+                if ($isLegacy !== true) {
+                    // the intended meaning of this check is that the scores should not include mods
+                    // that disqualify them from granting pp.
+                    // mods are not the only reason why pp might be missing, but it's the best that we have for now.
+                    // see also: https://github.com/ppy/osu-queue-score-statistics/pull/234
+                    $params['exclude_without_pp'] = true;
+                }
             }
 
             static $aggName = 'by_beatmap';