update

cmd/cart/checkout_builder.go

@@ -65,7 +65,7 @@ func BuildCheckoutOrderPayload(grain *cart.CartGrain, meta *CheckoutMeta) ([]byt
 			Type:           "physical",
 			Reference:      it.Sku,
 			Name:           it.Meta.Name,
-			Quantity:       it.Quantity,
+			Quantity:       int(it.Quantity),
 			UnitPrice:      int(it.Price.IncVat),
 			TaxRate:        it.Tax, // TODO: derive if variable tax rates are introduced
 			QuantityUnit:   "st",

cmd/cart/main.go

@@ -83,8 +83,22 @@ func main() {
 	inventoryPubSub := actor.NewPubSub[inventory.InventoryChange]()
 
 	// promotionService := promotions.NewPromotionService(nil)
+	rdb := redis.NewClient(&redis.Options{
+		Addr:     redisAddress,
+		Password: redisPassword,
+		DB:       0,
+	})
+	inventoryService, err := inventory.NewRedisInventoryService(rdb)
+	if err != nil {
+		log.Fatalf("Error creating inventory service: %v\n", err)
+	}
 
-	reg := cart.NewCartMultationRegistry()
+	inventoryReservationService, err := inventory.NewRedisCartReservationService(rdb)
+	if err != nil {
+		log.Fatalf("Error creating inventory reservation service: %v\n", err)
+	}
+
+	reg := cart.NewCartMultationRegistry(cart.NewCartMutationContext(inventoryReservationService))
 	reg.RegisterProcessor(
 		actor.NewMutationProcessor(func(ctx context.Context, g *cart.CartGrain) error {
 			_, span := tracer.Start(ctx, "Totals and promotions")
@@ -141,20 +155,6 @@ func main() {
 	}
 
 	klarnaClient := NewKlarnaClient(KlarnaPlaygroundUrl, os.Getenv("KLARNA_API_USERNAME"), os.Getenv("KLARNA_API_PASSWORD"))
-	rdb := redis.NewClient(&redis.Options{
-		Addr:     redisAddress,
-		Password: redisPassword,
-		DB:       0,
-	})
-	inventoryService, err := inventory.NewRedisInventoryService(rdb)
-	if err != nil {
-		log.Fatalf("Error creating inventory service: %v\n", err)
-	}
-
-	inventoryReservationService, err := inventory.NewRedisCartReservationService(rdb)
-	if err != nil {
-		log.Fatalf("Error creating inventory reservation service: %v\n", err)
-	}
 
 	syncedServer := NewPoolServer(pool, fmt.Sprintf("%s, %s", name, podIp), klarnaClient, inventoryService, inventoryReservationService)
 

cmd/cart/pool-server.go

@@ -22,7 +22,6 @@ import (
 	"go.opentelemetry.io/contrib/bridges/otelslog"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"google.golang.org/protobuf/types/known/anypb"
-	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -80,10 +79,7 @@ func (s *PoolServer) AddSkuToCartHandler(w http.ResponseWriter, r *http.Request,
 	if err != nil {
 		return err
 	}
-	err = s.HandleReservations(r.Context(), id, msg)
-	if err != nil {
-		return err
-	}
+
 	data, err := s.ApplyLocal(r.Context(), id, msg)
 	if err != nil {
 		return err
@@ -260,11 +256,6 @@ func (s *PoolServer) AddMultipleItemHandler(w http.ResponseWriter, r *http.Reque
 
 	msgs := getMultipleAddMessages(r.Context(), setCartItems.Items, setCartItems.Country)
 
-	err = s.HandleReservations(r.Context(), id, msgs...)
-	if err != nil {
-		return err
-	}
-
 	reply, err := s.ApplyLocal(r.Context(), id, msgs...)
 	if err != nil {
 		return err
@@ -285,48 +276,6 @@ func (s *PoolServer) GetReservationTime(item *messages.AddItem) time.Duration {
 	//return nil
 }
 
-func (s *PoolServer) HandleReservations(ctx context.Context, cartId cart.CartId, msgs ...proto.Message) error {
-	if s.reservationService == nil {
-		return nil
-	}
-	for _, msg := range msgs {
-		item, ok := msg.(*messages.AddItem)
-		if !ok {
-			log.Printf("not an AddItem message, skipping reservation, was of type: %T", msg)
-			continue
-		}
-		timeout := s.GetReservationTime(item)
-		if timeout == 0 {
-			continue
-		}
-		span := trace.SpanFromContext(ctx)
-
-		locationId := inventory.LocationID("se")
-		if item.StoreId != nil {
-			locationId = inventory.LocationID(*item.StoreId)
-		}
-		span.AddEvent("reserving item", trace.WithAttributes(attribute.String("sku", item.Sku), attribute.String("locationId", string(locationId))))
-		log.Printf("reserving item %s at location %s for cart %s", item.Sku, string(locationId), cartId.String())
-		end := time.Now().Add(timeout)
-		err := s.reservationService.ReserveForCart(ctx, inventory.CartReserveRequest{
-			CartID: inventory.CartID(cartId.String()),
-			InventoryReference: &inventory.InventoryReference{
-				LocationID: locationId,
-				SKU:        inventory.SKU(item.Sku),
-			},
-			Quantity: uint32(item.Quantity),
-			TTL:      15 * time.Minute,
-		})
-		if err != nil {
-			return err
-		}
-		logger.InfoContext(ctx, "reserved item", "sku", item.Sku, "location", string(locationId), "expires at", end.String())
-		span.End()
-		item.ReservationEndTime = timestamppb.New(end)
-	}
-	return nil
-}
-
 func (s *PoolServer) AddSkuRequestHandler(w http.ResponseWriter, r *http.Request, id cart.CartId) error {
 	addRequest := AddRequest{Quantity: 1}
 	err := json.NewDecoder(r.Body).Decode(&addRequest)
@@ -337,10 +286,7 @@ func (s *PoolServer) AddSkuRequestHandler(w http.ResponseWriter, r *http.Request
 	if err != nil {
 		return err
 	}
-	err = s.HandleReservations(r.Context(), id, msg)
-	if err != nil {
-		return err
-	}
+
 	reply, err := s.ApplyLocal(r.Context(), id, msg)
 	if err != nil {
 		return err