供应商和租赁账户首页不合理,帮我重新设计,应该是包含各自角色相关的统计图表信息,和监控状态信息。
This commit is contained in:
1 parent
8dcb313454
commit
02dd5668d5
7 files changed
+383
No files matched your search
@@ -506,6 +506,108 @@ public class RentalBusinessTest {
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void dashboardSeparatesBuyerSupplierAndActualLedgerMoney() {
|
||||
Map<String, Object> order = create("DASHBOARD-CHARGE");
|
||||
store.update("order", number(order, "id"), map("supplier_user_id", 20,
|
||||
"supplier_account_id", supplier, "status", "SUCCESS", "service_expires_at", after(3600)));
|
||||
tx.execute(status -> { funds.charge(store.get("order", number(order, "id"), true)); return null; });
|
||||
RentalDashboard dashboard = new RentalDashboard(store);
|
||||
Map<String, Object> buyer = dashboard.overview(10, "account", "NILE", 7);
|
||||
Map<String, Object> seller = dashboard.overview(20, "supplier", "NILE", 7);
|
||||
Map<String, Object> bought = (Map<String, Object>) buyer.get("orders");
|
||||
Map<String, Object> sold = (Map<String, Object>) seller.get("orders");
|
||||
assertEquals(1, number(bought, "total"));
|
||||
assertEquals(1, number(sold, "success"));
|
||||
assertEquals("10.000000", text(bought, "amount"));
|
||||
assertEquals("7.600000", text(sold, "amount"));
|
||||
assertEquals(1, number((Map<String, Object>) buyer.get("monitoring"), "active_leases"));
|
||||
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "supplier", "NILE", 7).get("orders"), "total"));
|
||||
assertEquals(0, number((Map<String, Object>) dashboard.overview(20, "account", "NILE", 7).get("orders"), "total"));
|
||||
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "account", "MAINNET", 7).get("orders"), "total"));
|
||||
assertFalse(((Map<String, Object>) buyer.get("balance")).containsKey("pending"));
|
||||
assertEquals(7, ((List<?>) buyer.get("trend")).size());
|
||||
Map<String, Object> today = (Map<String, Object>) ((List<?>) buyer.get("trend")).get(6);
|
||||
assertEquals("10.000000", text(today, "amount"));
|
||||
assertEquals(1, number(today, "total"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void dashboardUsesHeartbeatLeaseAndFreshNonnegativeResourceSnapshots() {
|
||||
RentalDashboard dashboard = new RentalDashboard(store);
|
||||
store.update("node", node, map("heartbeat_expires_at", after(-1), "heartbeat_at", now()));
|
||||
store.update("wallet", wallet, map("snapshot_expires_at", after(300), "snapshot_block_height", 100,
|
||||
"snapshot_min_block_height", 99, "energy_available", 500, "bandwidth_available", 200,
|
||||
"bandwidth_enabled", 1));
|
||||
Map<String, Object> result = dashboard.overview(20, "supplier", "NILE", 14);
|
||||
assertEquals(1, number((Map<String, Object>) result.get("nodes"), "total"));
|
||||
assertEquals(0, number((Map<String, Object>) result.get("nodes"), "online"));
|
||||
assertEquals(Boolean.FALSE, ((Map<String, Object>) ((List<?>) result.get("node_status")).get(0)).get("online"));
|
||||
assertEquals(500, number((Map<String, Object>) result.get("wallets"), "energy"));
|
||||
assertEquals(200, number((Map<String, Object>) result.get("wallets"), "bandwidth"));
|
||||
store.update("wallet", wallet, map("snapshot_expires_at", after(-1)));
|
||||
assertEquals(0, number((Map<String, Object>) dashboard.overview(20, "supplier", "NILE", 14).get("wallets"), "energy"));
|
||||
store.update("wallet", wallet, map("snapshot_expires_at", after(300), "energy_available", -10,
|
||||
"bandwidth_available", -5));
|
||||
Map<String, Object> nonnegative = (Map<String, Object>) dashboard.overview(20, "supplier", "NILE", 14).get("wallets");
|
||||
assertEquals(0, number(nonnegative, "energy"));
|
||||
assertEquals(0, number(nonnegative, "bandwidth"));
|
||||
assertEquals(0, number((Map<String, Object>) dashboard.overview(10, "supplier", "NILE", 14).get("nodes"), "total"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void dashboardAggregatesBeyondPageLimitAndEmptyReadsDoNotOpenAccounts() {
|
||||
Map<String, Object> original = create("DASHBOARD-MANY");
|
||||
Map<String, Object> copy = new LinkedHashMap<>(original);
|
||||
copy.remove("id");
|
||||
for (int index = 0; index < 55; index++) {
|
||||
copy.put("order_no", "DASH-" + index);
|
||||
copy.put("merchant_order_no", "DASH-" + index);
|
||||
store.insert("order", copy);
|
||||
}
|
||||
RentalDashboard dashboard = new RentalDashboard(store);
|
||||
Map<String, Object> result = dashboard.overview(10, "account", "NILE", 30);
|
||||
assertEquals(56, number((Map<String, Object>) result.get("orders"), "total"));
|
||||
assertEquals("0.000000", text((Map<String, Object>) result.get("orders"), "amount"));
|
||||
assertEquals(6, ((List<?>) result.get("recent_orders")).size());
|
||||
assertEquals(30, ((List<?>) result.get("trend")).size());
|
||||
Map<String, Object> empty = dashboard.overview(999, "account", "MAINNET", 7);
|
||||
assertEquals("NOT_OPEN", text((Map<String, Object>) empty.get("balance"), "status"));
|
||||
assertEquals(0, store.rows("SELECT id FROM rent_account WHERE user_id=999").size());
|
||||
expectFailure(() -> dashboard.overview(10, "admin", "NILE", 7));
|
||||
expectFailure(() -> dashboard.overview(10, "account", "OTHER", 7));
|
||||
expectFailure(() -> dashboard.overview(10, "account", "NILE", 365));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void dashboardKeepsCurrentAlertsOutsideRangeAndAllowsNegativeNetSpending() {
|
||||
Map<String, Object> order = create("DASHBOARD-HISTORY");
|
||||
long orderId = number(order, "id");
|
||||
store.update("order", orderId, map("supplier_user_id", 20, "supplier_account_id", supplier,
|
||||
"status", "SUCCESS", "service_expires_at", after(-100), "reclaim_status", "MANUAL_REVIEW"));
|
||||
tx.execute(status -> { funds.charge(store.get("order", orderId, true)); return null; });
|
||||
// 早期扣款不进入本期消费;当前退款仍应进入本期,形成负净消费。
|
||||
store.execute("UPDATE rent_ledger SET created_at=? WHERE event_type='CHARGE'", now().minusDays(40));
|
||||
store.update("order", orderId, map("created_at", now().minusDays(40)));
|
||||
tx.execute(status -> { funds.post(payer, "DASH-REFUND", "REFUND", money("2"), ZERO,
|
||||
ZERO, ZERO, orderId, null, null, 99, "fixture", "看板退款口径测试"); return null; });
|
||||
orders.webhook(store.get("order", orderId, false), "SUCCESS", "DASH-WEBHOOK");
|
||||
store.execute("UPDATE rent_webhook SET status='DEAD' WHERE order_id=?", orderId);
|
||||
RentalDashboard dashboard = new RentalDashboard(store);
|
||||
Map<String, Object> result = dashboard.overview(10, "account", "NILE", 7);
|
||||
assertEquals(0, number((Map<String, Object>) result.get("orders"), "total"));
|
||||
assertEquals("-2.000000", text((Map<String, Object>) result.get("orders"), "amount"));
|
||||
assertEquals(1, number((Map<String, Object>) result.get("monitoring"), "manual"));
|
||||
assertEquals(1, number((Map<String, Object>) result.get("monitoring"), "reclaim_pending"));
|
||||
assertEquals(1, number((Map<String, Object>) ((List<?>) result.get("webhooks")).get(0), "total"));
|
||||
assertTrue(((List<?>) dashboard.overview(20, "account", "NILE", 7).get("webhooks")).isEmpty());
|
||||
assertTrue(((List<?>) dashboard.overview(10, "account", "MAINNET", 7).get("webhooks")).isEmpty());
|
||||
}
|
||||
|
||||
private Map<String, Object> create(String number) {
|
||||
return tx.execute(
|
||||
status ->
|
||||
|
||||
Reference in new issue
Block a user