Commit ebd45d4
committed
fix(wallets): cascade ongoing usage [ING-112]
## Context
Lago consumes wallet credits through two paths that diverge for
multi-wallet customers. Billing already cascades across wallets in
priority order, but ongoing usage stopped at the first wallet,
absorbing all usage there and going negative instead of spilling onto
the next. The negative ongoing balance is customer-visible and breaks
the two-wallet (paid + free) setup.
## Description
Add Wallets::Balance::AllocateOngoingUsageByWalletsService, which
mirrors the billing-side cascade: it nets current, draft, progressive
and pay-in-advance usage per fee, then distributes it across the
customer's active wallets in priority order. Each applicable wallet
fills to its balance and spills the overflow onto the next; the last
applicable wallet absorbs the remainder and may go negative, since
ongoing usage has no invoice to carry the excess. An over-billed fee
key reduces a per-currency budget the same way billing credits reduce
the invoice total, so wallets never absorb more than the customer's
net unbilled usage. A wallet with an active threshold-based recurring
rule keeps the previous behavior (absorbs everything, may go negative)
so the rule can fire and refill it.
RefreshWalletsService runs the allocator once and feeds each wallet its
precomputed amount. Because the cascade makes allocations
interdependent, every refresh now persists all wallets: the previous
target_wallet_ids narrowing would leave non-target wallets stale. The
per-fee single-wallet assignment and its FindApplicableOnFeesService
and BuildAllocationRulesService helpers are removed, and pre-existing
scenario specs documenting the old "whole fee to the first applicable
wallet" behavior are updated to the new billing-parity cascade.1 parent c220386 commit ebd45d4
15 files changed
Lines changed: 668 additions & 925 deletions
File tree
- app
- jobs/customers
- services
- customers
- wallets
- balance
- spec
- jobs/customers
- scenarios
- wallets
- services
- customers
- wallets
- balance
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
26 | | - | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
| 34 | + | |
62 | 35 | | |
63 | 36 | | |
64 | 37 | | |
65 | | - | |
66 | | - | |
67 | 38 | | |
68 | 39 | | |
69 | 40 | | |
| |||
72 | 43 | | |
73 | 44 | | |
74 | 45 | | |
75 | | - | |
| 46 | + | |
76 | 47 | | |
77 | | - | |
78 | | - | |
79 | | - | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
80 | 51 | | |
81 | | - | |
82 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
83 | 55 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
89 | 60 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
95 | 64 | | |
96 | | - | |
| 65 | + | |
| 66 | + | |
97 | 67 | | |
98 | 68 | | |
99 | | - | |
100 | | - | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
101 | 81 | | |
102 | 82 | | |
103 | 83 | | |
Lines changed: 145 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
Lines changed: 4 additions & 43 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | 12 | | |
17 | 13 | | |
18 | 14 | | |
19 | 15 | | |
20 | 16 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 17 | | |
25 | 18 | | |
26 | 19 | | |
| |||
35 | 28 | | |
36 | 29 | | |
37 | 30 | | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 31 | + | |
69 | 32 | | |
70 | 33 | | |
71 | 34 | | |
| |||
89 | 52 | | |
90 | 53 | | |
91 | 54 | | |
92 | | - | |
93 | | - | |
94 | | - | |
| 55 | + | |
95 | 56 | | |
96 | 57 | | |
97 | 58 | | |
| |||
0 commit comments