stuff

cart-grain.go

@@ -7,10 +7,12 @@ import (
 	"net/http"
 	"time"
 
-	"git.tornberg.me/go-cart-actor/git.tornberg.me/go-cart-actor/messages"
+	messages "git.tornberg.me/go-cart-actor/proto"
 	"github.com/matst80/slask-finder/pkg/index"
 )
 
+type CartId [16]byte
+
 type CartItem struct {
 	Sku   string `json:"sku"`
 	Name  string `json:"name"`
@@ -20,19 +22,17 @@ type CartItem struct {
 
 type CartGrain struct {
 	storageMessages []Message
-	Id              string     `json:"id"`
+	Id              CartId     `json:"id"`
 	Items           []CartItem `json:"items"`
 	TotalPrice      int64      `json:"totalPrice"`
 }
 
 type Grain interface {
-	GetId() string
-	GetLastChange() int64
-	HandleMessage(message *Message, isReplay bool, reply *CartGrain) error
-	GetStorageMessage(since int64) []StorableMessage
+	GetId() CartId
+	HandleMessage(message *Message, isReplay bool) ([]byte, error)
 }
 
-func (c *CartGrain) GetId() string {
+func (c *CartGrain) GetId() CartId {
 	return c.Id
 }
 
@@ -79,15 +79,15 @@ func getItemData(sku string) (*messages.AddItem, error) {
 	}, nil
 }
 
-func (c *CartGrain) AddItem(sku string, reply *CartGrain) error {
+func (c *CartGrain) AddItem(sku string) ([]byte, error) {
 	cartItem, err := getItemData(sku)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	return c.HandleMessage(&Message{
 		Type:    2,
 		Content: cartItem,
-	}, false, reply)
+	}, false)
 }
 
 func (c *CartGrain) GetStorageMessage(since int64) []StorableMessage {
@@ -101,7 +101,7 @@ func (c *CartGrain) GetStorageMessage(since int64) []StorableMessage {
 	return ret
 }
 
-func (c *CartGrain) HandleMessage(message *Message, isReplay bool, reply *CartGrain) error {
+func (c *CartGrain) HandleMessage(message *Message, isReplay bool) ([]byte, error) {
 	log.Printf("Handling message %d", message.Type)
 	if message.TimeStamp == nil {
 		now := time.Now().Unix()
@@ -114,7 +114,7 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool, reply *CartGr
 		if !ok {
 			err = fmt.Errorf("invalid content type")
 		} else {
-			return c.AddItem(msg.Sku, reply)
+			return c.AddItem(msg.Sku)
 		}
 	case AddItemType:
 		msg, ok := message.Content.(*messages.AddItem)
@@ -132,9 +132,11 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool, reply *CartGr
 	default:
 		err = fmt.Errorf("unknown message type")
 	}
+	if err != nil {
+		return nil, err
+	}
 	if !isReplay {
 		c.storageMessages = append(c.storageMessages, *message)
 	}
-	*reply = *c
-	return err
+	return json.Marshal(c)
 }