more

cmd/cart/cart-grain.go

@@ -59,12 +59,20 @@ type CartDelivery struct {
 	PickupPoint *messages.PickupPoint `json:"pickupPoint,omitempty"`
 }
 
+type CartNotification struct {
+	LinkedId int    `json:"id"`
+	Provider string `json:"provider"`
+	Title    string `json:"title"`
+	Content  string `json:"content"`
+}
+
 type CartGrain struct {
 	mu                sync.RWMutex
 	lastItemId        int
 	lastDeliveryId    int
 	lastAccess        time.Time
-	lastChange        time.Time          // unix seconds of last successful mutation (replay sets from event ts)
+	lastChange        time.Time // unix seconds of last successful mutation (replay sets from event ts)
+	userId            string
 	Id                CartId             `json:"id"`
 	Items             []*CartItem        `json:"items"`
 	TotalPrice        int64              `json:"totalPrice"`
@@ -77,6 +85,7 @@ type CartGrain struct {
 	OrderReference    string             `json:"orderReference,omitempty"`
 	PaymentStatus     string             `json:"paymentStatus,omitempty"`
 	Vouchers          []*voucher.Voucher `json:"vouchers,omitempty"`
+	Notifications     []CartNotification `json:"cartNotification,omitempty"`
 }
 
 func (c *CartGrain) GetId() uint64 {

cmd/cart/pool-server.go

@@ -29,7 +29,7 @@ func NewPoolServer(pool actor.GrainPool[*CartGrain], pod_name string, klarnaClie
 	}
 }
 
-func (s *PoolServer) ApplyLocal(id CartId, mutation ...proto.Message) (*CartGrain, error) {
+func (s *PoolServer) ApplyLocal(id CartId, mutation ...proto.Message) (*actor.MutationResult[*CartGrain], error) {
 	return s.Apply(uint64(id), mutation...)
 }
 
@@ -55,7 +55,7 @@ func (s *PoolServer) AddSkuToCartHandler(w http.ResponseWriter, r *http.Request,
 	return s.WriteResult(w, data)
 }
 
-func (s *PoolServer) WriteResult(w http.ResponseWriter, result *CartGrain) error {
+func (s *PoolServer) WriteResult(w http.ResponseWriter, result any) error {
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Cache-Control", "no-cache")
 	w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -311,9 +311,9 @@ func (s *PoolServer) CreateOrUpdateCheckout(host string, id CartId) (*CheckoutOr
 	}
 }
 
-func (s *PoolServer) ApplyCheckoutStarted(klarnaOrder *CheckoutOrder, id CartId) (*CartGrain, error) {
+func (s *PoolServer) ApplyCheckoutStarted(klarnaOrder *CheckoutOrder, id CartId) (*actor.MutationResult[*CartGrain], error) {
 	// Persist initialization state via mutation (best-effort)
-	return s.Apply(uint64(id), &messages.InitializeCheckout{
+	return s.ApplyLocal(id, &messages.InitializeCheckout{
 		OrderId:           klarnaOrder.ID,
 		Status:            klarnaOrder.Status,
 		PaymentInProgress: true,
@@ -440,7 +440,7 @@ func (s *PoolServer) ProxyHandler(fn func(w http.ResponseWriter, r *http.Request
 func (s *PoolServer) AddVoucherHandler(w http.ResponseWriter, r *http.Request, cartId CartId) error {
 	msg := &messages.AddVoucher{}
 	json.NewDecoder(r.Body).Decode(msg)
-	reply, err := s.Apply(uint64(cartId), msg)
+	reply, err := s.ApplyLocal(cartId, msg)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(err.Error()))