add more payment related shit

pkg/cart/cart-grain.go

@@ -84,6 +84,50 @@ type Notice struct {
 	Code      *string   `json:"code,omitempty"`
 }
 
+type PaymentStatus string
+type CartPaymentStatus PaymentStatus
+
+const (
+	PaymentStatusPending       PaymentStatus     = "pending"
+	PaymentStatusFailed        PaymentStatus     = "failed"
+	PaymentStatusSuccess       PaymentStatus     = "success"
+	CartPaymentStatusPending   CartPaymentStatus = "pending"
+	CartPaymentStatusFailed    CartPaymentStatus = "failed"
+	CartPaymentStatusSuccess   CartPaymentStatus = "success"
+	CartPaymentStatusCancelled CartPaymentStatus = "partial"
+)
+
+type CartPayment struct {
+	PaymentId          string          `json:"paymentId"`
+	Status             PaymentStatus   `json:"status"`
+	Amount             int64           `json:"amount"`
+	Currency           string          `json:"currency"`
+	Provider           string          `json:"provider,omitempty"`
+	Method             *string         `json:"method,omitempty"`
+	Events             []*PaymentEvent `json:"events,omitempty"`
+	ProcessorReference *string         `json:"processorReference,omitempty"`
+	StartedAt          *time.Time      `json:"startedAt,omitempty"`
+	CompletedAt        *time.Time      `json:"completedAt,omitempty"`
+}
+
+type PaymentEvent struct {
+	Name string          `json:"name"`
+	Data json.RawMessage `json:"data"`
+}
+
+func (p *CartPayment) IsSettled() bool {
+	if p == nil {
+		return false
+	}
+
+	switch p.Status {
+	case PaymentStatusSuccess:
+		return true
+	default:
+		return false
+	}
+}
+
 type Marking struct {
 	Type uint32 `json:"type"`
 	Text string `json:"text"`
@@ -119,15 +163,17 @@ type CartGrain struct {
 	Processing             bool                            `json:"processing"`
 	PaymentInProgress      bool                            `json:"paymentInProgress"`
 	OrderReference         string                          `json:"orderReference,omitempty"`
-	PaymentStatus          string                          `json:"paymentStatus,omitempty"`
+	PaymentStatus          PaymentStatus                   `json:"paymentStatus,omitempty"`
+	PaidInFull             bool                            `json:"paidInFull"`
 	Vouchers               []*Voucher                      `json:"vouchers,omitempty"`
 	Notifications          []CartNotification              `json:"cartNotification,omitempty"`
 	SubscriptionDetails    map[string]*SubscriptionDetails `json:"subscriptionDetails,omitempty"`
 	PaymentDeclinedNotices []Notice                        `json:"paymentDeclinedNotices,omitempty"`
+	Payments               []*CartPayment                  `json:"payments,omitempty"`
 	Confirmation           *ConfirmationStatus             `json:"confirmation,omitempty"`
-	CheckoutOrderId        string                          `json:"checkoutOrderId,omitempty"`
-	CheckoutStatus         string                          `json:"checkoutStatus,omitempty"`
-	CheckoutCountry        string                          `json:"checkoutCountry,omitempty"`
+	//CheckoutOrderId        string                          `json:"checkoutOrderId,omitempty"`
+	CheckoutStatus CartPaymentStatus `json:"checkoutStatus,omitempty"`
+	//CheckoutCountry        string                          `json:"checkoutCountry,omitempty"`
 }
 
 type ConfirmationStatus struct {
@@ -208,6 +254,7 @@ func NewCartGrain(id uint64, ts time.Time) *CartGrain {
 		Id:                  CartId(id),
 		Items:               []*CartItem{},
 		TotalPrice:          NewPrice(),
+		Payments:            []*CartPayment{},
 		SubscriptionDetails: make(map[string]*SubscriptionDetails),
 	}
 }
@@ -284,6 +331,53 @@ func (c *CartGrain) FindItemWithSku(sku string) (*CartItem, bool) {
 	return nil, false
 }
 
+func (c *CartGrain) FindPayment(paymentId string) (*CartPayment, bool) {
+	if paymentId == "" {
+		return nil, false
+	}
+	for _, payment := range c.Payments {
+		if payment != nil && payment.PaymentId == paymentId {
+			return payment, true
+		}
+	}
+	return nil, false
+}
+
+func (c *CartGrain) SettledPayments() []*CartPayment {
+	if len(c.Payments) == 0 {
+		return nil
+	}
+	settled := make([]*CartPayment, 0, len(c.Payments))
+	for _, payment := range c.Payments {
+		if payment != nil && payment.IsSettled() {
+			settled = append(settled, payment)
+		}
+	}
+	if len(settled) == 0 {
+		return nil
+	}
+	return settled
+}
+
+func (c *CartGrain) OpenPayments() []*CartPayment {
+	if len(c.Payments) == 0 {
+		return nil
+	}
+	pending := make([]*CartPayment, 0, len(c.Payments))
+	for _, payment := range c.Payments {
+		if payment == nil {
+			continue
+		}
+		if !payment.IsSettled() {
+			pending = append(pending, payment)
+		}
+	}
+	if len(pending) == 0 {
+		return nil
+	}
+	return pending
+}
+
 // func (c *CartGrain) Apply(content proto.Message, isReplay bool) (*CartGrain, error) {
 
 // 	updated, err := ApplyRegistered(c, content)
@@ -348,4 +442,5 @@ func (c *CartGrain) UpdateTotals() {
 			c.TotalPrice.Subtract(*value)
 		}
 	}
+
 }

pkg/cart/cart-mutation-helper.go

@@ -115,9 +115,18 @@ func NewCartMultationRegistry(context *CartMutationContext) actor.MutationRegist
 		actor.NewMutation(SubscriptionAdded, func() *messages.SubscriptionAdded {
 			return &messages.SubscriptionAdded{}
 		}),
+		actor.NewMutation(PaymentStarted, func() *messages.PaymentStarted {
+			return &messages.PaymentStarted{}
+		}),
+		actor.NewMutation(PaymentCompleted, func() *messages.PaymentCompleted {
+			return &messages.PaymentCompleted{}
+		}),
 		actor.NewMutation(PaymentDeclined, func() *messages.PaymentDeclined {
 			return &messages.PaymentDeclined{}
 		}),
+		actor.NewMutation(PaymentEventHandler, func() *messages.PaymentEvent {
+			return &messages.PaymentEvent{}
+		}),
 		actor.NewMutation(ConfirmationViewed, func() *messages.ConfirmationViewed {
 			return &messages.ConfirmationViewed{}
 		}),

pkg/cart/mutation_create_checkout_order.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 
 	messages "git.k6n.net/go-cart-actor/pkg/messages"
-	"github.com/google/uuid"
 )
 
 func CreateCheckoutOrder(grain *CartGrain, req *messages.CreateCheckoutOrder) error {
@@ -15,8 +14,8 @@ func CreateCheckoutOrder(grain *CartGrain, req *messages.CreateCheckoutOrder) er
 		return errors.New("terms must be accepted")
 	}
 	// Validate other fields as needed
-	grain.CheckoutOrderId = uuid.New().String()
+	//grain.CheckoutOrderId = uuid.New().String()
 	grain.CheckoutStatus = "pending"
-	grain.CheckoutCountry = req.Country
+	//grain.CheckoutCountry = req.Country
 	return nil
 }

pkg/cart/mutation_initialize_checkout.go

@@ -53,7 +53,7 @@ func (c *CartMutationContext) InitializeCheckout(g *CartGrain, m *messages.Initi
 	}
 
 	g.OrderReference = m.OrderId
-	g.PaymentStatus = m.Status
+	//g.PaymentStatus = m.Status
 	g.PaymentInProgress = m.PaymentInProgress
 	return nil
 }

pkg/cart/mutation_order_created.go

@@ -42,7 +42,7 @@ func OrderCreated(g *CartGrain, m *messages.OrderCreated) error {
 	}
 
 	g.OrderReference = m.OrderId
-	g.PaymentStatus = m.Status
-	g.PaymentInProgress = false
+	//g.PaymentStatus = m.Status
+	//g.PaymentInProgress = false
 	return nil
 }

pkg/cart/mutation_payment_completed.go

@@ -0,0 +1,32 @@
+package cart
+
+import (
+	"fmt"
+	"time"
+
+	messages "git.k6n.net/go-cart-actor/pkg/messages"
+)
+
+// PaymentStarted registers the beginning of a payment attempt for a cart.
+// It either upserts the payment entry (based on paymentId) or creates a new one,
+// marks the cart as having an in-progress payment, and recalculates the PaidInFull flag.
+func PaymentCompleted(grain *CartGrain, msg *messages.PaymentCompleted) error {
+	if msg == nil {
+		return fmt.Errorf("PaymentStarted: nil payload")
+	}
+	paymentId := msg.PaymentId
+	payment, found := grain.FindPayment(paymentId)
+	if !found {
+		return fmt.Errorf("PaymentStarted: payment not found")
+	}
+
+	payment.ProcessorReference = msg.ProcessorReference
+	payment.Status = PaymentStatusSuccess
+	payment.Amount = msg.Amount
+	payment.Currency = msg.Currency
+	payment.CompletedAt = asPointer(time.Now())
+
+	// maybe update cart status
+
+	return nil
+}

pkg/cart/mutation_payment_declined.go

@@ -1,21 +1,26 @@
 package cart
 
 import (
+	"errors"
 	"time"
 
 	messages "git.k6n.net/go-cart-actor/pkg/messages"
 )
 
+func asPointer[T any](value T) *T {
+	return &value
+}
+
+var ErrPaymentNotFound = errors.New("payment not found")
+
 func PaymentDeclined(grain *CartGrain, req *messages.PaymentDeclined) error {
-	grain.PaymentStatus = "declined"
-	grain.PaymentDeclinedNotices = append(grain.PaymentDeclinedNotices, Notice{
-		Timestamp: time.Now(),
-		Message:   req.Message,
-		Code:      req.Code,
-	})
-	// Optionally clear checkout order if in progress
-	if grain.CheckoutOrderId != "" {
-		grain.CheckoutOrderId = ""
+
+	payment, found := grain.FindPayment(req.PaymentId)
+	if !found {
+		return ErrPaymentNotFound
 	}
+
+	payment.CompletedAt = asPointer(time.Now())
+	payment.Status = PaymentStatusFailed
 	return nil
 }

pkg/cart/mutation_payment_event.go

@@ -0,0 +1,21 @@
+package cart
+
+import (
+	"encoding/json"
+
+	messages "git.k6n.net/go-cart-actor/pkg/messages"
+)
+
+func PaymentEventHandler(grain *CartGrain, req *messages.PaymentEvent) error {
+
+	payment, found := grain.FindPayment(req.PaymentId)
+	if !found {
+		return ErrPaymentNotFound
+	}
+	metaBytes := req.Data.GetValue()
+	payment.Events = append(payment.Events, &PaymentEvent{
+		Name: req.Name,
+		Data: json.RawMessage(metaBytes),
+	})
+	return nil
+}

pkg/cart/mutation_payment_started.go

@@ -0,0 +1,86 @@
+package cart
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	messages "git.k6n.net/go-cart-actor/pkg/messages"
+)
+
+// PaymentStarted registers the beginning of a payment attempt for a cart.
+// It either upserts the payment entry (based on paymentId) or creates a new one,
+// marks the cart as having an in-progress payment, and recalculates the PaidInFull flag.
+func PaymentStarted(grain *CartGrain, msg *messages.PaymentStarted) error {
+	if msg == nil {
+		return fmt.Errorf("PaymentStarted: nil payload")
+	}
+	paymentID := strings.TrimSpace(msg.PaymentId)
+	if paymentID == "" {
+		return fmt.Errorf("PaymentStarted: missing paymentId")
+	}
+	if msg.Amount < 0 {
+		return fmt.Errorf("PaymentStarted: amount cannot be negative")
+	}
+
+	currency := strings.TrimSpace(msg.Currency)
+	provider := strings.TrimSpace(msg.Provider)
+	method := copyOptionalString(msg.Method)
+
+	startedAt := time.Now().UTC()
+	if msg.StartedAt != nil {
+		startedAt = msg.StartedAt.AsTime()
+	}
+
+	payment, found := grain.FindPayment(paymentID)
+
+	if found {
+		if payment.Status != PaymentStatusPending {
+			return fmt.Errorf("PaymentStarted: payment already started")
+		}
+		if payment.PaymentId != paymentID {
+			payment.PaymentId = paymentID
+		}
+		payment.Status = PaymentStatusPending
+		payment.Amount = msg.Amount
+		if currency != "" {
+			payment.Currency = currency
+		}
+		if provider != "" {
+			payment.Provider = provider
+		}
+		if method != nil {
+			payment.Method = method
+		}
+		payment.StartedAt = &startedAt
+		payment.CompletedAt = nil
+		payment.ProcessorReference = nil
+	} else {
+		grain.Payments = append(grain.Payments, &CartPayment{
+			PaymentId: paymentID,
+			Status:    PaymentStatusPending,
+			Amount:    msg.Amount,
+			Currency:  currency,
+			Provider:  provider,
+			Method:    method,
+			StartedAt: &startedAt,
+		})
+	}
+
+	grain.PaymentInProgress = true
+	grain.PaymentStatus = PaymentStatusPending
+
+	return nil
+}
+
+func copyOptionalString(src *string) *string {
+	if src == nil {
+		return nil
+	}
+	trimmed := strings.TrimSpace(*src)
+	if trimmed == "" {
+		return nil
+	}
+	dst := trimmed
+	return &dst
+}

