Compare commits

..

7 commits

Author SHA1 Message Date
faa0a1495b
fix(deps): update dependency ajv-formats to v3
All checks were successful
CI / Get Changed Files (pull_request) Successful in 8s
CI / Checkstyle Main (pull_request) Has been skipped
CI / prettier (pull_request) Successful in 22s
CI / eslint (pull_request) Successful in 1m36s
CI / test-build (pull_request) Successful in 1m42s
2025-04-02 10:42:58 +00:00
823cb88807
Merge pull request 'Update the stripe api' (!119) from fix-renovate into main
All checks were successful
Release / Release (push) Successful in 56s
Reviewed-on: #119
Reviewed-by: Phan Huy Tran <ptran@noreply.localhost>
2025-04-02 10:21:33 +00:00
0aa7ad1031
style: Fix missing newline at end of files
All checks were successful
CI / Get Changed Files (pull_request) Successful in 6s
CI / eslint (pull_request) Successful in 1m3s
CI / prettier (pull_request) Successful in 51s
CI / test-build (pull_request) Successful in 1m23s
CI / Checkstyle Main (pull_request) Successful in 3m40s
2025-04-02 12:17:35 +02:00
b1b8c939a6
Merge branch 'main' into fix-renovate
Some checks failed
CI / Get Changed Files (pull_request) Successful in 6s
CI / prettier (pull_request) Successful in 23s
CI / Checkstyle Main (pull_request) Failing after 38s
CI / eslint (pull_request) Successful in 1m1s
CI / test-build (pull_request) Successful in 1m30s
2025-04-02 12:15:23 +02:00
6182ff717f
feat(deposit): enhance payment session handling and error logging
Some checks failed
CI / Get Changed Files (pull_request) Successful in 7s
CI / prettier (pull_request) Successful in 27s
CI / Checkstyle Main (pull_request) Failing after 1m0s
CI / eslint (pull_request) Successful in 1m54s
CI / test-build (pull_request) Successful in 2m2s
2025-04-02 12:12:13 +02:00
4c3f42d347
Merge pull request 'fix(deps): update dependency ajv to v8.17.1' (!117) from renovate/dependencies-(major-and-minor) into main
All checks were successful
Release / Release (push) Successful in 1m10s
Reviewed-on: #117
Reviewed-by: Jan K9f <jan@kjan.email>
2025-04-02 10:03:53 +00:00
ab80f5d285
fix(deps): update dependency ajv to v8.17.1
All checks were successful
CI / Get Changed Files (pull_request) Successful in 7s
CI / Checkstyle Main (pull_request) Has been skipped
CI / eslint (pull_request) Successful in 31s
CI / test-build (pull_request) Successful in 40s
CI / prettier (pull_request) Successful in 45s
2025-04-02 10:01:37 +00:00
5 changed files with 115 additions and 463 deletions

View file

@ -52,11 +52,15 @@ public class DepositController {
SessionCreateParams params = SessionCreateParams.builder() SessionCreateParams params = SessionCreateParams.builder()
.addLineItem(SessionCreateParams.LineItem.builder() .addLineItem(SessionCreateParams.LineItem.builder()
.setAmount((long) amountDto.getAmount() * 100) .setPriceData(SessionCreateParams.LineItem.PriceData.builder()
.setCurrency("EUR") .setCurrency("EUR")
.setQuantity(1L) .setUnitAmount((long) amountDto.getAmount() * 100)
.setProductData(SessionCreateParams.LineItem.PriceData.ProductData.builder()
.setName("Einzahlung") .setName("Einzahlung")
.build()) .build())
.build())
.setQuantity(1L)
.build())
.setSuccessUrl(frontendHost+"/home?success=true") .setSuccessUrl(frontendHost+"/home?success=true")
.setCancelUrl(frontendHost+"/home?success=false") .setCancelUrl(frontendHost+"/home?success=false")
.setMode(SessionCreateParams.Mode.PAYMENT) .setMode(SessionCreateParams.Mode.PAYMENT)

View file

@ -40,7 +40,7 @@ public class TransactionService {
.build(); .build();
Session checkoutSession = Session.retrieve(sessionID, params, null); Session checkoutSession = Session.retrieve(sessionID, params, null);
if (!Objects.equals(checkoutSession.getPaymentStatus(), "paid")) { if (!"paid".equals(checkoutSession.getPaymentStatus())) {
return; return;
} }
@ -53,10 +53,12 @@ public class TransactionService {
transaction.setStatus(TransactionStatus.SUCCEEDED); transaction.setStatus(TransactionStatus.SUCCEEDED);
UserEntity user = transaction.getUser(); UserEntity user = transaction.getUser();
user.addBalance(checkoutSession.getAmountTotal()); Long amountTotal = checkoutSession.getAmountTotal();
if (amountTotal != null) {
user.addBalance(amountTotal);
}
userRepository.save(user); userRepository.save(user);
transactionRepository.save(transaction); transactionRepository.save(transaction);
} }
} }

View file

@ -51,12 +51,18 @@ public class WebhookController {
switch (event.getType()) { switch (event.getType()) {
case "checkout.session.completed": case "checkout.session.completed":
case "checkout.session.async_payment_succeeded": case "checkout.session.async_payment_succeeded":
Session session = (Session) event.getData().getObject(); EventDataObjectDeserializer dataObjectDeserializer = event.getDataObjectDeserializer();
if (dataObjectDeserializer.getObject().isPresent()) {
Session session = (Session) dataObjectDeserializer.getObject().get();
this.transactionService.fulfillCheckout(session.getId()); this.transactionService.fulfillCheckout(session.getId());
} else {
logger.error("Failed to deserialize webhook event data");
}
break; break;
default: default:
// No action needed for other event types
break;
} }
return ResponseEntity.ok().body(null); return ResponseEntity.ok().body(null);

File diff suppressed because it is too large Load diff

View file

@ -28,7 +28,7 @@
"@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/free-solid-svg-icons": "^6.7.2",
"@stripe/stripe-js": "^7.0.0", "@stripe/stripe-js": "^7.0.0",
"@tailwindcss/postcss": "^4.0.3", "@tailwindcss/postcss": "^4.0.3",
"ajv": "8.8.0", "ajv": "8.17.1",
"ajv-formats": "3.0.1", "ajv-formats": "3.0.1",
"gsap": "^3.12.7", "gsap": "^3.12.7",
"keycloak-angular": "^19.0.0", "keycloak-angular": "^19.0.0",