Allow "Log 1st Flight" achievement to be awarded even if flight is upcoming

This commit is contained in:
2026-08-20 16:21:14 +10:00
parent 7bca9a8d31
commit 90ea8d81d2
4 changed files with 35 additions and 8 deletions
@@ -47,6 +47,7 @@ class AchievementService
* @var Collection<int,UserFlight> $flights
*/
private Collection $flights;
private int $loggedFlightCount;
public function calculate(User $user): void
{
@@ -64,20 +65,24 @@ class AchievementService
'arrivalAirport.region.continent',
])->where('departure_date', '<=', now('UTC'))->get();
$this->loggedFlightCount = $user->flights()->count();
foreach ($this->checkers as $checkerClass) {
$checker = new $checkerClass($this);
$checker->check($user);
}
}
/**
* @return Collection<int,UserFlight>
*/
public function getFlights(): Collection
{
return $this->flights;
}
public function getLoggedFlightCount(): int
{
return $this->loggedFlightCount;
}
// ---------------------------------------------------------------
// Award / revoke
@@ -15,6 +15,11 @@ abstract class BaseChecker implements AchievementCheckerInterface
return $this->service->getFlights();
}
protected function allLoggedFlightsCount(): int
{
return $this->service->getLoggedFlightCount();
}
/**
* Resolve an achievement ID from its internal name.
* Results are cached on the service so repeated lookups are free.
@@ -15,10 +15,11 @@ class GeneralFlyingChecker extends BaseChecker
*/
$flights = $this->flights();
$count = $flights->count();
$allLoggedFlightsCount = $this->allLoggedFlightsCount();
// --- Boolean achievements ---
$this->awardIf($count >= 1, 'general_flying.first_flight');
$this->awardIf($allLoggedFlightsCount >= 1, 'general_flying.first_flight');
$this->awardIf(
$flights->contains(fn ($f) => $f->isDomestic()),