From 9f827c12c8eaead8c2e9186b01ac8a842724aa1e Mon Sep 17 00:00:00 2001 From: codex Date: Sun, 1 Nov 2026 20:04:05 +0800 Subject: [PATCH] refactor(billing): unify invoice public state --- .../Cloud/CloudInvoicePageService.php | 3 +- .../Services/Cloud/CloudInvoiceService.php | 56 ++++++++++++------- web/tests/CloudInvoiceDetailContractTest.php | 13 +++-- web/tests/CloudInvoiceLifecycleTest.php | 30 ++++++++++ web/tests/CloudInvoicePageServiceTest.php | 19 +++++++ 5 files changed, 95 insertions(+), 26 deletions(-) diff --git a/web/app/Services/Cloud/CloudInvoicePageService.php b/web/app/Services/Cloud/CloudInvoicePageService.php index 7f2dcaec..8822edcd 100644 --- a/web/app/Services/Cloud/CloudInvoicePageService.php +++ b/web/app/Services/Cloud/CloudInvoicePageService.php @@ -149,7 +149,8 @@ final class CloudInvoicePageService ->limit($perPage) ->get([ 'id', 'purpose', 'instance_id', 'order_id', 'user_id', - 'renews_expires_at', 'due_at', 'amount', 'status', 'created_at', + 'renews_expires_at', 'due_at', 'amount', 'currency', 'status', + 'created_at', ]); $count = $records->count(); diff --git a/web/app/Services/Cloud/CloudInvoiceService.php b/web/app/Services/Cloud/CloudInvoiceService.php index 6a60ffe6..a68cedd3 100644 --- a/web/app/Services/Cloud/CloudInvoiceService.php +++ b/web/app/Services/Cloud/CloudInvoiceService.php @@ -775,6 +775,7 @@ final class CloudInvoiceService $records = []; $orderIds = []; $linkedInstanceIds = []; + $renewalInstanceIds = []; $operationalInvoiceIds = []; $ownerIds = []; foreach ($invoices as $invoice) { @@ -791,6 +792,10 @@ final class CloudInvoiceService && $invoice->instance_id !== null) { $linkedInstanceIds[(int) $invoice->instance_id] = (int) $invoice->instance_id; + if ($purpose === 'renewal') { + $renewalInstanceIds[(int) $invoice->instance_id] + = (int) $invoice->instance_id; + } if (in_array($purpose, ['upgrade', 'ip_change'], true)) { $operationalInvoiceIds[(int) $invoice->id] = (int) $invoice->id; @@ -860,6 +865,14 @@ final class CloudInvoiceService } } } + $blockedUpgradeInstanceIds = []; + if ($renewalInstanceIds !== []) { + foreach (CloudJobService::blockingQueryForInstances( + array_values($renewalInstanceIds) + )->where('kind', 'instance_upgrade')->pluck('instance_id') as $instanceId) { + $blockedUpgradeInstanceIds[(int) $instanceId] = true; + } + } $now = time(); $summaries = []; @@ -903,14 +916,15 @@ final class CloudInvoiceService && !isset($existingInstanceIds[$historicalInstanceId])) { $safeInstanceId = $historicalInstanceId; } - $status = self::publicStatus($invoice, $purpose, $instance, $now); - $deadline = self::paymentDeadline($invoice); - $summaryPayable = $purpose === 'renewal' - && in_array($status, ['open', 'overdue'], true) - && $instance !== null - && !self::instanceDeleting($instance) - && $deadline !== null - && $deadline > $now; + $publicState = self::publicState( + $invoice, + $purpose, + $order, + $instance, + $now, + $instance !== null + && isset($blockedUpgradeInstanceIds[(int) $instance->id]) + ); $jobStatus = self::taskStatus($job); $summaries[] = [ 'id' => (string) $invoice->id, @@ -918,18 +932,15 @@ final class CloudInvoiceService 'type_label' => $title, 'purpose' => $purpose, 'amount' => (string) $invoice->amount, - 'status' => $status, - 'display_status' => self::displayStatus( - $purpose, - $status, - $summaryPayable, - $deadline, - $now - ), + 'currency' => strtoupper((string) ($invoice->currency ?: 'USD')), + 'status' => $publicState['status'], + 'display_status' => $publicState['display_status'], + 'available_action' => $publicState['available_action'], + 'payable' => $publicState['payable'], 'renews_expires_at' => $invoice->renews_expires_at === null ? null : max(0, (int) $invoice->renews_expires_at), 'due_at' => max(0, (int) $invoice->due_at), - 'payment_deadline_at' => $deadline, + 'payment_deadline_at' => $publicState['deadline'], 'created_at' => (int) $invoice->created_at, 'order_status' => $order?->status, 'fulfillment_status' => $jobStatus ?? $order?->status, @@ -1026,7 +1037,7 @@ final class CloudInvoiceService * payable: bool, available_action: ?string} */ private static function publicState(CloudInvoice $invoice, string $purpose, - $order, $instance, int $now): array + $order, $instance, int $now, ?bool $upgradeBlocked = null): array { $status = self::publicStatus($invoice, $purpose, $instance, $now); @@ -1037,12 +1048,14 @@ final class CloudInvoiceService && (string) $order->status === 'awaiting_payment' && $deadline > $now; } elseif ($purpose === 'renewal') { + $upgradeBlocked ??= $instance !== null + && CloudJobService::blockingQueryForInstance( + (int) $instance->id + )->where('kind', 'instance_upgrade')->exists(); $payable = in_array($status, ['open', 'overdue'], true) && $instance !== null && !self::instanceDeleting($instance) - && !CloudJobService::blockingQueryForInstance( - (int) $instance->id - )->where('kind', 'instance_upgrade')->exists() + && !$upgradeBlocked && $deadline > $now; } else { // Upgrade and operational invoices are settled atomically when @@ -1355,6 +1368,7 @@ final class CloudInvoiceService 'error' => $jobError, ] : null, 'amount' => (string) $invoice->amount, + 'currency' => strtoupper((string) ($invoice->currency ?: 'USD')), 'items' => $items, 'renewal_result' => $renewalResult, 'validity_days' => (int) $invoice->validity_days, diff --git a/web/tests/CloudInvoiceDetailContractTest.php b/web/tests/CloudInvoiceDetailContractTest.php index e2cc8f15..99e44f4c 100644 --- a/web/tests/CloudInvoiceDetailContractTest.php +++ b/web/tests/CloudInvoiceDetailContractTest.php @@ -153,6 +153,10 @@ $assert(str_contains($invoicePageService, "CloudInvoice::where('user_id', \$user $summaryMethod = $section($invoiceService, 'public static function listSummaries(', 'private static function listKey('); $assert(substr_count($summaryMethod, '::whereIn(') === 3 + && str_contains($summaryMethod, + 'CloudJobService::blockingQueryForInstances(') + && str_contains($summaryMethod, + "->where('kind', 'instance_upgrade')->pluck('instance_id')") && str_contains($summaryMethod, "->get(['id', 'user_id', 'name', 'status', 'service_status'])") && str_contains($summaryMethod, @@ -163,9 +167,10 @@ $assert(substr_count($summaryMethod, '::whereIn(') === 3 && str_contains($summaryMethod, 'in_array((string) $job->kind') && str_contains($summaryMethod, - 'self::publicStatus($invoice, $purpose, $instance, $now)'), + 'self::publicState('), 'Invoice list associations are not loaded with fixed-size batch queries.'); -foreach (['id', 'title', 'type_label', 'purpose', 'amount', 'status', +foreach (['id', 'title', 'type_label', 'purpose', 'amount', 'currency', 'status', + 'display_status', 'available_action', 'payable', 'renews_expires_at', 'due_at', 'payment_deadline_at', 'created_at', 'order_status', 'fulfillment_status', 'job_status', 'task_id', 'instance_id', 'instance_name'] as $field) { @@ -493,9 +498,9 @@ $displayMethod = $section($invoiceService, 'public static function display(', $assert(str_contains($invoiceService, 'private static function publicState(') && str_contains($invoiceService, 'private static function publicStatus(') && substr_count($invoiceService, - 'self::publicStatus($invoice, $purpose, $instance, $now)') === 2 + 'self::publicStatus($invoice, $purpose, $instance, $now)') === 1 && substr_count($invoiceService, - 'self::publicState($invoice, $purpose, $order, $instance, $now)') === 2, + 'self::publicState(') === 3, 'Invoice list, full detail and lightweight status must share one public-state rule.'); $assert(str_contains($statusService, "->where('user_id', \$invoice->user_id)") diff --git a/web/tests/CloudInvoiceLifecycleTest.php b/web/tests/CloudInvoiceLifecycleTest.php index 9783cf14..60e0c1cb 100644 --- a/web/tests/CloudInvoiceLifecycleTest.php +++ b/web/tests/CloudInvoiceLifecycleTest.php @@ -279,6 +279,36 @@ namespace { === ($graceDisplay['display_status'] ?? null), 'An expired but payable renewal was not projected as payment grace.'); + $upgradeBlocker = new CloudJob(); + $upgradeBlocker->instance_id = $instance->id; + $upgradeBlocker->user_id = 1; + $upgradeBlocker->host_id = 1; + $upgradeBlocker->kind = 'instance_upgrade'; + $upgradeBlocker->execution_mode = 'agent'; + $upgradeBlocker->sealed_payload = '{}'; + $upgradeBlocker->created_at = $now; + $upgradeBlocker->updated_at = $now; + $upgradeBlocker->save(); + $blockedDisplay = CloudInvoiceService::display($invoice->fresh()); + $blockedStatus = CloudInvoiceService::status($invoice->fresh()); + $blockedSummary = CloudInvoiceService::listSummaries([ + $invoice->fresh(), + ])[0] ?? []; + $assert(($blockedDisplay['status'] ?? null) === 'overdue' + && ($blockedDisplay['display_status'] ?? null) === 'overdue' + && ($blockedDisplay['payable'] ?? true) === false + && array_key_exists('available_action', $blockedDisplay) + && $blockedDisplay['available_action'] === null + && ($blockedStatus['status'] ?? null) === ($blockedDisplay['status'] ?? null) + && ($blockedStatus['display_status'] ?? null) + === ($blockedDisplay['display_status'] ?? null) + && ($blockedStatus['payable'] ?? true) === false + && ($blockedSummary['status'] ?? null) === ($blockedDisplay['status'] ?? null) + && ($blockedSummary['display_status'] ?? null) + === ($blockedDisplay['display_status'] ?? null), + 'A blocking instance upgrade made renewal list, detail and polling drift.'); + $upgradeBlocker->delete(); + $expiredAt = $now - CloudInvoiceService::PAYMENT_GRACE_SECONDS - 60; $instance->expires_at = $expiredAt; $instance->save(); diff --git a/web/tests/CloudInvoicePageServiceTest.php b/web/tests/CloudInvoicePageServiceTest.php index ed80fd7d..b8d0ecf3 100644 --- a/web/tests/CloudInvoicePageServiceTest.php +++ b/web/tests/CloudInvoicePageServiceTest.php @@ -30,18 +30,36 @@ $schema->create('cloud_instances', static function (Blueprint $table): void { }); $schema->create('cloud_jobs', static function (Blueprint $table): void { $table->increments('id'); + $table->string('operation_id')->nullable(); + $table->string('request_idempotency_key')->nullable(); + $table->string('request_fingerprint')->nullable(); $table->integer('order_id')->nullable(); $table->integer('invoice_id')->nullable(); $table->integer('instance_id')->nullable(); $table->integer('user_id'); + $table->integer('host_id')->nullable(); $table->string('kind'); + $table->string('execution_mode')->default('agent'); $table->string('phase'); $table->string('outcome')->nullable(); + $table->string('status')->default('queued'); $table->integer('attempts')->default(0); + $table->integer('dispatch_deadline_at')->default(0); + $table->integer('dispatch_started_at')->nullable(); + $table->integer('agent_accepted_at')->nullable(); + $table->integer('receipt_deadline_at')->nullable(); + $table->integer('terminal_at')->nullable(); + $table->integer('dispatched_at')->nullable(); $table->integer('updated_at')->default(0); $table->string('error_code')->nullable(); + $table->boolean('effect_may_have_applied')->nullable(); + $table->boolean('safe_to_resubmit')->nullable(); $table->text('result_json')->nullable(); $table->string('effect_resolution')->default('not_applicable'); + $table->integer('dispatch_attempts')->default(0); + $table->boolean('finalization_incident')->default(false); + $table->string('finalization_error_code')->nullable(); + $table->string('completion_event_id')->nullable(); $table->text('sealed_payload')->nullable(); }); $schema->create('cloud_invoices', static function (Blueprint $table): void { @@ -53,6 +71,7 @@ $schema->create('cloud_invoices', static function (Blueprint $table): void { $table->integer('renews_expires_at')->nullable(); $table->integer('due_at'); $table->string('amount'); + $table->string('currency')->default('USD'); $table->string('status'); $table->integer('validity_days')->default(30); $table->integer('traffic_quota_bytes')->default(0);