major changes

pkg/cart/cart-mutation-helper.go

@@ -23,9 +23,7 @@ func (c *CartMutationContext) ReserveItem(ctx context.Context, cartId CartId, sk
 	if quantity <= 0 || c.reservationService == nil {
 		return nil, nil
 	}
-	if sku != "919641" {
-		return nil, nil
-	}
+
 	l := inventory.LocationID("se")
 	if locationId != nil {
 		l = inventory.LocationID(*locationId)
@@ -49,6 +47,13 @@ func (c *CartMutationContext) ReserveItem(ctx context.Context, cartId CartId, sk
 
 }
 
+func (c *CartMutationContext) UseReservations(item *CartItem) bool {
+	if item.ReservationEndTime != nil {
+		return true
+	}
+	return item.Cgm == "55010"
+}
+
 func (c *CartMutationContext) ReleaseItem(ctx context.Context, cartId CartId, sku string, locationId *string) error {
 	if c.reservationService == nil {
 		return nil
@@ -60,12 +65,6 @@ func (c *CartMutationContext) ReleaseItem(ctx context.Context, cartId CartId, sk
 	return c.reservationService.ReleaseForCart(ctx, inventory.SKU(sku), l, inventory.CartID(cartId.String()))
 }
 
-func Create[T any]() func() *T {
-	return func() *T {
-		return new(T)
-	}
-}
-
 func NewCartMultationRegistry(context *CartMutationContext) actor.MutationRegistry {
 
 	reg := actor.NewMutationRegistry()

pkg/cart/cart_id.go

@@ -4,6 +4,8 @@ import (
 	"crypto/rand"
 	"encoding/json"
 	"fmt"
+
+	"git.k6n.net/go-cart-actor/pkg/actor"
 )
 
 // cart_id.go
@@ -34,7 +36,7 @@ import (
 //
 // ---------------------------------------------------------------------------
 
-type CartId uint64
+type CartId actor.GrainId
 
 const base62Alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 

pkg/cart/mutation_add_item.go

@@ -45,14 +45,16 @@ func (c *CartMutationContext) AddItem(g *CartGrain, m *cart_messages.AddItem) er
 		if !sameStore {
 			continue
 		}
-		if err := c.ReleaseItem(ctx, g.Id, existing.Sku, existing.StoreId); err != nil {
-			log.Printf("failed to release item %d: %v", existing.Id, err)
+		if c.UseReservations(existing) {
+			if err := c.ReleaseItem(ctx, g.Id, existing.Sku, existing.StoreId); err != nil {
+				log.Printf("failed to release item %d: %v", existing.Id, err)
+			}
+			endTime, err := c.ReserveItem(ctx, g.Id, existing.Sku, existing.StoreId, existing.Quantity+uint16(m.Quantity))
+			if err != nil {
+				return err
+			}
+			existing.ReservationEndTime = endTime
 		}
-		endTime, err := c.ReserveItem(ctx, g.Id, existing.Sku, existing.StoreId, existing.Quantity+uint16(m.Quantity))
-		if err != nil {
-			return err
-		}
-		existing.ReservationEndTime = endTime
 		existing.Quantity += uint16(m.Quantity)
 		existing.Stock = uint16(m.Stock)
 		// If existing had nil store but new has one, adopt it.
@@ -79,16 +81,6 @@ func (c *CartMutationContext) AddItem(g *CartGrain, m *cart_messages.AddItem) er
 		needsReservation = m.ReservationEndTime.AsTime().Before(time.Now())
 	}
 
-	if needsReservation {
-		endTime, err := c.ReserveItem(ctx, g.Id, m.Sku, m.StoreId, uint16(m.Quantity))
-		if err != nil {
-			return err
-		}
-		if endTime != nil {
-			m.ReservationEndTime = timestamppb.New(*endTime)
-		}
-	}
-
 	cartItem := &CartItem{
 		Id:       g.lastItemId,
 		ItemId:   uint32(m.ItemId),
@@ -123,10 +115,19 @@ func (c *CartMutationContext) AddItem(g *CartGrain, m *cart_messages.AddItem) er
 
 		StoreId: m.StoreId,
 	}
-	if m.ReservationEndTime != nil {
-		t := m.ReservationEndTime.AsTime()
-		cartItem.ReservationEndTime = &t
+
+	if needsReservation && c.UseReservations(cartItem) {
+		endTime, err := c.ReserveItem(ctx, g.Id, m.Sku, m.StoreId, uint16(m.Quantity))
+		if err != nil {
+			return err
+		}
+		if endTime != nil {
+			m.ReservationEndTime = timestamppb.New(*endTime)
+			t := m.ReservationEndTime.AsTime()
+			cartItem.ReservationEndTime = &t
+		}
 	}
+
 	g.Items = append(g.Items, cartItem)
 	g.UpdateTotals()
 	return nil

pkg/cart/mutation_change_quantity.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"time"
 
 	messages "git.k6n.net/go-cart-actor/proto/cart"
 )
@@ -49,9 +50,11 @@ func (c *CartMutationContext) ChangeQuantity(g *CartGrain, m *messages.ChangeQua
 	if m.Quantity <= 0 {
 		// Remove the item
 		itemToRemove := g.Items[foundIndex]
-		err := c.ReleaseItem(ctx, g.Id, itemToRemove.Sku, itemToRemove.StoreId)
-		if err != nil {
-			log.Printf("unable to release reservation for %s in location: %v", itemToRemove.Sku, itemToRemove.StoreId)
+		if itemToRemove.ReservationEndTime != nil && itemToRemove.ReservationEndTime.Before(time.Now()) {
+			err := c.ReleaseItem(ctx, g.Id, itemToRemove.Sku, itemToRemove.StoreId)
+			if err != nil {
+				log.Printf("unable to release reservation for %s in location: %v", itemToRemove.Sku, itemToRemove.StoreId)
+			}
 		}
 		g.Items = append(g.Items[:foundIndex], g.Items[foundIndex+1:]...)
 		g.UpdateTotals()
@@ -61,18 +64,20 @@ func (c *CartMutationContext) ChangeQuantity(g *CartGrain, m *messages.ChangeQua
 	if item == nil {
 		return fmt.Errorf("ChangeQuantity: item id %d not found", m.Id)
 	}
-	if item.ReservationEndTime != nil {
-		err := c.ReleaseItem(ctx, g.Id, item.Sku, item.StoreId)
-		if err != nil {
-			log.Printf("unable to release reservation for %s in location: %v", item.Sku, item.StoreId)
-		}
+	if c.UseReservations(item) {
+		if item.ReservationEndTime != nil {
+			err := c.ReleaseItem(ctx, g.Id, item.Sku, item.StoreId)
+			if err != nil {
+				log.Printf("unable to release reservation for %s in location: %v", item.Sku, item.StoreId)
+			}
 
+		}
+		endTime, err := c.ReserveItem(ctx, g.Id, item.Sku, item.StoreId, uint16(m.Quantity))
+		if err != nil {
+			return err
+		}
+		item.ReservationEndTime = endTime
 	}
-	endTime, err := c.ReserveItem(ctx, g.Id, item.Sku, item.StoreId, uint16(m.Quantity))
-	if err != nil {
-		return err
-	}
-	item.ReservationEndTime = endTime
 	item.Quantity = uint16(m.Quantity)
 	g.UpdateTotals()