Skip to content

Commit

Permalink
Correct static function usage and use it in more places
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanaya
nanaya committed Jun 15, 2023
1 parent 1197677 commit 9358516
Show file tree
Hide file tree
Showing 2 changed files with 185 additions and 183 deletions.
247 changes: 124 additions & 123 deletions tests/Controllers/BeatmapsControllerSoloScoresTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,137 +33,138 @@ class BeatmapsControllerSoloScoresTest extends TestCase

public static function setUpBeforeClass(): void
{
(new static())->refreshApplication();
static::$user = User::factory()->create(['osu_subscriber' => true]);
static::$otherUser = User::factory()->create(['country_acronym' => Country::factory()]);
$friend = User::factory()->create(['country_acronym' => Country::factory()]);
static::$beatmap = Beatmap::factory()->qualified()->create();

$countryAcronym = static::$user->country_acronym;

static::$scores = [];
$scoreFactory = SoloScore::factory();
foreach (['solo' => 0, 'legacy' => null] as $type => $buildId) {
$defaultData = ['build_id' => $buildId];

static::$scores = array_merge(static::$scores, [
"{$type}:user" => $scoreFactory->withData($defaultData, ['total_score' => 1100])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:userMods" => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => static::defaultMods(['DT', 'HD']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:userModsNC" => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => static::defaultMods(['NC']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:otherUserModsNCPFHigherScore" => $scoreFactory->withData($defaultData, [
'total_score' => 1010,
'mods' => static::defaultMods(['NC', 'PF']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:userModsLowerScore" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['DT', 'HD']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:friend" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => $friend,
]),
// With preference mods
"{$type}:otherUser" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['PF']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserMods" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['HD', 'PF', 'NC']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserModsExtraNonPreferences" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['DT', 'HD', 'HR']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserModsUnrelated" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['FL']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
// Same total score but achieved later so it should come up after earlier score
"{$type}:otherUser2Later" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
"{$type}:otherUser3SameCountry" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => User::factory()->state(['country_acronym' => $countryAcronym]),
]),
// Non-preserved score should be filtered out
"{$type}:nonPreserved" => $scoreFactory->withData($defaultData)->create([
'beatmap_id' => static::$beatmap,
'preserve' => false,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
// Unrelated score
"{$type}:unrelated" => $scoreFactory->withData($defaultData)->create([
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
static::withDbAccess(function () {
static::$user = User::factory()->create(['osu_subscriber' => true]);
static::$otherUser = User::factory()->create(['country_acronym' => Country::factory()]);
$friend = User::factory()->create(['country_acronym' => Country::factory()]);
static::$beatmap = Beatmap::factory()->qualified()->create();

$countryAcronym = static::$user->country_acronym;

static::$scores = [];
$scoreFactory = SoloScore::factory();
foreach (['solo' => 0, 'legacy' => null] as $type => $buildId) {
$defaultData = ['build_id' => $buildId];

static::$scores = array_merge(static::$scores, [
"{$type}:user" => $scoreFactory->withData($defaultData, ['total_score' => 1100])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:userMods" => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => static::defaultMods(['DT', 'HD']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:userModsNC" => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => static::defaultMods(['NC']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:otherUserModsNCPFHigherScore" => $scoreFactory->withData($defaultData, [
'total_score' => 1010,
'mods' => static::defaultMods(['NC', 'PF']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:userModsLowerScore" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['DT', 'HD']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$user,
]),
"{$type}:friend" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => $friend,
]),
// With preference mods
"{$type}:otherUser" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['PF']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserMods" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['HD', 'PF', 'NC']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserModsExtraNonPreferences" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['DT', 'HD', 'HR']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
"{$type}:otherUserModsUnrelated" => $scoreFactory->withData($defaultData, [
'total_score' => 1000,
'mods' => static::defaultMods(['FL']),
])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => static::$otherUser,
]),
// Same total score but achieved later so it should come up after earlier score
"{$type}:otherUser2Later" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
"{$type}:otherUser3SameCountry" => $scoreFactory->withData($defaultData, ['total_score' => 1000])->create([
'beatmap_id' => static::$beatmap,
'preserve' => true,
'user_id' => User::factory()->state(['country_acronym' => $countryAcronym]),
]),
// Non-preserved score should be filtered out
"{$type}:nonPreserved" => $scoreFactory->withData($defaultData)->create([
'beatmap_id' => static::$beatmap,
'preserve' => false,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
// Unrelated score
"{$type}:unrelated" => $scoreFactory->withData($defaultData)->create([
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
]);
}

UserRelation::create([
'friend' => true,
'user_id' => static::$user->getKey(),
'zebra_id' => $friend->getKey(),
]);
}

UserRelation::create([
'friend' => true,
'user_id' => static::$user->getKey(),
'zebra_id' => $friend->getKey(),
]);

Artisan::call('es:index-scores:queue', [
'--all' => true,
'--no-interaction' => true,
]);
(new ScoreSearch())->indexWait();
Artisan::call('es:index-scores:queue', [
'--all' => true,
'--no-interaction' => true,
]);
(new ScoreSearch())->indexWait();
});
}

public static function tearDownAfterClass(): void
{
parent::tearDownAfterClass();

(new static())->withDbAccess(function () {
static::withDbAccess(function () {
Beatmap::truncate();
Beatmapset::truncate();
Country::truncate();
Expand Down
121 changes: 61 additions & 60 deletions tests/Models/Solo/ScoreEsIndexTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,72 +34,73 @@ class ScoreEsIndexTest extends TestCase

public static function setUpBeforeClass(): void
{
(new static())->refreshApplication();
static::$user = User::factory()->create(['osu_subscriber' => true]);
$otherUser = User::factory()->create(['country_acronym' => Country::factory()]);
static::$beatmap = Beatmap::factory()->qualified()->create();

$scoreFactory = Score::factory()->state(['preserve' => true]);
$defaultData = ['build_id' => 1];

$mods = [
['acronym' => 'DT', 'settings' => []],
['acronym' => 'HD', 'settings' => []],
];
$unrelatedMods = [
['acronym' => 'NC', 'settings' => []],
];

static::$scores = [
'otherUser' => $scoreFactory->withData($defaultData, [
'total_score' => 1150,
'mods' => $unrelatedMods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => $otherUser,
]),
'otherUserMods' => $scoreFactory->withData($defaultData, [
'total_score' => 1140,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => $otherUser,
]),
'otherUser2' => $scoreFactory->withData($defaultData, [
'total_score' => 1150,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
'otherUser3SameCountry' => $scoreFactory->withData($defaultData, [
'total_score' => 1130,
'mods' => $unrelatedMods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => User::factory()->state(['country_acronym' => static::$user->country_acronym]),
]),
'user' => $scoreFactory->withData($defaultData, ['total_score' => 1100])->create([
'beatmap_id' => static::$beatmap,
'user_id' => static::$user,
]),
'userMods' => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => static::$user,
]),
];

static::reindexScores();
static::withDbAccess(function () {
static::$user = User::factory()->create(['osu_subscriber' => true]);
$otherUser = User::factory()->create(['country_acronym' => Country::factory()]);
static::$beatmap = Beatmap::factory()->qualified()->create();

$scoreFactory = Score::factory()->state(['preserve' => true]);
$defaultData = ['build_id' => 1];

$mods = [
['acronym' => 'DT', 'settings' => []],
['acronym' => 'HD', 'settings' => []],
];
$unrelatedMods = [
['acronym' => 'NC', 'settings' => []],
];

static::$scores = [
'otherUser' => $scoreFactory->withData($defaultData, [
'total_score' => 1150,
'mods' => $unrelatedMods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => $otherUser,
]),
'otherUserMods' => $scoreFactory->withData($defaultData, [
'total_score' => 1140,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => $otherUser,
]),
'otherUser2' => $scoreFactory->withData($defaultData, [
'total_score' => 1150,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => User::factory()->state(['country_acronym' => Country::factory()]),
]),
'otherUser3SameCountry' => $scoreFactory->withData($defaultData, [
'total_score' => 1130,
'mods' => $unrelatedMods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => User::factory()->state(['country_acronym' => static::$user->country_acronym]),
]),
'user' => $scoreFactory->withData($defaultData, ['total_score' => 1100])->create([
'beatmap_id' => static::$beatmap,
'user_id' => static::$user,
]),
'userMods' => $scoreFactory->withData($defaultData, [
'total_score' => 1050,
'mods' => $mods,
])->create([
'beatmap_id' => static::$beatmap,
'user_id' => static::$user,
]),
];

static::reindexScores();
});
}

public static function tearDownAfterClass(): void
{
parent::tearDownAfterClass();

(new static())->withDbAccess(function () {
static::withDbAccess(function () {
Beatmap::truncate();
Beatmapset::truncate();
Country::truncate();
Expand Down

0 comments on commit 9358516

Please sign in to comment.