From 484858eb6f4bc29460cbffbf7b5dcad5441963d8 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 2 Aug 2024 17:32:53 +0900 Subject: [PATCH 1/2] Better daily challenge query order Mainly for testing with dirty database. --- app/Models/Multiplayer/Room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index 236c7f1bd4c..b3584b0419c 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -228,7 +228,7 @@ public function macroDailyChallengeFor(): \Closure return fn (Builder $query, CarbonImmutable $date): ?static => static::where('category', 'daily_challenge') ->whereBetween('starts_at', [$date->startOfDay(), $date->endOfDay()]) - ->orderBy('starts_at', 'DESC') + ->orderByDesc('id') ->first(); } From 85daf68d5e8040cc6eef5ca25137fd93ae588545 Mon Sep 17 00:00:00 2001 From: nanaya Date: Fri, 2 Aug 2024 18:13:42 +0900 Subject: [PATCH 2/2] Just use `last` macro --- app/Models/Multiplayer/Room.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php index b3584b0419c..1ec8e68d7f8 100644 --- a/app/Models/Multiplayer/Room.php +++ b/app/Models/Multiplayer/Room.php @@ -228,8 +228,7 @@ public function macroDailyChallengeFor(): \Closure return fn (Builder $query, CarbonImmutable $date): ?static => static::where('category', 'daily_challenge') ->whereBetween('starts_at', [$date->startOfDay(), $date->endOfDay()]) - ->orderByDesc('id') - ->first(); + ->last(); } public function host()