more changes

cart-grain.go

@@ -7,7 +7,6 @@ import (
 	"log"
 	"slices"
 	"sync"
-	"time"
 
 	messages "git.tornberg.me/go-cart-actor/proto"
 )
@@ -93,7 +92,6 @@ type CartGrain struct {
 	mu                sync.RWMutex
 	lastItemId        int
 	lastDeliveryId    int
-	storageMessages   []Message
 	Id                CartId          `json:"id"`
 	Items             []*CartItem     `json:"items"`
 	TotalPrice        int64           `json:"totalPrice"`
@@ -108,8 +106,8 @@ type CartGrain struct {
 
 type Grain interface {
 	GetId() CartId
-	HandleMessage(message *Message, isReplay bool) (*FrameWithPayload, error)
-	GetCurrentState() (*FrameWithPayload, error)
+	Apply(content interface{}, isReplay bool) (*CartGrain, error)
+	GetCurrentState() (*CartGrain, error)
 }
 
 func (c *CartGrain) GetId() CartId {
@@ -117,20 +115,12 @@ func (c *CartGrain) GetId() CartId {
 }
 
 func (c *CartGrain) GetLastChange() int64 {
-	if len(c.storageMessages) == 0 {
-		return 0
-	}
-	return *c.storageMessages[len(c.storageMessages)-1].TimeStamp
+	// Legacy event log removed; return 0 to indicate no persisted mutation history.
+	return 0
 }
 
-func (c *CartGrain) GetCurrentState() (*FrameWithPayload, error) {
-	result, err := json.Marshal(c)
-	if err != nil {
-		ret := MakeFrameWithPayload(0, 400, []byte(err.Error()))
-		return &ret, nil
-	}
-	ret := MakeFrameWithPayload(0, 200, result)
-	return &ret, nil
+func (c *CartGrain) GetCurrentState() (*CartGrain, error) {
+	return c, nil
 }
 
 func getInt(data float64, ok bool) (int, error) {
@@ -201,30 +191,23 @@ func getItemData(sku string, qty int, country string) (*messages.AddItem, error)
 	}, nil
 }
 
-func (c *CartGrain) AddItem(sku string, qty int, country string, storeId *string) (*FrameWithPayload, error) {
+func (c *CartGrain) AddItem(sku string, qty int, country string, storeId *string) (*CartGrain, error) {
 	cartItem, err := getItemData(sku, qty, country)
 	if err != nil {
 		return nil, err
 	}
 	cartItem.StoreId = storeId
-	return c.HandleMessage(&Message{
-		Type:    2,
-		Content: cartItem,
-	}, false)
+	return c.Apply(cartItem, false)
 }
 
-func (c *CartGrain) GetStorageMessage(since int64) []StorableMessage {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	ret := make([]StorableMessage, 0)
+/*
+Legacy storage (event sourcing) removed in oneof refactor.
+Kept stub (commented) for potential future reintroduction using proto envelopes.
 
-	for _, message := range c.storageMessages {
-		if *message.TimeStamp > since {
-			ret = append(ret, message)
-		}
-	}
-	return ret
+func (c *CartGrain) GetStorageMessage(since int64) []interface{} {
+	return nil
 }
+*/
 
 func (c *CartGrain) GetState() ([]byte, error) {
 	return json.Marshal(c)
@@ -279,324 +262,238 @@ func GetTaxAmount(total int64, tax int) int64 {
 	return int64(float64(total) / float64((1 + taxD)))
 }
 
-func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPayload, error) {
-	if message.TimeStamp == nil {
-		now := time.Now().Unix()
-		message.TimeStamp = &now
-	}
+func (c *CartGrain) Apply(content interface{}, isReplay bool) (*CartGrain, error) {
 	grainMutations.Inc()
-	var err error
-	switch message.Type {
-	case SetCartItemsType:
-		msg, ok := message.Content.(*messages.SetCartRequest)
-		if !ok {
-			err = fmt.Errorf("expected SetCartItems")
-		} else {
 
-			c.mu.Lock()
-			c.Items = make([]*CartItem, 0, len(msg.Items))
-			c.mu.Unlock()
-			for _, item := range msg.Items {
-				c.AddItem(item.Sku, int(item.Quantity), item.Country, item.StoreId)
-			}
+	switch msg := content.(type) {
 
-		}
-	case AddRequestType:
-		msg, ok := message.Content.(*messages.AddRequest)
-		if !ok {
-			err = fmt.Errorf("expected AddRequest")
-		} else {
-
-			existingItem, found := c.FindItemWithSku(msg.Sku)
-			if found {
-				existingItem.Quantity += int(msg.Quantity)
-				c.UpdateTotals()
-			} else {
-				return c.AddItem(msg.Sku, int(msg.Quantity), msg.Country, msg.StoreId)
-			}
-
-		}
-	case AddItemType:
-		msg, ok := message.Content.(*messages.AddItem)
-		if !ok {
-			err = fmt.Errorf("expected AddItem")
-		} else {
-
-			if msg.Quantity < 1 {
-				return nil, fmt.Errorf("invalid quantity")
-			}
-			existingItem, found := c.FindItemWithSku(msg.Sku)
-			if found {
-				existingItem.Quantity += int(msg.Quantity)
-				c.UpdateTotals()
-			} else {
-				c.mu.Lock()
-				c.lastItemId++
-				tax := 2500
-				if msg.Tax > 0 {
-					tax = int(msg.Tax)
-				}
-
-				taxAmount := GetTaxAmount(msg.Price, tax)
-
-				c.Items = append(c.Items, &CartItem{
-					Id:          c.lastItemId,
-					ItemId:      int(msg.ItemId),
-					Quantity:    int(msg.Quantity),
-					Sku:         msg.Sku,
-					Name:        msg.Name,
-					Price:       msg.Price,
-					TotalPrice:  msg.Price * int64(msg.Quantity),
-					TotalTax:    int64(taxAmount * int64(msg.Quantity)),
-					Image:       msg.Image,
-					Stock:       StockStatus(msg.Stock),
-					Disclaimer:  msg.Disclaimer,
-					Brand:       msg.Brand,
-					Category:    msg.Category,
-					Category2:   msg.Category2,
-					Category3:   msg.Category3,
-					Category4:   msg.Category4,
-					Category5:   msg.Category5,
-					OrgPrice:    msg.OrgPrice,
-					ArticleType: msg.ArticleType,
-					Outlet:      msg.Outlet,
-					SellerId:    msg.SellerId,
-					SellerName:  msg.SellerName,
-					Tax:         int(taxAmount),
-					TaxRate:     tax,
-					StoreId:     msg.StoreId,
-				})
-				c.UpdateTotals()
-				c.mu.Unlock()
-			}
-
-		}
-	case ChangeQuantityType:
-		msg, ok := message.Content.(*messages.ChangeQuantity)
-		if !ok {
-			err = fmt.Errorf("expected ChangeQuantity")
-		} else {
-
-			for i, item := range c.Items {
-				if item.Id == int(msg.Id) {
-					if msg.Quantity <= 0 {
-						//c.TotalPrice -= item.Price * int64(item.Quantity)
-						c.Items = append(c.Items[:i], c.Items[i+1:]...)
-					} else {
-						//diff := int(msg.Quantity) - item.Quantity
-						item.Quantity = int(msg.Quantity)
-						//c.TotalPrice += item.Price * int64(diff)
-					}
-
-					break
-				}
-			}
-			c.UpdateTotals()
-
-		}
-	case RemoveItemType:
-		msg, ok := message.Content.(*messages.RemoveItem)
-		if !ok {
-			err = fmt.Errorf("expected RemoveItem")
-		} else {
-
-			items := make([]*CartItem, 0, len(c.Items))
-			for _, item := range c.Items {
-				if item.Id == int(msg.Id) {
-					//c.TotalPrice -= item.Price * int64(item.Quantity)
-				} else {
-					items = append(items, item)
-				}
-			}
-			c.Items = items
-			c.UpdateTotals()
-		}
-	case SetDeliveryType:
-		msg, ok := message.Content.(*messages.SetDelivery)
-		if !ok {
-			err = fmt.Errorf("expected SetDelivery")
-		} else {
-
-			c.lastDeliveryId++
-			items := make([]int, 0)
-			withDelivery := c.ItemsWithDelivery()
-			if len(msg.Items) == 0 {
-				items = append(items, c.ItemsWithoutDelivery()...)
-			} else {
-				for _, id := range msg.Items {
-					for _, item := range c.Items {
-						if item.Id == int(id) {
-							if slices.Contains(withDelivery, item.Id) {
-								return nil, fmt.Errorf("item already has delivery")
-							}
-							items = append(items, int(item.Id))
-							break
-						}
-					}
-				}
-			}
-			if len(items) > 0 {
-				c.Deliveries = append(c.Deliveries, &CartDelivery{
-					Id:          c.lastDeliveryId,
-					Provider:    msg.Provider,
-					PickupPoint: msg.PickupPoint,
-					Price:       4900,
-					Items:       items,
-				})
-
-				c.UpdateTotals()
-
-			}
-
-		}
-	case RemoveDeliveryType:
-		msg, ok := message.Content.(*messages.RemoveDelivery)
-		if !ok {
-			err = fmt.Errorf("expected RemoveDelivery")
-		} else {
-
-			deliveries := make([]*CartDelivery, 0, len(c.Deliveries))
-			for _, delivery := range c.Deliveries {
-				if delivery.Id == int(msg.Id) {
-					c.TotalPrice -= delivery.Price
-				} else {
-					deliveries = append(deliveries, delivery)
-				}
-			}
-			c.Deliveries = deliveries
-			c.UpdateTotals()
-		}
-	case SetPickupPointType:
-		msg, ok := message.Content.(*messages.SetPickupPoint)
-		if !ok {
-			err = fmt.Errorf("expected SetPickupPoint")
-		} else {
-
-			for _, delivery := range c.Deliveries {
-				if delivery.Id == int(msg.DeliveryId) {
-					delivery.PickupPoint = &messages.PickupPoint{
-						Id:      msg.Id,
-						Address: msg.Address,
-						City:    msg.City,
-						Zip:     msg.Zip,
-						Country: msg.Country,
-						Name:    msg.Name,
-					}
-					break
-				}
-			}
-
-		}
-	case CreateCheckoutOrderType:
-		msg, ok := message.Content.(*messages.CreateCheckoutOrder)
-		if !ok {
-			err = fmt.Errorf("expected CreateCheckoutOrder")
-		} else {
-
-			orderLines := make([]*Line, 0, len(c.Items))
-
-			c.PaymentInProgress = true
-			c.Processing = true
-			for _, item := range c.Items {
-
-				orderLines = append(orderLines, &Line{
-					Type:           "physical",
-					Reference:      item.Sku,
-					Name:           item.Name,
-					Quantity:       item.Quantity,
-					UnitPrice:      int(item.Price),
-					TaxRate:        2500, // item.TaxRate,
-					QuantityUnit:   "st",
-					TotalAmount:    int(item.TotalPrice),
-					TotalTaxAmount: int(item.TotalTax),
-					ImageURL:       fmt.Sprintf("https://www.elgiganten.se%s", item.Image),
-				})
-			}
-			for _, line := range c.Deliveries {
-				if line.Price > 0 {
-					orderLines = append(orderLines, &Line{
-						Type:           "shipping_fee",
-						Reference:      line.Provider,
-						Name:           "Delivery",
-						Quantity:       1,
-						UnitPrice:      int(line.Price),
-						TaxRate:        2500, // item.TaxRate,
-						QuantityUnit:   "st",
-						TotalAmount:    int(line.Price),
-						TotalTaxAmount: int(GetTaxAmount(line.Price, 2500)),
-					})
-				}
-			}
-			order := CheckoutOrder{
-				PurchaseCountry:    "SE",
-				PurchaseCurrency:   "SEK",
-				Locale:             "sv-se",
-				OrderAmount:        int(c.TotalPrice),
-				OrderTaxAmount:     int(c.TotalTax),
-				OrderLines:         orderLines,
-				MerchantReference1: c.Id.String(),
-				MerchantURLS: &CheckoutMerchantURLS{
-					Terms:        msg.Terms,
-					Checkout:     msg.Checkout,
-					Confirmation: msg.Confirmation,
-					Validation:   msg.Validation,
-					Push:         msg.Push,
-				},
-			}
-			orderPayload, err := json.Marshal(order)
-			if err != nil {
-				return nil, err
-			}
-			var klarnaOrder *CheckoutOrder
-			if c.OrderReference != "" {
-				log.Printf("Updating order id %s", c.OrderReference)
-				klarnaOrder, err = KlarnaInstance.UpdateOrder(c.OrderReference, bytes.NewReader(orderPayload))
-			} else {
-				klarnaOrder, err = KlarnaInstance.CreateOrder(bytes.NewReader(orderPayload))
-			}
-			// log.Printf("Order result: %+v", klarnaOrder)
-			if nil != err {
-				log.Printf("error from klarna: %v", err)
-				return nil, err
-			}
-			if c.OrderReference == "" {
-				c.OrderReference = klarnaOrder.ID
-				c.PaymentStatus = klarnaOrder.Status
-			}
-
-			orderData, err := json.Marshal(klarnaOrder)
-			if nil != err {
-				return nil, err
-			}
-
-			result := MakeFrameWithPayload(RemoteCreateOrderReply, 200, orderData)
-			return &result, nil
-		}
-	case OrderCompletedType:
-		msg, ok := message.Content.(*messages.OrderCreated)
-		if !ok {
-			log.Printf("expected OrderCompleted, got %T", message.Content)
-			err = fmt.Errorf("expected OrderCompleted")
-		} else {
-			c.OrderReference = msg.OrderId
-			c.PaymentStatus = msg.Status
-			c.PaymentInProgress = false
-		}
-	default:
-		err = fmt.Errorf("unknown message type %d", message.Type)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if !isReplay {
+	case *messages.SetCartRequest:
 		c.mu.Lock()
-		c.storageMessages = append(c.storageMessages, *message)
+		c.Items = make([]*CartItem, 0, len(msg.Items))
 		c.mu.Unlock()
+		for _, it := range msg.Items {
+			c.AddItem(it.Sku, int(it.Quantity), it.Country, it.StoreId)
+		}
+
+	case *messages.AddRequest:
+		if existing, found := c.FindItemWithSku(msg.Sku); found {
+			existing.Quantity += int(msg.Quantity)
+			c.UpdateTotals()
+		} else {
+			return c.AddItem(msg.Sku, int(msg.Quantity), msg.Country, msg.StoreId)
+		}
+
+	case *messages.AddItem:
+		if msg.Quantity < 1 {
+			return nil, fmt.Errorf("invalid quantity")
+		}
+		if existing, found := c.FindItemWithSku(msg.Sku); found {
+			existing.Quantity += int(msg.Quantity)
+			c.UpdateTotals()
+		} else {
+			c.mu.Lock()
+			c.lastItemId++
+			tax := 2500
+			if msg.Tax > 0 {
+				tax = int(msg.Tax)
+			}
+			taxAmount := GetTaxAmount(msg.Price, tax)
+			c.Items = append(c.Items, &CartItem{
+				Id:          c.lastItemId,
+				ItemId:      int(msg.ItemId),
+				Quantity:    int(msg.Quantity),
+				Sku:         msg.Sku,
+				Name:        msg.Name,
+				Price:       msg.Price,
+				TotalPrice:  msg.Price * int64(msg.Quantity),
+				TotalTax:    int64(taxAmount * int64(msg.Quantity)),
+				Image:       msg.Image,
+				Stock:       StockStatus(msg.Stock),
+				Disclaimer:  msg.Disclaimer,
+				Brand:       msg.Brand,
+				Category:    msg.Category,
+				Category2:   msg.Category2,
+				Category3:   msg.Category3,
+				Category4:   msg.Category4,
+				Category5:   msg.Category5,
+				OrgPrice:    msg.OrgPrice,
+				ArticleType: msg.ArticleType,
+				Outlet:      msg.Outlet,
+				SellerId:    msg.SellerId,
+				SellerName:  msg.SellerName,
+				Tax:         int(taxAmount),
+				TaxRate:     tax,
+				StoreId:     msg.StoreId,
+			})
+			c.UpdateTotals()
+			c.mu.Unlock()
+		}
+
+	case *messages.ChangeQuantity:
+		for i, item := range c.Items {
+			if item.Id == int(msg.Id) {
+				if msg.Quantity <= 0 {
+					c.Items = append(c.Items[:i], c.Items[i+1:]...)
+				} else {
+					item.Quantity = int(msg.Quantity)
+				}
+				break
+			}
+		}
+		c.UpdateTotals()
+
+	case *messages.RemoveItem:
+		newItems := make([]*CartItem, 0, len(c.Items))
+		for _, it := range c.Items {
+			if it.Id != int(msg.Id) {
+				newItems = append(newItems, it)
+			}
+		}
+		c.Items = newItems
+		c.UpdateTotals()
+
+	case *messages.SetDelivery:
+		c.lastDeliveryId++
+		items := make([]int, 0)
+		withDelivery := c.ItemsWithDelivery()
+		if len(msg.Items) == 0 {
+			items = append(items, c.ItemsWithoutDelivery()...)
+		} else {
+			for _, id := range msg.Items {
+				for _, it := range c.Items {
+					if it.Id == int(id) {
+						if slices.Contains(withDelivery, it.Id) {
+							return nil, fmt.Errorf("item already has delivery")
+						}
+						items = append(items, int(it.Id))
+						break
+					}
+				}
+			}
+		}
+		if len(items) > 0 {
+			c.Deliveries = append(c.Deliveries, &CartDelivery{
+				Id:          c.lastDeliveryId,
+				Provider:    msg.Provider,
+				PickupPoint: msg.PickupPoint,
+				Price:       4900,
+				Items:       items,
+			})
+			c.UpdateTotals()
+		}
+
+	case *messages.RemoveDelivery:
+		dels := make([]*CartDelivery, 0, len(c.Deliveries))
+		for _, d := range c.Deliveries {
+			if d.Id == int(msg.Id) {
+				c.TotalPrice -= d.Price
+			} else {
+				dels = append(dels, d)
+			}
+		}
+		c.Deliveries = dels
+		c.UpdateTotals()
+
+	case *messages.SetPickupPoint:
+		for _, d := range c.Deliveries {
+			if d.Id == int(msg.DeliveryId) {
+				d.PickupPoint = &messages.PickupPoint{
+					Id:      msg.Id,
+					Address: msg.Address,
+					City:    msg.City,
+					Zip:     msg.Zip,
+					Country: msg.Country,
+					Name:    msg.Name,
+				}
+				break
+			}
+		}
+
+	case *messages.CreateCheckoutOrder:
+		orderLines := make([]*Line, 0, len(c.Items))
+		c.PaymentInProgress = true
+		c.Processing = true
+		for _, item := range c.Items {
+			orderLines = append(orderLines, &Line{
+				Type:           "physical",
+				Reference:      item.Sku,
+				Name:           item.Name,
+				Quantity:       item.Quantity,
+				UnitPrice:      int(item.Price),
+				TaxRate:        2500,
+				QuantityUnit:   "st",
+				TotalAmount:    int(item.TotalPrice),
+				TotalTaxAmount: int(item.TotalTax),
+				ImageURL:       fmt.Sprintf("https://www.elgiganten.se%s", item.Image),
+			})
+		}
+		for _, line := range c.Deliveries {
+			if line.Price > 0 {
+				orderLines = append(orderLines, &Line{
+					Type:           "shipping_fee",
+					Reference:      line.Provider,
+					Name:           "Delivery",
+					Quantity:       1,
+					UnitPrice:      int(line.Price),
+					TaxRate:        2500,
+					QuantityUnit:   "st",
+					TotalAmount:    int(line.Price),
+					TotalTaxAmount: int(GetTaxAmount(line.Price, 2500)),
+				})
+			}
+		}
+		order := CheckoutOrder{
+			PurchaseCountry:    "SE",
+			PurchaseCurrency:   "SEK",
+			Locale:             "sv-se",
+			OrderAmount:        int(c.TotalPrice),
+			OrderTaxAmount:     int(c.TotalTax),
+			OrderLines:         orderLines,
+			MerchantReference1: c.Id.String(),
+			MerchantURLS: &CheckoutMerchantURLS{
+				Terms:        msg.Terms,
+				Checkout:     msg.Checkout,
+				Confirmation: msg.Confirmation,
+				Validation:   msg.Validation,
+				Push:         msg.Push,
+			},
+		}
+		orderPayload, err := json.Marshal(order)
+		if err != nil {
+			return nil, err
+		}
+		var klarnaOrder *CheckoutOrder
+		var klarnaError error
+		if c.OrderReference != "" {
+			log.Printf("Updating order id %s", c.OrderReference)
+			klarnaOrder, klarnaError = KlarnaInstance.UpdateOrder(c.OrderReference, bytes.NewReader(orderPayload))
+		} else {
+			klarnaOrder, klarnaError = KlarnaInstance.CreateOrder(bytes.NewReader(orderPayload))
+		}
+		if klarnaError != nil {
+			log.Printf("error from klarna: %v", klarnaError)
+			return nil, klarnaError
+		}
+		if c.OrderReference == "" {
+			c.OrderReference = klarnaOrder.ID
+			c.PaymentStatus = klarnaOrder.Status
+		}
+		// This originally returned a FrameWithPayload; now returns the grain state.
+		// The caller (gRPC handler) is responsible for wrapping this.
+		return c, nil
+
+	case *messages.OrderCreated:
+		c.OrderReference = msg.OrderId
+		c.PaymentStatus = msg.Status
+		c.PaymentInProgress = false
+
+	default:
+		return nil, fmt.Errorf("unsupported mutation type %T", content)
 	}
-	result, err := json.Marshal(c)
-	msg := MakeFrameWithPayload(RemoteHandleMutationReply, 200, result)
-	return &msg, err
+
+	// (Optional) Append to new storage mechanism here if still required.
+
+	return c, nil
 }
 
 func (c *CartGrain) UpdateTotals() {