mats/go-cart-actor
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

update
All checks were successful
Build and Publish / BuildAndDeployAmd64 (push) Successful in 1m4s
Details
Build and Publish / BuildAndDeployArm64 (push) Successful in 6m18s
Details

Browse Source
This commit is contained in:
matst80
2025-12-04 08:51:59 +01:00
parent 7606c1f9df
commit 82b64ee8d4
3 changed files with 83 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
cmd/checkout/adyen-handlers.go
View File

@@ -18,7 +18,6 @@ import (
"github.com/adyen/adyen-go-api-library/v21/src/common"
"github.com/adyen/adyen-go-api-library/v21/src/hmacvalidator"
"github.com/adyen/adyen-go-api-library/v21/src/webhook"
"github.com/google/uuid"
"google.golang.org/protobuf/types/known/anypb"
"google.golang.org/protobuf/types/known/timestamppb"
)
@@ -75,7 +74,7 @@ func getCheckoutIdFromNotificationItem(item webhook.NotificationRequestItem) (ui
func (s *CheckoutPoolServer) AdyenHookHandler(w http.ResponseWriter, r *http.Request) {
var notificationRequest webhook.Webhook
service := s.adyenClient.Checkout()
//service := s.adyenClient.Checkout()
if err := json.NewDecoder(r.Body).Decode(&notificationRequest); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
@@ -91,18 +90,6 @@ func (s *CheckoutPoolServer) AdyenHookHandler(w http.ResponseWriter, r *http.Req
http.Error(w, "Invalid HMAC", http.StatusUnauthorized)
return
} else {
checkoutId, err := getCheckoutIdFromNotificationItem(item)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// Check if this checkout is owned by another host
if host, ok := s.OwnerHost(checkoutId); ok {
cartHostMap[host] = append(cartHostMap[host], notificationItem)
continue
}
// Marshal item data for PaymentEvent
dataBytes, err := json.Marshal(item)
if err != nil {
@@ -110,9 +97,20 @@ func (s *CheckoutPoolServer) AdyenHookHandler(w http.ResponseWriter, r *http.Req
http.Error(w, "Error marshaling item", http.StatusInternalServerError)
return
}
switch item.EventCode {
case "CAPTURE":
checkoutId, err := getCheckoutIdFromNotificationItem(item)
if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// Check if this checkout is owned by another host
if host, ok := s.OwnerHost(checkoutId); ok {
cartHostMap[host] = append(cartHostMap[host], notificationItem)
continue
}
log.Printf("Capture status: %v", item.Success)
isSuccess := item.Success == "true"
// Apply payment event for capture
@@ -126,74 +124,77 @@ func (s *CheckoutPoolServer) AdyenHookHandler(w http.ResponseWriter, r *http.Req
}
// If successful, apply payment completed
if isSuccess {
if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentCompleted{
PaymentId: item.PspReference,
Status: "captured",
Amount: item.Amount.Value,
Currency: item.Amount.Currency,
ProcessorReference: &item.PspReference,
CompletedAt: timestamppb.New(time.Now()),
}); err != nil {
log.Printf("error applying payment completed: %v", err)
}
}
case "AUTHORISATION":
isSuccess := item.Success == "true"
// Apply payment event for authorization
if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentEvent{
PaymentId: item.PspReference,
Success: isSuccess,
Name: item.EventCode,
Data: &anypb.Any{Value: dataBytes},
//if isSuccess {
if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentCompleted{
PaymentId: item.PspReference,
Status: item.Success,
Amount: item.Amount.Value,
Currency: item.Amount.Currency,
ProcessorReference: &item.PspReference,
CompletedAt: timestamppb.New(time.Now()),
}); err != nil {
log.Printf("error applying authorization event: %v", err)
http.Error(w, "Message not parsed", http.StatusInternalServerError)
return
}
//}
// If successful authorization, trigger capture
if isSuccess {
grain, err := s.Get(r.Context(), checkoutId)
if err != nil {
log.Printf("Error getting checkout: %v", err)
http.Error(w, "Checkout not found", http.StatusBadRequest)
return
}
meta := GetCheckoutMetaFromRequest(r)
pspReference := item.PspReference
uid := uuid.New().String()
ref := uuid.New().String()
req := service.ModificationsApi.CaptureAuthorisedPaymentInput(pspReference).IdempotencyKey(uid).PaymentCaptureRequest(adyenCheckout.PaymentCaptureRequest{
Amount: adyenCheckout.Amount{
Currency: meta.Currency,
Value: grain.CartTotalPrice.IncVat,
},
MerchantAccount: "ElgigantenECOM",
Reference: &ref,
})
res, _, err := service.ModificationsApi.CaptureAuthorisedPayment(r.Context(), req)
if err != nil {
log.Printf("Error capturing payment: %v", err)
} else {
log.Printf("Payment captured successfully: %+v", res)
s.Apply(r.Context(), checkoutId, &messages.OrderCreated{
OrderId: res.PaymentPspReference,
Status: item.EventCode,
})
}
}
//case "AUTHORISATION":
//isSuccess := item.Success == "true"
//log.Panicln("Handling auth: %+v", item)
// // Apply payment event for authorization
// if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentEvent{
// PaymentId: item.PspReference,
// Success: isSuccess,
// Name: item.EventCode,
// Data: &anypb.Any{Value: dataBytes},
// }); err != nil {
// log.Printf("error applying authorization event: %v", err)
// }
// // If successful authorization, trigger capture
// if isSuccess {
// grain, err := s.Get(r.Context(), checkoutId)
// if err != nil {
// log.Printf("Error getting checkout: %v", err)
// http.Error(w, "Checkout not found", http.StatusBadRequest)
// return
// }
// meta := GetCheckoutMetaFromRequest(r)
// pspReference := item.PspReference
// uid := uuid.New().String()
// ref := uuid.New().String()
// req := service.ModificationsApi.CaptureAuthorisedPaymentInput(pspReference).IdempotencyKey(uid).PaymentCaptureRequest(adyenCheckout.PaymentCaptureRequest{
// Amount: adyenCheckout.Amount{
// Currency: meta.Currency,
// Value: grain.CartTotalPrice.IncVat,
// },
// MerchantAccount: "ElgigantenECOM",
// Reference: &ref,
// })
// res, _, err := service.ModificationsApi.CaptureAuthorisedPayment(r.Context(), req)
// if err != nil {
// log.Printf("Error capturing payment: %v", err)
// } else {
// log.Printf("Payment captured successfully: %+v", res)
// s.Apply(r.Context(), checkoutId, &messages.OrderCreated{
// OrderId: res.PaymentPspReference,
// Status: item.EventCode,
// })
// }
// }
default:
log.Printf("Unknown event code: %s", item.EventCode)
isSuccess := item.Success == "true"
// Apply generic payment event for other event codes
if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentEvent{
PaymentId: item.PspReference,
Success: isSuccess,
Name: item.EventCode,
Data: &anypb.Any{Value: dataBytes},
}); err != nil {
log.Printf("error applying payment event: %v", err)
}
log.Printf("Item data: %+v", item)
//isSuccess := item.Success == "true"
// if err := s.applyAnywhere(r.Context(), checkoutId, &messages.PaymentEvent{
// PaymentId: item.PspReference,
// Success: isSuccess,
// Name: item.EventCode,
// Data: &anypb.Any{Value: dataBytes},
// }); err != nil {
// log.Printf("error applying payment event: %v", err)
// }
}
}
}

2
cmd/checkout/checkout_builder.go
View File

@@ -114,7 +114,7 @@ func BuildCheckoutOrderPayload(grain *checkout.CheckoutGrain, meta *CheckoutMeta
MerchantURLS: &CheckoutMerchantURLS{
Terms: fmt.Sprintf("%s/terms", meta.SiteUrl),
Checkout: fmt.Sprintf("%s/checkout?order_id={checkout.order.id}&provider=klarna", meta.SiteUrl),
Confirmation: fmt.Sprintf("%s/confirmation?order_id={checkout.order.id}&provider=klarna", meta.SiteUrl),
Confirmation: fmt.Sprintf("%s/checkout?order_id={checkout.order.id}&provider=klarna", meta.SiteUrl),
Notification: "https://cart.k6n.net/payment/klarna/notification",
Validation: "https://cart.k6n.net/payment/klarna/validate",
Push: "https://cart.k6n.net/payment/klarna/push?order_id={checkout.order.id}",