Commit 46e63b7
committed
Add PricingPolicyService + admin REST + LISTEN/NOTIFY cache invalidation
PR-I1 (service half). Built off #6460 — sibling of #6464 (lineage primitives),
both stacked on payg-i2-document-classifier so they can review independently.
Lookup precedence:
- PaygTeamExtensions.pricingPolicyId override → load that policy
- else load the pricing_policy row with is_default = TRUE
- if the override points at a deleted row, fall back to default (logs a warn —
safety net for racing deletes)
Cache:
- 30s Caffeine, keyed by teamId, max 10k entries — correctness floor.
- Invalidated on PolicyChangedEvent from any source (admin mutation here, or
cross-instance via the Postgres LISTEN runner).
- Admin reads bypass the cache (getEffectivePolicyUncached) so admins always
see their own writes.
Writes (service layer, transactional, fire-after-commit event):
- create(draft) — rejects pre-set policy_id or is_default=true (promotion
must go through setDefault so the partial unique idx is freed first).
- setDefault(id) — clearDefaultFlag + flip; idempotent no-op if already
default (no event fired in that case).
- setTeamOverride(teamId, policyId|null) — validate policy exists before save.
Admin REST surface — /api/v1/admin/payg/...
- GET /policies, GET /policies/{id}, POST /policies
- POST /policies/{id}/set-default
- PUT /teams/{teamId}/policy-override
- GET /teams/{teamId}/effective-policy (bypasses cache)
All gated by @PreAuthorize("hasRole('ADMIN')"). Validation errors return 400,
unknown rows return 404.
LISTEN/NOTIFY runner (PolicyChangeListener):
- Opens a dedicated raw JDBC connection via DriverManager (not HikariCP —
Hikari would evict idle LISTEN connections) and polls getNotifications()
on a daemon thread.
- Reconnects with 5s backoff on SQLException; the 30s TTL is the correctness
floor during outages.
- Disabled by setting payg.policy.listen.enabled=false (default on).
- PgJDBC moved to compileOnly on :saas; the runtime artifact is still
bundled via :proprietary.
V11 migration: seed the V1 default policy (25 pages/unit, 5 MiB/unit,
min charge 1, file cap 1000) + step limits per JobSource (WEB/API/DESKTOP_APP
10, PIPELINE 20). Idempotent — only inserts when no default exists.
Tests: 17 PricingPolicyServiceTest + 14 PricingPolicyAdminControllerTest, all
passing. Coverage moves 10.87% → 12.40% LINE and 11.89% → 13.85% INSTRUCTION.
Counterpart Supabase migration (NOTIFY trigger function + per-table triggers
on pricing_policy*, payg_team_extensions overrides, wallet_policy; plus the
default-policy seed) ships on a separate SaaS PR on payg-i1-pricing-policy-service.1 parent 83ea07e commit 46e63b7
10 files changed
Lines changed: 1277 additions & 0 deletions
File tree
- app/saas
- src
- main
- java/stirling/software/saas/payg
- policy
- admin
- repository
- resources/db/migration/saas
- test/java/stirling/software/saas/payg/policy
- admin
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
43 | 47 | | |
44 | 48 | | |
45 | 49 | | |
Lines changed: 192 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 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
Lines changed: 28 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 | + | |
0 commit comments