clear cart cookies

cart-grain.go

@@ -243,21 +243,21 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 		if !ok {
 			err = fmt.Errorf("expected SetCartItems")
 		} else {
-			if !c.PaymentInProgress {
+
 			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))
 			}
-			}
+
 		}
 	case AddRequestType:
 		msg, ok := message.Content.(*messages.AddRequest)
 		if !ok {
 			err = fmt.Errorf("expected AddRequest")
 		} else {
-			if !c.PaymentInProgress {
+
 			existingItem, found := c.FindItemWithSku(msg.Sku)
 			if found {
 				existingItem.Quantity += int(msg.Quantity)
@@ -265,14 +265,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 			} else {
 				return c.AddItem(msg.Sku, int(msg.Quantity)) // extent AddRequest to include quantity
 			}
-			}
+
 		}
 	case AddItemType:
 		msg, ok := message.Content.(*messages.AddItem)
 		if !ok {
 			err = fmt.Errorf("expected AddItem")
 		} else {
-			if !c.PaymentInProgress {
+
 			if msg.Quantity < 1 {
 				return nil, fmt.Errorf("invalid quantity")
 			}
@@ -304,14 +304,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 				c.TotalPrice += msg.Price * int64(msg.Quantity)
 				c.mu.Unlock()
 			}
-			}
+
 		}
 	case ChangeQuantityType:
 		msg, ok := message.Content.(*messages.ChangeQuantity)
 		if !ok {
 			err = fmt.Errorf("expected ChangeQuantity")
 		} else {
-			if !c.PaymentInProgress {
+
 			for i, item := range c.Items {
 				if item.Id == int(msg.Id) {
 					if msg.Quantity <= 0 {
@@ -326,14 +326,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 					break
 				}
 			}
-			}
+
 		}
 	case RemoveItemType:
 		msg, ok := message.Content.(*messages.RemoveItem)
 		if !ok {
 			err = fmt.Errorf("expected RemoveItem")
 		} else {
-			if !c.PaymentInProgress {
+
 			items := make([]*CartItem, 0, len(c.Items))
 			for _, item := range c.Items {
 				if item.Id == int(msg.Id) {
@@ -343,14 +343,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 				}
 			}
 			c.Items = items
-			}
+
 		}
 	case SetDeliveryType:
 		msg, ok := message.Content.(*messages.SetDelivery)
 		if !ok {
 			err = fmt.Errorf("expected SetDelivery")
 		} else {
-			if !c.PaymentInProgress {
+
 			c.lastDeliveryId++
 			items := make([]int, 0)
 			withDelivery := c.ItemsWithDelivery()
@@ -383,14 +383,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 					c.Processing = false
 				}()
 			}
-			}
+
 		}
 	case RemoveDeliveryType:
 		msg, ok := message.Content.(*messages.RemoveDelivery)
 		if !ok {
 			err = fmt.Errorf("expected RemoveDelivery")
 		} else {
-			if !c.PaymentInProgress {
+
 			deliveries := make([]*CartDelivery, 0, len(c.Deliveries))
 			for _, delivery := range c.Deliveries {
 				if delivery.Id == int(msg.Id) {
@@ -400,14 +400,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 				}
 			}
 			c.Deliveries = deliveries
-			}
+
 		}
 	case SetPickupPointType:
 		msg, ok := message.Content.(*messages.SetPickupPoint)
 		if !ok {
 			err = fmt.Errorf("expected SetPickupPoint")
 		} else {
-			if !c.PaymentInProgress {
+
 			for _, delivery := range c.Deliveries {
 				if delivery.Id == int(msg.DeliveryId) {
 					delivery.PickupPoint = &messages.PickupPoint{
@@ -421,13 +421,14 @@ func (c *CartGrain) HandleMessage(message *Message, isReplay bool) (*FrameWithPa
 					break
 				}
 			}
-			}
+
 		}
 	case CreateCheckoutOrderType:
 		msg, ok := message.Content.(*messages.CreateCheckoutOrder)
 		if !ok {
 			err = fmt.Errorf("expected CreateCheckoutOrder")
 		} else {
+
 			orderLines := make([]*klarna.Line, 0, len(c.Items))
 			totalTax := 0
 			c.PaymentInProgress = true

pool-server.go

@@ -31,6 +31,7 @@ func (s *PoolServer) HandleGet(w http.ResponseWriter, r *http.Request, id CartId
 	if err != nil {
 		return err
 	}
+
 	return s.WriteResult(w, data)
 }
 
@@ -316,6 +317,18 @@ func CookieCartIdHandler(fn func(w http.ResponseWriter, r *http.Request, cartId
 	}
 }
 
+func (s *PoolServer) RemoveCartCookie(w http.ResponseWriter, r *http.Request, cartId CartId) error {
+	cartId = NewCartId()
+	http.SetCookie(w, &http.Cookie{
+		Name:     "cartid",
+		Value:    cartId.String(),
+		Path:     "/",
+		SameSite: http.SameSiteLaxMode,
+	})
+	w.WriteHeader(http.StatusOK)
+	return nil
+}
+
 func CartIdHandler(fn func(w http.ResponseWriter, r *http.Request, cartId CartId) error) func(w http.ResponseWriter, r *http.Request) error {
 	return func(w http.ResponseWriter, r *http.Request) error {
 		cartId := ToCartId(r.PathValue("id"))
@@ -339,6 +352,7 @@ func (s *PoolServer) Serve() *http.ServeMux {
 	mux.HandleFunc("POST /set", ErrorHandler(CookieCartIdHandler(s.HandleSetCartItems)))
 	mux.HandleFunc("DELETE /{itemId}", ErrorHandler(CookieCartIdHandler(s.HandleDeleteItem)))
 	mux.HandleFunc("PUT /", ErrorHandler(CookieCartIdHandler(s.HandleQuantityChange)))
+	mux.HandleFunc("DELETE /", ErrorHandler(CookieCartIdHandler(s.RemoveCartCookie)))
 	mux.HandleFunc("POST /delivery", ErrorHandler(CookieCartIdHandler(s.HandleSetDelivery)))
 	mux.HandleFunc("DELETE /delivery/{deliveryId}", ErrorHandler(CookieCartIdHandler(s.HandleRemoveDelivery)))
 	mux.HandleFunc("PUT /delivery/{deliveryId}/pickupPoint", ErrorHandler(CookieCartIdHandler(s.HandleSetPickupPoint)))