Merge pull request #11049 from nanaya/beatmap-state-score-reset

Update ranked flag to remove scores from index

Author: peppy

app/Jobs/RemoveBeatmapsetSoloScores.php

@@ -11,7 +11,6 @@
 use App\Models\Beatmap;
 use App\Models\Beatmapset;
 use App\Models\Solo\Score;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\Eloquent\Collection;
@@ -59,15 +58,7 @@ private function deleteScores(Collection $scores): void
     {
         $ids = $scores->pluck('id')->all();
 
-        $scoresQuery = Score::whereKey($ids);
-        // Queue delete ahead of time in case process is stopped right after
-        // db delete is committed. It's fine queuing deleted score ahead of
-        // time as best score check doesn't use index.
-        // Set the flag first so indexer will correctly delete it.
-        $scoresQuery->update(['preserve' => false]);
+        Score::whereKey($ids)->update(['ranked' => false]);
         $this->scoreSearch->queueForIndex($this->schemas, $ids);
-        DB::transaction(function () use ($ids, $scoresQuery): void {
-            $scoresQuery->delete();
-        });
     }
 }

app/Models/Solo/Score.php

@@ -164,6 +164,7 @@ public function scopeIndexable(Builder $query): Builder
     {
         return $query
             ->where('preserve', true)
+            ->where('ranked', true)
             ->whereHas('user', fn (Builder $q): Builder => $q->default());
     }
 

tests/Jobs/RemoveBeatmapsetSoloScoresTest.php

@@ -47,7 +47,7 @@ public function testHandle()
             $this->createScore($beatmapset);
         }
 
-        $this->expectCountChange(fn () => Score::count(), count($scores) * -2, 'removes scores');
+        $this->expectCountChange(fn () => Score::indexable()->count(), count($scores) * -2, 'removes scores');
 
         static::reindexScores();