fixes

2026-06-16 13:14:35 +02:00
parent faec360789
commit 60722e3414
29 changed files with 1946 additions and 455 deletions
@@ -15,7 +15,6 @@ import (
 	messages "git.k6n.net/go-cart-actor/proto/cart"

 	"git.k6n.net/go-cart-actor/pkg/voucher"
-	"github.com/matst80/go-redis-inventory/pkg/inventory"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.opentelemetry.io/contrib/bridges/otelslog"
@@ -42,17 +41,13 @@ var (

 type PoolServer struct {
 	actor.GrainPool[cart.CartGrain]
-	pod_name           string
-	inventoryService   inventory.InventoryService
-	reservationService inventory.CartReservationService
+	pod_name string
 }

-func NewPoolServer(pool actor.GrainPool[cart.CartGrain], pod_name string, inventoryService inventory.InventoryService, inventoryReservationService inventory.CartReservationService) *PoolServer {
+func NewPoolServer(pool actor.GrainPool[cart.CartGrain], pod_name string) *PoolServer {
 	srv := &PoolServer{
-		GrainPool:          pool,
-		pod_name:           pod_name,
-		inventoryService:   inventoryService,
-		reservationService: inventoryReservationService,
+		GrainPool: pool,
+		pod_name:  pod_name,
 	}

 	return srv
@@ -134,6 +129,12 @@ type Item struct {
 	Sku      string  `json:"sku"`
 	Quantity int     `json:"quantity"`
 	StoreId  *string `json:"storeId,omitempty"`
+	// Children are sub-articles (accessories, services, insurance, ...) priced
+	// relative to this item. They are added as separate cart lines whose
+	// ParentId points to this item's line-item id.
+	Children []Item `json:"children,omitempty"`
+	// CustomFields are optional user-supplied input fields for this line.
+	CustomFields map[string]string `json:"customFields,omitempty"`
 }

 type SetCartItems struct {
@@ -141,25 +142,116 @@ type SetCartItems struct {
 	Items   []Item `json:"items"`
 }

-func getMultipleAddMessages(ctx context.Context, items []Item, country string) []proto.Message {
+// itemGroup is a top-level item together with its child sub-articles. The child
+// AddItem messages are built with their price already derived from the parent
+// product; their ParentId is filled in after the parent line is applied.
+type itemGroup struct {
+	parent   *messages.AddItem
+	children []*messages.AddItem
+}
+
+// buildItemGroups fetches every product and builds the AddItem messages. Groups
+// are built concurrently; within a group the parent is fetched first so it can
+// drive child pricing, then children are fetched concurrently. Input order is
+// preserved. Items that fail to fetch are skipped (logged), matching the prior
+// best-effort behavior.
+func buildItemGroups(ctx context.Context, items []Item, country string) []itemGroup {
+	groups := make([]itemGroup, len(items))
 	wg := sync.WaitGroup{}
-	mu := sync.Mutex{}
-	msgs := make([]proto.Message, 0, len(items))
-	for _, itm := range items {
-		wg.Go(
-			func() {
-				msg, err := GetItemAddMessage(ctx, itm.Sku, itm.Quantity, country, itm.StoreId)
-				if err != nil {
-					log.Printf("error adding item %s: %v", itm.Sku, err)
-					return
+	for i, itm := range items {
+		wg.Go(func() {
+			parentMsg, parentProduct, err := BuildItemMessage(ctx, itm.Sku, itm.Quantity, country, itm.StoreId, nil)
+			if err != nil {
+				log.Printf("error adding item %s: %v", itm.Sku, err)
+				return
+			}
+			parentMsg.CustomFields = itm.CustomFields
+			groups[i].parent = parentMsg
+
+			if len(itm.Children) == 0 {
+				return
+			}
+			children := make([]*messages.AddItem, len(itm.Children))
+			cwg := sync.WaitGroup{}
+			for j, child := range itm.Children {
+				cwg.Go(func() {
+					childMsg, _, err := BuildItemMessage(ctx, child.Sku, child.Quantity, country, child.StoreId, parentProduct)
+					if err != nil {
+						log.Printf("error adding child %s of %s: %v", child.Sku, itm.Sku, err)
+						return
+					}
+					childMsg.CustomFields = child.CustomFields
+					children[j] = childMsg
+				})
+			}
+			cwg.Wait()
+			for _, c := range children {
+				if c != nil {
+					groups[i].children = append(groups[i].children, c)
 				}
-				mu.Lock()
-				msgs = append(msgs, msg)
-				mu.Unlock()
-			})
+			}
+		})
 	}
 	wg.Wait()
-	return msgs
+	return groups
+}
+
+// applyItemGroups applies each group in dependency order: the parent first, then
+// its children with ParentId set to the parent's resolved line-item id. Returns
+// the last mutation result for rendering.
+func (s *PoolServer) applyItemGroups(ctx context.Context, id cart.CartId, groups []itemGroup) (*actor.MutationResult[cart.CartGrain], error) {
+	var last *actor.MutationResult[cart.CartGrain]
+	for _, g := range groups {
+		if g.parent == nil {
+			continue
+		}
+		res, err := s.ApplyLocal(ctx, id, g.parent)
+		if err != nil {
+			return nil, err
+		}
+		last = res
+
+		if len(g.children) == 0 {
+			continue
+		}
+		parentLineId, ok := parentLineId(&res.Result, g.parent)
+		if !ok {
+			log.Printf("could not resolve parent line for item %d (sku %s); skipping %d children",
+				g.parent.ItemId, g.parent.Sku, len(g.children))
+			continue
+		}
+		childMsgs := make([]proto.Message, len(g.children))
+		for i, c := range g.children {
+			c.ParentId = &parentLineId
+			childMsgs[i] = c
+		}
+		res, err = s.ApplyLocal(ctx, id, childMsgs...)
+		if err != nil {
+			return nil, err
+		}
+		last = res
+	}
+	return last, nil
+}
+
+// parentLineId finds the line-item id of the just-applied parent: the resident
+// item with the parent's catalog ItemId, matching store, and no parent of its
+// own. AddItem merges by sku+store, so at most one such line exists.
+func parentLineId(grain *cart.CartGrain, parent *messages.AddItem) (uint32, bool) {
+	for _, it := range grain.Items {
+		if it == nil || it.ParentId != nil {
+			continue
+		}
+		if it.ItemId != parent.ItemId {
+			continue
+		}
+		sameStore := (it.StoreId == nil && parent.StoreId == nil) ||
+			(it.StoreId != nil && parent.StoreId != nil && *it.StoreId == *parent.StoreId)
+		if sameStore {
+			return it.Id, true
+		}
+	}
+	return 0, false
 }

 func (s *PoolServer) SetCartItemsHandler(w http.ResponseWriter, r *http.Request, id cart.CartId) error {
@@ -169,14 +261,22 @@ func (s *PoolServer) SetCartItemsHandler(w http.ResponseWriter, r *http.Request,
 		return err
 	}

-	msgs := make([]proto.Message, 0, len(setCartItems.Items)+1)
-	msgs = append(msgs, &messages.ClearCartRequest{})
-	msgs = append(msgs, getMultipleAddMessages(r.Context(), setCartItems.Items, setCartItems.Country)...)
-
-	reply, err := s.ApplyLocal(r.Context(), id, msgs...)
+	if _, err := s.ApplyLocal(r.Context(), id, &messages.ClearCartRequest{}); err != nil {
+		return err
+	}
+	groups := buildItemGroups(r.Context(), setCartItems.Items, setCartItems.Country)
+	reply, err := s.applyItemGroups(r.Context(), id, groups)
 	if err != nil {
 		return err
 	}
+	if reply == nil {
+		// Cart was cleared but nothing added; return current (empty) state.
+		grain, err := s.Get(r.Context(), uint64(id))
+		if err != nil {
+			return err
+		}
+		return s.WriteResult(w, grain)
+	}
 	return s.WriteResult(w, reply)
 }

@@ -187,12 +287,18 @@ func (s *PoolServer) AddMultipleItemHandler(w http.ResponseWriter, r *http.Reque
 		return err
 	}

-	msgs := getMultipleAddMessages(r.Context(), setCartItems.Items, setCartItems.Country)
-
-	reply, err := s.ApplyLocal(r.Context(), id, msgs...)
+	groups := buildItemGroups(r.Context(), setCartItems.Items, setCartItems.Country)
+	reply, err := s.applyItemGroups(r.Context(), id, groups)
 	if err != nil {
 		return err
 	}
+	if reply == nil {
+		grain, err := s.Get(r.Context(), uint64(id))
+		if err != nil {
+			return err
+		}
+		return s.WriteResult(w, grain)
+	}
 	return s.WriteResult(w, reply)
 }

@@ -201,6 +307,10 @@ type AddRequest struct {
 	Quantity int32   `json:"quantity"`
 	Country  string  `json:"country"`
 	StoreId  *string `json:"storeId"`
+	// Children are sub-articles priced relative to this item (see Item.Children).
+	Children []Item `json:"children,omitempty"`
+	// CustomFields are optional user-supplied input fields for this line.
+	CustomFields map[string]string `json:"customFields,omitempty"`
 }

 func (s *PoolServer) AddSkuRequestHandler(w http.ResponseWriter, r *http.Request, id cart.CartId) error {
@@ -209,16 +319,26 @@ func (s *PoolServer) AddSkuRequestHandler(w http.ResponseWriter, r *http.Request
 	if err != nil {
 		return err
 	}
-	msg, err := GetItemAddMessage(r.Context(), addRequest.Sku, int(addRequest.Quantity), addRequest.Country, addRequest.StoreId)
+
+	item := Item{
+		Sku:          addRequest.Sku,
+		Quantity:     int(addRequest.Quantity),
+		StoreId:      addRequest.StoreId,
+		Children:     addRequest.Children,
+		CustomFields: addRequest.CustomFields,
+	}
+	groups := buildItemGroups(r.Context(), []Item{item}, addRequest.Country)
+	reply, err := s.applyItemGroups(r.Context(), id, groups)
 	if err != nil {
 		return err
 	}
-
-	reply, err := s.ApplyLocal(r.Context(), id, msg)
-	if err != nil {
-		return err
+	if reply == nil {
+		grain, err := s.Get(r.Context(), uint64(id))
+		if err != nil {
+			return err
+		}
+		return s.WriteResult(w, grain)
 	}
-
 	return s.WriteResult(w, reply)
 }

@@ -436,6 +556,29 @@ func (s *PoolServer) RemoveLineItemMarkingHandler(w http.ResponseWriter, r *http
 	return s.WriteResult(w, reply)
 }

+type SetCustomFieldsRequest struct {
+	CustomFields map[string]string `json:"customFields"`
+}
+
+func (s *PoolServer) SetCustomFieldsHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
+	itemId, err := strconv.ParseInt(r.PathValue("itemId"), 10, 64)
+	if err != nil {
+		return err
+	}
+	req := SetCustomFieldsRequest{}
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		return err
+	}
+	reply, err := s.ApplyLocal(r.Context(), cartId, &messages.SetLineItemCustomFields{
+		Id:           uint32(itemId),
+		CustomFields: req.CustomFields,
+	})
+	if err != nil {
+		return err
+	}
+	return s.WriteResult(w, reply)
+}
+
 func (s *PoolServer) InternalApplyMutationHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
 	if r.Method != http.MethodPost {
 		w.WriteHeader(http.StatusMethodNotAllowed)
@@ -513,6 +656,7 @@ func (s *PoolServer) Serve(mux *http.ServeMux) {

 	handleFunc("PUT /cart/item/{itemId}/marking", CookieCartIdHandler(s.ProxyHandler(s.LineItemMarkingHandler)))
 	handleFunc("DELETE /cart/item/{itemId}/marking", CookieCartIdHandler(s.ProxyHandler(s.RemoveLineItemMarkingHandler)))
+	handleFunc("PUT /cart/item/{itemId}/custom-fields", CookieCartIdHandler(s.ProxyHandler(s.SetCustomFieldsHandler)))

 	//mux.HandleFunc("GET /cart/checkout", CookieCartIdHandler(s.ProxyHandler(s.HandleCheckout)))
 	//mux.HandleFunc("GET /cart/confirmation/{orderId}", CookieCartIdHandler(s.ProxyHandler(s.HandleConfirmation)))
@@ -527,4 +671,5 @@ func (s *PoolServer) Serve(mux *http.ServeMux) {
 	handleFunc("PUT /cart/byid/{id}/user", CartIdHandler(s.ProxyHandler(s.SetUserIdHandler)))
 	handleFunc("PUT /cart/byid/{id}/item/{itemId}/marking", CartIdHandler(s.ProxyHandler(s.LineItemMarkingHandler)))
 	handleFunc("DELETE /cart/byid/{id}/item/{itemId}/marking", CartIdHandler(s.ProxyHandler(s.RemoveLineItemMarkingHandler)))
+	handleFunc("PUT /cart/byid/{id}/item/{itemId}/custom-fields", CartIdHandler(s.ProxyHandler(s.SetCustomFieldsHandler)))
 }