Stirling-Tools/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2026-09-02 21:03:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop charging for failed runs

Browse Source
This commit is contained in:
James Brunton
2026-09-02 14:20:51 +01:00
parent 6bc4d6ce0f
commit 73baf60317
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/saas/src/main/java/stirling/software/saas/payg/filter/PaygChargeInterceptor.java
+9 -4
View File
@@ -65,7 +65,7 @@ import stirling.software.saas.util.AuthenticationUtils;
* service.
*
* <p>{@code afterCompletion}: branches on HTTP status — 2xx hashes the response body for OUTPUT
* lineage; 4xx records a step append for audit; 5xx triggers refund-and-close (OPENED) or
* lineage; any error (4xx or 5xx) is never charged and triggers refund-and-close (OPENED) or
* step-quota return (JOINED). Closes all input temp files and the response wrapper at the end.
*
* <p>Fail-open everywhere: any unexpected {@link RuntimeException} is swallowed, logged at WARN,
@@ -392,9 +392,14 @@ public class PaygChargeInterceptor implements AsyncHandlerInterceptor {
return;
}
if (status >= 400) {
// 4xx: customer paid for the attempt. No OUTPUT recording, no refund.
// Still a successful-from-billing-standpoint OPENED process — meter it below.
meterIfOpened(jobId, disposition);
// Errored work is never charged: refund the request that opened the process, or drop
// the added step for a joined follow-up.
if (disposition == ChargeOutcome.Disposition.OPENED) {
chargeService.markFirstStepFailed(jobId, "first-step-4xx:" + status);
refundsCounter.increment();
} else {
chargeService.decrementStepCount(jobId);
}
return;
}
app/saas/src/test/java/stirling/software/saas/payg/filter/PaygChargeInterceptorTest.java
+25 -4
View File
@@ -274,7 +274,7 @@ class PaygChargeInterceptorTest {
}
@Test
void afterCompletion_4xx_appendsFailedStepNoRefundNoOutputs() throws Exception {
void afterCompletion_4xx_opened_refundsAndNeverMeters() throws Exception {
authenticateWithApiKey(makeUser(7L, 42L));
UUID jobId = UUID.randomUUID();
when(chargeService.openProcess(any(), anyList()))
@@ -288,13 +288,34 @@ class PaygChargeInterceptorTest {
interceptor.preHandle(req, res, handlerMethodForFakeController());
interceptor.afterCompletion(req, res, handlerMethodForFakeController(), null);
verify(chargeService, never()).markFirstStepFailed(any(), any());
// Errored work is never charged: the opener is refunded, and it never meters.
verify(chargeService).markFirstStepFailed(eq(jobId), eq("first-step-4xx:422"));
verify(chargeService, never()).decrementStepCount(any());
verify(jobService, never()).recordOutput(any(), any());
verify(jobService)
.appendStep(eq(jobId), any(), eq(JobStepStatus.FAILED), any(), any(), eq("422"));
// 4xx is a full charge (customer paid for the attempt), so it still meters.
verify(chargeService).meterJobUsage(jobId);
assertThat(meterRegistry.counter("payg.filter.refunds").count()).isEqualTo(1.0);
verify(chargeService, never()).meterJobUsage(any());
}
@Test
void afterCompletion_4xx_joined_callsDecrementStepCount() throws Exception {
authenticateWithApiKey(makeUser(7L, 42L));
UUID jobId = UUID.randomUUID();
when(chargeService.openProcess(any(), anyList()))
.thenReturn(new ChargeOutcome(jobId, 0, ChargeOutcome.Disposition.JOINED));
MockMultipartHttpServletRequest req = newMultipart();
req.addFile(new MockMultipartFile("file", "x.pdf", "application/pdf", "abc".getBytes()));
MockHttpServletResponse res = new MockHttpServletResponse();
res.setStatus(422);
interceptor.preHandle(req, res, handlerMethodForFakeController());
interceptor.afterCompletion(req, res, handlerMethodForFakeController(), null);
verify(chargeService).decrementStepCount(jobId);
verify(chargeService, never()).markFirstStepFailed(any(), any());
verify(chargeService, never()).meterJobUsage(any());
}
@Test