This commit is contained in:
matst80
2024-11-10 22:54:56 +01:00
parent bc6c3ee692
commit d01b6675b4

View File

@@ -25,11 +25,12 @@ func (id *CartId) UnmarshalJSON(data []byte) error {
} }
type CartItem struct { type CartItem struct {
Id int `json:"id"` Id int `json:"id"`
Sku string `json:"sku"` Sku string `json:"sku"`
Name string `json:"name"` Name string `json:"name"`
Price int64 `json:"price"` Price int64 `json:"price"`
Image string `json:"image"` Quantity int `json:"qty"`
Image string `json:"image"`
} }
type CartDelivery struct { type CartDelivery struct {
@@ -64,7 +65,7 @@ func (c *CartGrain) GetLastChange() int64 {
return *c.storageMessages[len(c.storageMessages)-1].TimeStamp return *c.storageMessages[len(c.storageMessages)-1].TimeStamp
} }
func getItemData(sku string) (*messages.AddItem, error) { func getItemData(sku string, qty int) (*messages.AddItem, error) {
item, err := FetchItem(sku) item, err := FetchItem(sku)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -87,7 +88,7 @@ func getItemData(sku string) (*messages.AddItem, error) {
} }
return &messages.AddItem{ return &messages.AddItem{
Quantity: 1, Quantity: int32(qty),
Price: int64(price), Price: int64(price),
Sku: sku, Sku: sku,
Name: item.Title, Name: item.Title,
@@ -95,8 +96,8 @@ func getItemData(sku string) (*messages.AddItem, error) {
}, nil }, nil
} }
func (c *CartGrain) AddItem(sku string) ([]byte, error) { func (c *CartGrain) AddItem(sku string, qty int) ([]byte, error) {
cartItem, err := getItemData(sku) cartItem, err := getItemData(sku, qty)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -130,21 +131,36 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) ([]byte, erro
if !ok { if !ok {
err = fmt.Errorf("expected AddRequest") err = fmt.Errorf("expected AddRequest")
} else { } else {
return c.AddItem(msg.Sku) return c.AddItem(msg.Sku, 1) // extent AddRequest to include quantity
} }
case AddItemType: case AddItemType:
msg, ok := message.Content.(*messages.AddItem) msg, ok := message.Content.(*messages.AddItem)
if !ok { if !ok {
err = fmt.Errorf("expected AddItem") err = fmt.Errorf("expected AddItem")
} else { } else {
c.lastItemId++ found := false
c.Items = append(c.Items, CartItem{ if msg.Quantity < 1 {
Id: c.lastItemId, return nil, fmt.Errorf("invalid quantity")
Sku: msg.Sku, }
Name: msg.Name, for _, item := range c.Items {
Price: msg.Price, if item.Sku == msg.Sku {
Image: msg.Image, found = true
}) item.Quantity += int(msg.Quantity)
c.TotalPrice += item.Price * int64(msg.Quantity)
break
}
}
if !found {
c.lastItemId++
c.Items = append(c.Items, CartItem{
Id: c.lastItemId,
Sku: msg.Sku,
Name: msg.Name,
Price: msg.Price,
Image: msg.Image,
})
}
c.TotalPrice += msg.Price * int64(msg.Quantity) c.TotalPrice += msg.Price * int64(msg.Quantity)
} }
case RemoveItemType: case RemoveItemType: