update
All checks were successful
Build and Publish / BuildAndDeployAmd64 (push) Successful in 43s
Build and Publish / BuildAndDeployArm64 (push) Successful in 4m33s

This commit is contained in:
2025-12-03 19:17:27 +01:00
parent 86fdfc8532
commit 94a04a154c
2 changed files with 13 additions and 8 deletions

View File

@@ -100,7 +100,7 @@ type CheckoutGrain struct {
} }
func NewCheckoutGrain(id uint64, cartId cart.CartId, cartVersion uint64, ts time.Time, cartState *cart.CartGrain) *CheckoutGrain { func NewCheckoutGrain(id uint64, cartId cart.CartId, cartVersion uint64, ts time.Time, cartState *cart.CartGrain) *CheckoutGrain {
return &CheckoutGrain{ r := &CheckoutGrain{
lastDeliveryId: 0, lastDeliveryId: 0,
lastGiftcardId: 0, lastGiftcardId: 0,
lastAccess: ts, lastAccess: ts,
@@ -110,9 +110,12 @@ func NewCheckoutGrain(id uint64, cartId cart.CartId, cartVersion uint64, ts time
CartVersion: cartVersion, CartVersion: cartVersion,
Deliveries: []*CheckoutDelivery{}, Deliveries: []*CheckoutDelivery{},
Payments: []*Payment{}, Payments: []*Payment{},
CartState: cartState,
CartTotalPrice: cartState.TotalPrice,
} }
if cartState != nil {
r.CartState = cartState
r.CartTotalPrice = cartState.TotalPrice
}
return r
} }
func (c *CheckoutGrain) GetId() uint64 { func (c *CheckoutGrain) GetId() uint64 {

View File

@@ -28,17 +28,19 @@ func HandleInitializeCheckout(g *CheckoutGrain, m *messages.InitializeCheckout)
if m == nil { if m == nil {
return fmt.Errorf("InitializeCheckout: nil payload") return fmt.Errorf("InitializeCheckout: nil payload")
} }
if m.OrderId == "" { // if g.OrderId == "" {
return fmt.Errorf("InitializeCheckout: missing orderId") // return fmt.Errorf("InitializeCheckout: missing orderId")
} // }
if m.CartState != nil { if g.CartState != nil {
return fmt.Errorf("InitializeCheckout: checkout already initialized") return fmt.Errorf("InitializeCheckout: checkout already initialized")
} }
err := json.Unmarshal(m.CartState.Value, &g.CartState) err := json.Unmarshal(m.CartState.Value, &g.CartState)
if err != nil { if err != nil {
return fmt.Errorf("InitializeCheckout: failed to unmarshal cart state: %w", err) return err
} }
g.CartTotalPrice = g.CartState.TotalPrice
return nil return nil
} }