feat(admin): an all-accounts ledger section with filters and totals
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 12s
CI / integration (pull_request) Successful in 22s
CI / ui (pull_request) Successful in 1m16s
CI / conformance (pull_request) Successful in 10s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m47s
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 12s
CI / integration (pull_request) Successful in 22s
CI / ui (pull_request) Successful in 1m16s
CI / conformance (pull_request) Successful in 10s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m47s
There was no way to see the money as a whole: the ledger was only ever rendered inside one account's card, so "what came in last month" meant exporting the entire CSV and reading it elsewhere. /_gm/ledger lists every operation, newest first, filtered by date range (defaulting to the last 30 days), by wallet, by rail, by kind and by account. Wallet and rail are deliberately separate axes because they answer different questions — "what happened on VK" matches the funded segment or the benefit origin, while "what came through YooKassa" matches the settling provider, and a chip spend has no rail at all, so it drops out of that filter by construction. Above the table sit the totals for everything the filter matches, not merely the page on screen, which is the point of showing them. Money is listed per currency because the rails settle in roubles, Votes and Stars and one sum across them would mean nothing. Row amounts come from the operation snapshot, since the ledger's own columns count chips rather than money. Paging, the CSV export and a refund's way back are all built from the same encoded filter, so none of them can quietly show a different slice than the screen. The export moves here from the user card and gains the filter along with money columns; it is capped, because an append-only ledger grows forever and an unbounded export would eventually time out. The refund action moves onto the funded rows here — an operator can now find a payment by filter without knowing whose it is first — and returns to the same filtered view. The destination travels with the form but is only honoured when it is a console path, so a crafted form cannot turn it into an open redirect. The user card keeps the account's standing rather than its history: balances, benefits, the risk flag and a lifetime summary (money paid and refunded per currency, chips credited and spent), plus a link into the ledger scoped to that account. Operations are rendered in one place, with filters and paging, instead of two. Tests: the filter axes, paging that neither repeats nor drops a row, totals that describe the range rather than the page, money recovered from a snapshot and absent on a spend, and the console page, the export and the card hand-off. The existing finance-panel test now asserts the summary and that the card no longer re-renders the rows.
This commit is contained in:
@@ -8,6 +8,7 @@ import (
|
||||
"html/template"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -119,6 +120,7 @@ func (s *Server) registerConsole(router *gin.Engine) {
|
||||
gm.POST("/catalog/:id", s.consoleUpdateProduct)
|
||||
gm.POST("/catalog/:id/archive", s.consoleArchiveProduct)
|
||||
gm.POST("/catalog/:id/delete", s.consoleDeleteProductAction)
|
||||
gm.GET("/ledger", s.consoleLedger)
|
||||
gm.GET("/ledger.csv", s.consoleLedgerExport)
|
||||
}
|
||||
}
|
||||
@@ -458,7 +460,7 @@ func (s *Server) consoleUserDetail(c *gin.Context) {
|
||||
}
|
||||
if s.payments != nil {
|
||||
if stmt, err := s.payments.AccountStatement(ctx, id); err == nil {
|
||||
view.Finance = financeView(stmt)
|
||||
view.Finance = financeView(id, stmt)
|
||||
} else {
|
||||
s.log.Warn("console: account statement failed", zap.String("account", id.String()), zap.Error(err))
|
||||
}
|
||||
@@ -470,9 +472,11 @@ func (s *Server) consoleUserDetail(c *gin.Context) {
|
||||
s.renderConsole(c, "user_detail", "users", acc.DisplayName, view)
|
||||
}
|
||||
|
||||
// financeView projects an account's payments statement into the user-card finance panel, with the
|
||||
// benefit expiry and ledger times pre-formatted for the logic-free template.
|
||||
func financeView(stmt payments.Statement) adminconsole.FinanceView {
|
||||
// financeView projects an account's payments statement into the user-card finance panel: where the
|
||||
// account stands (balances, benefits, lifetime money and chip totals), not what happened when. The
|
||||
// operations themselves are the ledger section's job, which the panel links to pre-filtered to this
|
||||
// account — one place renders them, with filters and paging, instead of two.
|
||||
func financeView(id uuid.UUID, stmt payments.Statement) adminconsole.FinanceView {
|
||||
fv := adminconsole.FinanceView{Present: true, Abuse: stmt.Risk.Abuse, Loss: stmt.Risk.LossChips}
|
||||
for _, sg := range stmt.Segments {
|
||||
fv.Segments = append(fv.Segments, adminconsole.SegmentRow{Source: string(sg.Source), Chips: sg.Chips})
|
||||
@@ -484,16 +488,52 @@ func financeView(stmt payments.Statement) adminconsole.FinanceView {
|
||||
}
|
||||
fv.Benefits = append(fv.Benefits, row)
|
||||
}
|
||||
// The lifetime totals are folded from the history the statement already carries, so the summary
|
||||
// costs no extra query. Money is kept per currency: the rails settle in roubles, Votes and Stars,
|
||||
// and one sum across them would mean nothing.
|
||||
paid, refunded := map[payments.Currency]int64{}, map[payments.Currency]int64{}
|
||||
for _, e := range stmt.Ledger {
|
||||
fv.Ledger = append(fv.Ledger, adminconsole.LedgerRow{
|
||||
Kind: e.Kind, Source: e.Source, Origin: e.Origin, ChipsDelta: e.ChipsDelta,
|
||||
Product: e.ProductID, Order: e.OrderID, Provider: e.Provider, Shop: e.Shop, Snapshot: e.Snapshot,
|
||||
At: fmtTime(e.CreatedAt),
|
||||
})
|
||||
if e.ChipsDelta > 0 {
|
||||
fv.ChipsBought += e.ChipsDelta
|
||||
} else if e.Kind == "spend" {
|
||||
fv.ChipsSpent -= e.ChipsDelta
|
||||
}
|
||||
m := payments.MoneyFromLedgerSnapshot(e.Snapshot)
|
||||
if m.Currency() == "" {
|
||||
continue
|
||||
}
|
||||
switch e.Kind {
|
||||
case "fund":
|
||||
paid[m.Currency()] += m.Minor()
|
||||
case "refund":
|
||||
refunded[m.Currency()] += m.Minor()
|
||||
}
|
||||
}
|
||||
fv.Paid = fmtMoneyTotals(paid)
|
||||
fv.Refunded = fmtMoneyTotals(refunded)
|
||||
fv.LedgerQuery = template.URL(url.Values{"user": {id.String()}}.Encode())
|
||||
return fv
|
||||
}
|
||||
|
||||
// fmtMoneyTotals renders per-currency minor-unit sums as display strings, in a stable order so the
|
||||
// panel does not reshuffle between reloads (map iteration is random).
|
||||
func fmtMoneyTotals(totals map[payments.Currency]int64) []string {
|
||||
currencies := make([]string, 0, len(totals))
|
||||
for c := range totals {
|
||||
currencies = append(currencies, string(c))
|
||||
}
|
||||
sort.Strings(currencies)
|
||||
out := make([]string, 0, len(currencies))
|
||||
for _, c := range currencies {
|
||||
m, err := payments.MoneyFromMinor(totals[payments.Currency(c)], payments.Currency(c))
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
out = append(out, fmtMoney(m))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// overrideName renders a purchase override as the form/select value ("default"/"allow"/"deny").
|
||||
func overrideName(ov payments.PurchaseOverride) string {
|
||||
switch ov {
|
||||
|
||||
Reference in New Issue
Block a user