From cc6d48c879928149331347b2c80ce4328577c948 Mon Sep 17 00:00:00 2001 From: matst80 Date: Tue, 11 Nov 2025 13:32:31 +0100 Subject: [PATCH] update urls --- cmd/cart/checkout_server.go | 15 ++++++++------- cmd/cart/pool-server.go | 22 +++++++++++++--------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/cmd/cart/checkout_server.go b/cmd/cart/checkout_server.go index 9cdb49f..4085a7c 100644 --- a/cmd/cart/checkout_server.go +++ b/cmd/cart/checkout_server.go @@ -140,13 +140,14 @@ func (a *App) HandleCheckoutRequests(amqpUrl string, mux *http.ServeMux, invento w.WriteHeader(http.StatusInternalServerError) return } - - inventoryRequests := getInventoryRequests(grain.Items) - err = inventoryService.ReserveInventory(inventoryRequests...) - if err != nil { - logger.WarnContext(r.Context(), "placeorder inventory reservation failed") - w.WriteHeader(http.StatusNotAcceptable) - return + if inventoryService != nil { + inventoryRequests := getInventoryRequests(grain.Items) + err = inventoryService.ReserveInventory(inventoryRequests...) + if err != nil { + logger.WarnContext(r.Context(), "placeorder inventory reservation failed") + w.WriteHeader(http.StatusNotAcceptable) + return + } } w.WriteHeader(http.StatusOK) diff --git a/cmd/cart/pool-server.go b/cmd/cart/pool-server.go index 436ce66..8b344d8 100644 --- a/cmd/cart/pool-server.go +++ b/cmd/cart/pool-server.go @@ -323,6 +323,9 @@ func getLocationId(item *cart.CartItem) inventory.LocationID { func getInventoryRequests(items []*cart.CartItem) []inventory.ReserveRequest { var requests []inventory.ReserveRequest for _, item := range items { + if item == nil { + continue + } requests = append(requests, inventory.ReserveRequest{ SKU: inventory.SKU(item.Sku), LocationID: getLocationId(item), @@ -338,8 +341,8 @@ func (s *PoolServer) CreateOrUpdateCheckout(ctx context.Context, host string, id 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), + Validation: "https://cart.tornberg.me/validate", + Push: "https://cart.tornberg.me/push?order_id={checkout.order.id}", Country: country, Currency: getCurrency(country), Locale: getLocale(country), @@ -350,12 +353,13 @@ func (s *PoolServer) CreateOrUpdateCheckout(ctx context.Context, host string, id if err != nil { return nil, err } - - inventoryRequests := getInventoryRequests(grain.Items) - failingRequest, err := s.inventoryService.ReservationCheck(inventoryRequests...) - if err != nil { - logger.WarnContext(ctx, "inventory check failed", string(failingRequest.SKU), string(failingRequest.LocationID)) - return nil, err + if s.inventoryService != nil { + inventoryRequests := getInventoryRequests(grain.Items) + failingRequest, err := s.inventoryService.ReservationCheck(inventoryRequests...) + if err != nil { + logger.WarnContext(ctx, "inventory check failed", string(failingRequest.SKU), string(failingRequest.LocationID)) + return nil, err + } } // Build pure checkout payload @@ -581,7 +585,7 @@ func (s *PoolServer) CheckoutHandler(fn func(order *CheckoutOrder, w http.Respon if orderId == "" { order, err := s.CreateOrUpdateCheckout(r.Context(), r.Host, cartId) if err != nil { - logger.Error("unable to create klarna session", err) + logger.Error("unable to create klarna session: %v", err) return err } s.ApplyCheckoutStarted(order, cartId)