cart and checkout

cmd/checkout/adyen-handlers.go

@@ -12,6 +12,7 @@ import (
 
 	"git.k6n.net/mats/go-cart-actor/pkg/cart"
 	messages "git.k6n.net/mats/go-cart-actor/proto/checkout"
+	"git.k6n.net/mats/go-redis-inventory/pkg/inventory"
 	adyenCheckout "github.com/adyen/adyen-go-api-library/v21/src/checkout"
 	"github.com/adyen/adyen-go-api-library/v21/src/common"
 	"github.com/adyen/adyen-go-api-library/v21/src/hmacvalidator"
@@ -129,7 +130,7 @@ func (s *CheckoutPoolServer) AdyenHookHandler(w http.ResponseWriter, r *http.Req
 				// Adyen analogue of the Klarna push. Create the event-sourced
 				// order now (mirrors KlarnaPushHandler). Idempotent on
 				// "checkout-{checkoutId}", so a retried CAPTURE won't duplicate.
-				if isSuccess && s.orderClient != nil {
+				if isSuccess {
 					s.createAdyenOrder(r.Context(), *checkoutId, item)
 				}
 
@@ -231,12 +232,21 @@ func (s *CheckoutPoolServer) createAdyenOrder(ctx context.Context, checkoutId ca
 		return
 	}
 
-	// Reserve inventory once, guarded by the grain flag so a retried CAPTURE
-	// does not decrement stock twice. (Same as the Klarna path.)
 	if s.inventoryService != nil && grain.CartState != nil && !grain.InventoryReserved {
 		if rerr := s.inventoryService.ReserveInventory(ctx, getInventoryRequests(grain.CartState.Items)...); rerr != nil {
 			log.Printf("from-checkout: inventory reservation failed for %s: %v", checkoutId.String(), rerr)
 		} else {
+			// Commit step: release cart reservation since we permanently decremented stock
+			if s.reservationService != nil {
+				for _, item := range grain.CartState.Items {
+					if item == nil || !shouldTrackInventory(item) {
+						continue
+					}
+					if err := s.reservationService.ReleaseForCart(ctx, inventory.SKU(item.Sku), getLocationId(item), inventory.CartID(grain.CartId.String())); err != nil {
+						log.Printf("from-checkout: failed to release cart reservation for %s: %v", item.Sku, err)
+					}
+				}
+			}
 			s.Apply(ctx, uint64(grain.Id), &messages.InventoryReserved{
 				Id:     grain.Id.String(),
 				Status: "success",