fix checkout again

pool-server.go

@@ -216,48 +216,51 @@ func (s *PoolServer) HandleConfirmation(w http.ResponseWriter, r *http.Request,
 	return json.NewEncoder(w).Encode(order)
 }
 
-func (s *PoolServer) HandleCheckout(w http.ResponseWriter, r *http.Request, id CartId) error {
-	// Build checkout meta (URLs derived from host)
+func (s *PoolServer) CreateOrUpdateCheckout(host string, id CartId) (*CheckoutOrder, error) {
 	meta := &CheckoutMeta{
-		Terms:        fmt.Sprintf("https://%s/terms", r.Host),
-		Checkout:     fmt.Sprintf("https://%s/checkout?order_id={checkout.order.id}", r.Host),
-		Confirmation: fmt.Sprintf("https://%s/confirmation/{checkout.order.id}", r.Host),
-		Validation:   fmt.Sprintf("https://%s/validate", r.Host),
-		Push:         fmt.Sprintf("https://%s/push?order_id={checkout.order.id}", r.Host),
-		Country:      getCountryFromHost(r.Host),
+		Terms:        fmt.Sprintf("https://%s/terms", host),
+		Checkout:     fmt.Sprintf("https://%s/checkout?order_id={checkout.order.id}", host),
+		Confirmation: fmt.Sprintf("https://%s/confirmation/{checkout.order.id}", host),
+		Validation:   fmt.Sprintf("https://%s/validate", host),
+		Push:         fmt.Sprintf("https://%s/push?order_id={checkout.order.id}", host),
+		Country:      getCountryFromHost(host),
 	}
 
 	// Get current grain state (may be local or remote)
 	grain, err := s.pool.Get(id)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	// Build pure checkout payload
 	payload, _, err := BuildCheckoutOrderPayload(grain, meta)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	// Call Klarna (create or update)
-	var klarnaOrder *CheckoutOrder
 	if grain.OrderReference != "" {
-		klarnaOrder, err = KlarnaInstance.UpdateOrder(grain.OrderReference, bytes.NewReader(payload))
+		return KlarnaInstance.UpdateOrder(grain.OrderReference, bytes.NewReader(payload))
 	} else {
-		klarnaOrder, err = KlarnaInstance.CreateOrder(bytes.NewReader(payload))
+		return KlarnaInstance.CreateOrder(bytes.NewReader(payload))
 	}
+}
+
+func (s *PoolServer) ApplyCheckoutStarted(klarnaOrder *CheckoutOrder, id CartId) (*CartGrain, error) {
+	// Persist initialization state via mutation (best-effort)
+	return s.pool.Apply(id, &messages.InitializeCheckout{
+		OrderId:           klarnaOrder.ID,
+		Status:            klarnaOrder.Status,
+		PaymentInProgress: true,
+	})
+}
+
+func (s *PoolServer) HandleCheckout(w http.ResponseWriter, r *http.Request, id CartId) error {
+	klarnaOrder, err := s.CreateOrUpdateCheckout(r.Host, id)
 	if err != nil {
 		return err
 	}
 
-	// Persist initialization state via mutation (best-effort)
-	if _, applyErr := s.pool.Apply(id, &messages.InitializeCheckout{
-		OrderId:           klarnaOrder.ID,
-		Status:            klarnaOrder.Status,
-		PaymentInProgress: true,
-	}); applyErr != nil {
-		log.Printf("InitializeCheckout apply error: %v", applyErr)
-	}
+	s.ApplyCheckoutStarted(klarnaOrder, id)
 
 	w.Header().Set("Content-Type", "application/json")
 	return json.NewEncoder(w).Encode(klarnaOrder)