diff --git a/app/Engine/Market.php b/app/Engine/Market.php index db4e138..30e3a89 100644 --- a/app/Engine/Market.php +++ b/app/Engine/Market.php @@ -13,7 +13,6 @@ use App\Models\TradeOffer; use App\Models\TradeRoute; use App\Models\Village; use Carbon\CarbonImmutable; -use Illuminate\Support\Facades\DB; /** * The market of one village (architecture.md, "Market"). Merchants under way are @@ -59,7 +58,7 @@ final class Market ->where(fn ($q) => $q->where('origin_id', $id)->where('type', Movement::TRADE)) ->orWhere(fn ($q) => $q->where('target_id', $id)->where('type', Movement::TRADE_RETURN))) ->sum('merchants'); - $reserved = (int) TradeOffer::where('village_id', $id)->sum(DB::raw('count * merchants')); + $reserved = TradeOffer::where('village_id', $id)->get(['count', 'merchants'])->sum(fn (TradeOffer $o) => $o->count * $o->merchants); return $moving + $reserved; }