refactor(billing): consume invoice list presentation

go
codex 2 weeks ago
parent 5ef048cbba
commit 4cd29ed7ff

@ -310,7 +310,7 @@ final class CloudPageController
is_array($query) ? $query : []
);
$payload['balance'] = (string) $user->money;
$rows = CloudInvoicePresentation::summaries($payload['invoices']);
$rows = $payload['invoices'];
$json = json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_HEX_TAG
| JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_INVALID_UTF8_SUBSTITUTE);

@ -155,7 +155,9 @@ final class CloudInvoicePageService
$count = $records->count();
return [
'invoices' => CloudInvoiceService::listSummaries($records),
'invoices' => CloudInvoicePresentation::summaries(
CloudInvoiceService::listSummaries($records)
),
'purpose' => $purpose,
'filters' => $filters,
'pagination' => [

@ -260,6 +260,9 @@ final class CloudInvoicePresentation
) !== ''))
&& $fulfillmentLabel !== '';
$invoice['context_display'] = self::context($invoice, $purpose, $status);
$invoice['polling_required'] = in_array($status, ['open', 'overdue'], true)
|| (in_array($purpose, ['upgrade', 'ip_change'], true)
&& $fulfillmentStatus === 'active');
return $invoice;
}

@ -86,124 +86,14 @@ function makeElement(tag, className = '', content) {
return element;
}
function firstText(...values) {
for (const value of values) {
if (value !== null && value !== undefined && String(value).trim() !== '') return String(value).trim();
}
return '';
}
function formatUsd(value) {
const amount = Number(value);
if (!Number.isFinite(amount) || amount < 0) return '$—';
return `$${amount.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
}
function formatDate(value) {
const raw = Number(value);
const timestamp = Number.isFinite(raw) && raw > 0
? (raw < 1e12 ? raw * 1000 : raw) : Date.parse(String(value || ''));
const date = new Date(timestamp);
return Number.isFinite(date.getTime())
? date.toLocaleString('zh-CN', { hour12: false }) : '时间未记录';
}
function invoicePurpose(invoice) {
const value = firstText(invoice?.purpose, invoice?.kind, invoice?.invoice_type, invoice?.type).toLowerCase();
if (['recharge', 'topup', 'top_up', 'balance', 'deposit'].includes(value)) return 'recharge';
if (['provision', 'provisioning', 'initial', 'create'].includes(value)) return 'provision';
if (['renewal', 'renew', 'subscription'].includes(value)) return 'renewal';
if (value === 'upgrade') return 'upgrade';
if (value === 'ip_change') return 'ip_change';
if (value === 'backup_addon') return 'backup_addon';
return '';
}
function invoiceTitle(invoice) {
return firstText(invoice?.type_label, invoice?.title,
{ recharge: '余额充值', provision: '实例开通', renewal: '实例续费',
upgrade: '实例升级', ip_change: '更换公网 IP',
backup_addon: '自动备份开通' }[invoicePurpose(invoice)], '账单');
}
function invoiceContext(invoice) {
const purpose = invoicePurpose(invoice);
const status = String(invoice?.status || '').toLowerCase();
if (purpose === 'renewal') {
let value = `对应实例到期 ${formatDate(invoice?.renews_expires_at ?? invoice?.due_at)}`;
if (['open', 'overdue'].includes(status)) {
value += ` · 最晚支付 ${formatDate(invoice?.payment_deadline_at)}`;
}
return value;
}
if (purpose === 'provision') {
return `支付截止 ${formatDate(invoice?.payment_deadline_at ?? invoice?.due_at)}`;
}
if (['upgrade', 'ip_change'].includes(purpose)) {
return `目标实例 ${firstText(invoice?.instance_name,
invoice?.instance_id ? `#${invoice.instance_id}` : '', '实例')}`;
}
if (purpose === 'backup_addon') {
return `目标实例 ${firstText(invoice?.instance_name,
invoice?.instance_id ? `#${invoice.instance_id}` : '', '实例')}`;
}
return '';
}
function invoiceStatusInfo(status) {
const values = {
open: ['待支付', 'warning'], overdue: ['已逾期', 'failed'], paid: ['已支付', 'running'],
renewal_grace: ['已到期,宽限期内可续费', 'warning'],
refunded: ['已退款', 'other'], void: ['已失效', 'other'], expired: ['已失效', 'failed'],
deleting: ['实例删除中', 'failed'], delete_failed: ['自动删除失败', 'failed'],
purge_pending: ['等待永久删除', 'failed'], purge_stopping: ['删除前正在关机', 'failed'],
purge_force_required: ['等待管理员确认强制删除', 'failed'],
purge_deleting: ['实例删除中', 'failed'], purge_stop_failed: ['删除前关机失败', 'failed'],
purge_failed: ['自动删除失败', 'failed'],
};
return values[String(status || '').toLowerCase()] || [String(status || '未知'), 'other'];
}
function fulfillmentStatus(invoice) {
return firstText(invoice?.fulfillment_status).toLowerCase();
}
function fulfillmentStatusInfo(invoice) {
const purpose = invoicePurpose(invoice);
if (purpose === 'upgrade') {
const status = fulfillmentStatus(invoice);
const values = {
active: ['升级中', 'warning'], succeeded: ['已升级', 'running'],
failed: ['升级失败', 'failed'], cancelled: ['已取消', 'failed'],
};
return { status, display: values[status] || ['升级状态协议无效', 'failed'] };
}
if (purpose === 'ip_change') {
const status = fulfillmentStatus(invoice);
const values = {
active: ['更换中', 'warning'], succeeded: ['已更换', 'running'],
review: ['待人工核对', 'warning'],
failed: ['更换失败', 'failed'], cancelled: ['已取消', 'failed'],
};
return { status, display: values[status] || ['更换状态协议无效', 'failed'] };
}
const values = {
awaiting_payment: ['等待支付', 'warning'], active: ['创建中', 'warning'],
succeeded: ['已开通', 'running'],
failed: ['创建失败', 'failed'], refunded: ['开通失败,已退款', 'failed'],
expired: ['已失效', 'failed'], cancelled: ['已取消', 'failed'],
};
const status = fulfillmentStatus(invoice);
return { status, display: values[status] || ['履约状态协议无效', 'failed'] };
}
function invoiceNeedsPolling(invoice) {
const status = String(invoice?.status || '').toLowerCase();
if (['open', 'overdue'].includes(status)) return true;
if (invoicePurpose(invoice) === 'upgrade' && fulfillmentStatus(invoice) === 'active') return true;
if (invoicePurpose(invoice) === 'ip_change'
&& fulfillmentStatus(invoice) === 'active') return true;
return false;
return invoice?.polling_required === true;
}
function renderInvoices() {
@ -218,27 +108,27 @@ function renderInvoices() {
for (const invoice of state.invoices) {
const row = makeElement('article', 'cloud-order cloud-invoice cloud-invoice-list-row');
const detail = makeElement('div', 'cloud-order-detail cloud-invoice-list-copy');
detail.append(makeElement('strong', '', invoiceTitle(invoice)),
makeElement('p', 'muted', `账单 #${invoice.id} · ${formatDate(invoice.created_at)}`));
const context = invoiceContext(invoice);
detail.append(makeElement('strong', '', String(invoice?.title || '账单')),
makeElement('p', 'muted', `账单 #${invoice.id} · ${String(
invoice?.created_display || '时间未记录',
)}`));
const context = String(invoice?.context_display || '').trim();
if (context) detail.append(makeElement('p', 'muted cloud-invoice-context', context));
const actions = makeElement('div', 'cloud-order-actions cloud-invoice-list-actions');
const invoiceStatus = String(invoice.status || '').toLowerCase();
const [label, className] = invoiceStatusInfo(
invoice.display_status ?? invoiceStatus,
);
actions.append(makeElement('span', `state-pill ${className}`, label));
const purpose = invoicePurpose(invoice);
if ((purpose === 'provision' && ['paid', 'refunded'].includes(invoiceStatus))
|| (['upgrade', 'ip_change'].includes(purpose) && fulfillmentStatus(invoice))) {
const { status, display } = fulfillmentStatusInfo(invoice);
if (status) actions.append(makeElement('span', `state-pill ${display[1]}`, display[0]));
actions.append(makeElement('span', `state-pill ${String(
invoice?.status_class || 'other',
)}`, String(invoice?.status_label || '未知')));
if (invoice?.show_fulfillment === true && String(invoice?.fulfillment_label || '').trim()) {
actions.append(makeElement('span', `state-pill ${String(
invoice?.fulfillment_class || 'other',
)}`, String(invoice.fulfillment_label)));
}
const link = makeElement('a', 'row-button', '账单详情');
link.href = `/user/cloud/invoices/${encodeURIComponent(String(invoice.id))}`;
actions.append(link);
const amount = makeElement('div', 'cloud-invoice-list-amount');
amount.append(makeElement('span', '', '金额'), makeElement('strong', '', formatUsd(invoice.amount)));
amount.append(makeElement('span', '', '金额'),
makeElement('strong', '', String(invoice?.amount_display || '$—')));
row.append(detail, actions, amount);
container.append(row);
}

@ -37,9 +37,18 @@ class Node {
}
const invoice = id => ({
id: String(id), purpose: 'renewal', title: '实例续费', amount: '10.00',
status: 'paid', created_at: 2_000_000_000 + Number(id),
id: String(id), purpose: 'renewal', title: '实例续费', amount: '999.00',
status: 'void', created_at: 1,
renews_expires_at: 2_000_100_000,
created_display: `服务端时间-${id}`,
amount_display: `$10.0${id}`,
status_label: `服务端状态-${id}`,
status_class: 'warning',
context_display: `服务端上下文-${id}`,
show_fulfillment: true,
fulfillment_label: `服务端履约-${id}`,
fulfillment_class: 'running',
polling_required: false,
});
const payload = (id, overrides = {}) => ({
invoices: [invoice(id)], purpose: 'all',
@ -135,6 +144,19 @@ const response = value => ({ ok: true, status: 200, json: async () => structured
await tick(); await tick();
assert.equal(page.state.invoices[0].id, '2');
assert.match(page.location.search, /keyword=second-vm/);
const rendered = page.nodes.get('invoices-list').textContent;
assert.match(rendered, /服务端时间-2/,
'Invoice list ignored the server-rendered creation time.');
assert.match(rendered, /\$10\.02/,
'Invoice list ignored the server-rendered amount.');
assert.match(rendered, /服务端状态-2/,
'Invoice list reinterpreted the canonical invoice status.');
assert.match(rendered, /服务端上下文-2/,
'Invoice list rebuilt its context from raw invoice fields.');
assert.match(rendered, /服务端履约-2/,
'Invoice list rebuilt its fulfillment state from raw task fields.');
assert.doesNotMatch(rendered, /\$999\.00/,
'Invoice list formatted the raw amount instead of consuming its presentation.');
first.resolve(response(payload(1, {
filters: { purpose: 'all', status: 'all', keyword: 'first-vm',

@ -12,6 +12,9 @@ $assert = static function ($condition, $message) {
$controller = file_get_contents($root . '/app/Controllers/CloudPageController.php');
$apiController = file_get_contents($root . '/app/Controllers/CloudApiController.php');
$service = file_get_contents($root . '/app/Services/Cloud/CloudInvoicePageService.php');
$presentation = file_get_contents(
$root . '/app/Services/Cloud/CloudInvoicePresentation.php'
);
$shell = file_get_contents($root . '/resources/views/venix/cloud/page.tpl');
$template = file_get_contents($root . '/resources/views/venix/cloud/pages/invoices.tpl');
$topbar = file_get_contents($root . '/resources/views/venix/user/panel_topbar.tpl');
@ -55,7 +58,7 @@ $assert(str_contains($template, 'id="invoices-bootstrap"')
&& str_contains($template, 'value="renewal"')
&& !str_contains($template, 'href="/user/cloud/invoices?purpose=renewal"')
&& str_contains($template, 'cloud-invoice-context')
&& str_contains($controller, "'对应实例到期 '")
&& str_contains($presentation, "'对应实例到期 '")
&& !str_contains($template, '正在加载…'),
'Invoice HTML must contain the first records instead of a client-only loading placeholder.');
$assert(!str_contains($module, '/cloud/runtime.js')
@ -68,11 +71,21 @@ $assert(!str_contains($module, '/cloud/runtime.js')
&& str_contains($module, "byId('invoices-filter-form')")
&& str_contains($module, 'function invoiceQueryString(')
&& str_contains($module, "addEventListener('submit'")
&& str_contains($module, 'function invoiceContext(')
&& str_contains($module, 'invoice?.renews_expires_at ?? invoice?.due_at')
&& str_contains($module, 'invoice?.created_display')
&& str_contains($module, 'invoice?.amount_display')
&& str_contains($module, 'invoice?.status_label')
&& str_contains($module, 'invoice?.status_class')
&& str_contains($module, 'invoice?.context_display')
&& str_contains($module, 'invoice?.fulfillment_label')
&& str_contains($module, 'invoice?.polling_required === true')
&& str_contains($module, 'state.invoices.some(invoiceNeedsPolling)')
&& str_contains($module,
"if (['open', 'overdue'].includes(status)) return true;")
&& !str_contains($module, 'function formatDate(')
&& !str_contains($module, 'function invoicePurpose(')
&& !str_contains($module, 'function invoiceTitle(')
&& !str_contains($module, 'function invoiceContext(')
&& !str_contains($module, 'function invoiceStatusInfo(')
&& !str_contains($module, 'function fulfillmentStatus(')
&& !str_contains($module, 'function fulfillmentStatusInfo(')
&& !str_contains($module, 'needs_attention')
&& !str_contains($module, 'setInterval('),
'Invoice list module must be lightweight and stop polling terminal records.');

@ -190,6 +190,10 @@ $assert($renewals['purpose'] === 'renewal'
&& count($renewals['invoices']) === 1
&& ($invoice['id'] ?? null) === '1'
&& ($invoice['purpose'] ?? null) === 'renewal'
&& ($invoice['currency'] ?? null) === 'USD'
&& ($invoice['amount_display'] ?? null) === '$10.00'
&& ($invoice['status_label'] ?? null) === '已支付'
&& ($invoice['polling_required'] ?? null) === false
&& ($invoice['renews_expires_at'] ?? null) === $expiry
&& ($invoice['payment_deadline_at'] ?? null)
=== $expiry + CloudInvoiceService::PAYMENT_GRACE_SECONDS,

@ -48,6 +48,7 @@ $assert(count($rows) === 1
&& $rows[0]['status_label'] === '已到期,宽限期内可续费'
&& $rows[0]['status_class'] === 'warning'
&& $rows[0]['amount_display'] === '$12.51'
&& $rows[0]['polling_required'] === true
&& str_contains($rows[0]['context_display'], '最晚支付'),
'Renewal grace summary did not preserve its canonical status and deadline.');
@ -169,15 +170,19 @@ $source = file_get_contents(
$controllerSource = file_get_contents(
dirname(__DIR__) . '/app/Controllers/CloudPageController.php'
);
$pageServiceSource = file_get_contents(
dirname(__DIR__) . '/app/Services/Cloud/CloudInvoicePageService.php'
);
$assert(is_string($source)
&& !str_contains($source, 'App\\Models')
&& !preg_match('/\\btime\\s*\\(/', $source)
&& !str_contains($source, 'CloudInvoicePaymentService')
&& !str_contains($source, 'CloudInvoiceService::'),
'Presentation module acquired an ORM, clock, payment-provider or domain-service dependency.');
$assert(is_string($controllerSource)
&& str_contains($controllerSource,
'CloudInvoicePresentation::summaries($payload[\'invoices\'])')
$assert(is_string($controllerSource) && is_string($pageServiceSource)
&& str_contains($pageServiceSource,
'CloudInvoicePresentation::summaries(')
&& str_contains($controllerSource, "\$rows = \$payload['invoices'];")
&& str_contains($controllerSource,
'CloudInvoicePresentation::detail($payload)'),
'Invoice SSR adapters do not consume the unified presentation module.');

@ -140,16 +140,18 @@ $assert(is_string($detailRuntime) && is_string($listRuntime)
"renewal_grace: ['已到期,宽限期内可续费', 'warning']")
&& str_contains($detailRuntime,
'invoice.display_status ?? invoice.status')
&& str_contains($listRuntime,
"renewal_grace: ['已到期,宽限期内可续费', 'warning']")
&& str_contains($listRuntime,
'invoice.display_status ?? invoiceStatus')
&& str_contains($detailRuntime,
"review: ['待人工核对', 'warning']")
&& str_contains($detailRuntime,
"invoicePurpose(invoice) === 'ip_change'")
&& str_contains($listRuntime,
"['upgrade', 'ip_change'].includes(purpose)"),
'Invoice client rendering does not consume the canonical grace status.');
&& str_contains($listRuntime, 'invoice?.status_label')
&& str_contains($listRuntime, 'invoice?.status_class')
&& str_contains($listRuntime, 'invoice?.fulfillment_label')
&& str_contains($listRuntime, 'invoice?.polling_required === true')
&& !str_contains($listRuntime, 'function invoiceStatusInfo(')
&& !str_contains($listRuntime, 'function fulfillmentStatusInfo(')
&& !str_contains($listRuntime,
"renewal_grace: ['已到期,宽限期内可续费', 'warning']"),
'Invoice list client must consume the server presentation without rebuilding it.');
echo "Cloud invoice SSR presentation checks passed.\n";

Loading…
Cancel
Save