pkg/cart/mutation_test.go

@@ -132,9 +132,9 @@ func msgSubscriptionAdded(itemId uint32, detailsId, orderRef string) *messages.S
 	return &messages.SubscriptionAdded{ItemId: itemId, DetailsId: detailsId, OrderReference: orderRef}
 }
 
-func msgPaymentDeclined(message, code string) *messages.PaymentDeclined {
-	return &messages.PaymentDeclined{Message: message, Code: &code}
-}
+// func msgPaymentDeclined(message, code string) *messages.PaymentDeclined {
+// 	return &messages.PaymentDeclined{Message: message, Code: &code}
+// }
 
 func msgConfirmationViewed() *messages.ConfirmationViewed {
 	return &messages.ConfirmationViewed{}
@@ -695,29 +695,29 @@ func TestSubscriptionAdded(t *testing.T) {
 	applyErrorContains(t, reg, g, msgSubscriptionAdded(9999, "", ""), "not found")
 }
 
-func TestPaymentDeclined(t *testing.T) {
-	reg := newRegistry()
-	g := newTestGrain()
+// func TestPaymentDeclined(t *testing.T) {
+// 	reg := newRegistry()
+// 	g := newTestGrain()
 
-	g.CheckoutOrderId = "test-order"
-	applyOK(t, reg, g, msgPaymentDeclined("Payment failed due to insufficient funds", "INSUFFICIENT_FUNDS"))
-	if g.PaymentStatus != "declined" || g.CheckoutOrderId != "" {
-		t.Fatalf("payment declined not handled: status=%s checkoutId=%s", g.PaymentStatus, g.CheckoutOrderId)
-	}
-	if len(g.PaymentDeclinedNotices) != 1 {
-		t.Fatalf("expected 1 notice, got %d", len(g.PaymentDeclinedNotices))
-	}
-	notice := g.PaymentDeclinedNotices[0]
-	if notice.Message != "Payment failed due to insufficient funds" {
-		t.Fatalf("notice message not set correctly: %s", notice.Message)
-	}
-	if notice.Code == nil || *notice.Code != "INSUFFICIENT_FUNDS" {
-		t.Fatalf("notice code not set correctly: %v", notice.Code)
-	}
-	if notice.Timestamp.IsZero() {
-		t.Fatalf("notice timestamp not set")
-	}
-}
+// 	applyOK(t, reg, g, msgPaymentDeclined("Payment failed due to insufficient funds", "INSUFFICIENT_FUNDS"))
+
+// 	if g.PaymentStatus != "declined" || g.CheckoutOrderId != "" {
+// 		t.Fatalf("payment declined not handled: status=%s checkoutId=%s", g.PaymentStatus, g.CheckoutOrderId)
+// 	}
+// 	if len(g.PaymentDeclinedNotices) != 1 {
+// 		t.Fatalf("expected 1 notice, got %d", len(g.PaymentDeclinedNotices))
+// 	}
+// 	notice := g.PaymentDeclinedNotices[0]
+// 	if notice.Message != "Payment failed due to insufficient funds" {
+// 		t.Fatalf("notice message not set correctly: %s", notice.Message)
+// 	}
+// 	if notice.Code == nil || *notice.Code != "INSUFFICIENT_FUNDS" {
+// 		t.Fatalf("notice code not set correctly: %v", notice.Code)
+// 	}
+// 	if notice.Timestamp.IsZero() {
+// 		t.Fatalf("notice timestamp not set")
+// 	}
+// }
 
 func TestConfirmationViewed(t *testing.T) {
 	reg := newRegistry()
@@ -755,10 +755,10 @@ func TestCreateCheckoutOrder(t *testing.T) {
 	applyOK(t, reg, g, msgAddItem("CHECKOUT", 1000, 1, nil))
 
 	applyOK(t, reg, g, msgCreateCheckoutOrder("accepted", "SE"))
-	if g.CheckoutOrderId == "" || g.CheckoutStatus != "pending" || g.CheckoutCountry != "SE" {
-		t.Fatalf("checkout order not created: id=%s status=%s country=%s",
-			g.CheckoutOrderId, g.CheckoutStatus, g.CheckoutCountry)
-	}
+	// if g.CheckoutOrderId == "" || g.CheckoutStatus != "pending" || g.CheckoutCountry != "SE" {
+	// 	t.Fatalf("checkout order not created: id=%s status=%s country=%s",
+	// 		g.CheckoutOrderId, g.CheckoutStatus, g.CheckoutCountry)
+	// }
 
 	// Empty cart
 	g2 := newTestGrain()