update tests and discovery

cmd/cart/checkout_builder.go

@@ -14,9 +14,6 @@ type CheckoutMeta struct {
 	Terms        string
 	Checkout     string
 	Confirmation string
-	Notification string
-	Validation   string
-	Push         string
 	Country      string
 	Currency     string // optional override (defaults to "SEK" if empty)
 	Locale       string // optional override (defaults to "sv-se" if empty)
@@ -108,9 +105,9 @@ func BuildCheckoutOrderPayload(grain *cart.CartGrain, meta *CheckoutMeta) ([]byt
 			Terms:        meta.Terms,
 			Checkout:     meta.Checkout,
 			Confirmation: meta.Confirmation,
-			Notification: meta.Notification,
-			Validation:   meta.Validation,
-			Push:         meta.Push,
+			Notification: "https://cart.tornberg.me/notification",
+			Validation:   "https://cart.tornberg.me/validate",
+			Push:         "https://cart.tornberg.me/push?order_id={checkout.order.id}",
 		},
 	}
 

cmd/cart/pool-server.go

@@ -335,30 +335,27 @@ func getInventoryRequests(items []*cart.CartItem) []inventory.ReserveRequest {
 	return requests
 }
 
-func (s *PoolServer) CreateOrUpdateCheckout(ctx context.Context, host string, id cart.CartId) (*CheckoutOrder, error) {
-	country := getCountryFromHost(host)
+func (s *PoolServer) CreateOrUpdateCheckout(r *http.Request, id cart.CartId) (*CheckoutOrder, error) {
+	country := getCountryFromHost(r.Host)
 	meta := &CheckoutMeta{
-		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),
-		Notification: "https://cart.tornberg.me/notification",
-		Validation:   "https://cart.tornberg.me/validate",
-		Push:         "https://cart.tornberg.me/push?order_id={checkout.order.id}",
+		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),
 		Country:      country,
 		Currency:     getCurrency(country),
 		Locale:       getLocale(country),
 	}
 
 	// Get current grain state (may be local or remote)
-	grain, err := s.Get(ctx, uint64(id))
+	grain, err := s.Get(r.Context(), uint64(id))
 	if err != nil {
 		return nil, err
 	}
 	if s.inventoryService != nil {
 		inventoryRequests := getInventoryRequests(grain.Items)
-		failingRequest, err := s.inventoryService.ReservationCheck(ctx, inventoryRequests...)
+		failingRequest, err := s.inventoryService.ReservationCheck(r.Context(), inventoryRequests...)
 		if err != nil {
-			logger.WarnContext(ctx, "inventory check failed", string(failingRequest.SKU), string(failingRequest.LocationID))
+			logger.WarnContext(r.Context(), "inventory check failed", string(failingRequest.SKU), string(failingRequest.LocationID))
 			return nil, err
 		}
 	}
@@ -370,9 +367,9 @@ func (s *PoolServer) CreateOrUpdateCheckout(ctx context.Context, host string, id
 	}
 
 	if grain.OrderReference != "" {
-		return s.klarnaClient.UpdateOrder(ctx, grain.OrderReference, bytes.NewReader(payload))
+		return s.klarnaClient.UpdateOrder(r.Context(), grain.OrderReference, bytes.NewReader(payload))
 	} else {
-		return s.klarnaClient.CreateOrder(ctx, bytes.NewReader(payload))
+		return s.klarnaClient.CreateOrder(r.Context(), bytes.NewReader(payload))
 	}
 }
 
@@ -584,7 +581,7 @@ func (s *PoolServer) CheckoutHandler(fn func(order *CheckoutOrder, w http.Respon
 	return CookieCartIdHandler(s.ProxyHandler(func(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
 		orderId := r.URL.Query().Get("order_id")
 		if orderId == "" {
-			order, err := s.CreateOrUpdateCheckout(r.Context(), r.Host, cartId)
+			order, err := s.CreateOrUpdateCheckout(r, cartId)
 			if err != nil {
 				logger.Error("unable to create klarna session", "error", err)
 				return err