update

cmd/cart/checkout_server.go

@@ -137,6 +137,12 @@ func (a *App) HandleCheckoutRequests(amqpUrl string, mux *http.ServeMux, invento
 			return
 		}
 
+		// Apply ConfirmationViewed mutation
+		cartId, ok := cart.ParseCartId(order.MerchantReference1)
+		if ok {
+			a.pool.Apply(r.Context(), uint64(cartId), &messages.ConfirmationViewed{})
+		}
+
 		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 		if order.Status == "checkout_complete" {
 			http.SetCookie(w, &http.Cookie{

cmd/cart/pool-server.go

@@ -642,6 +642,64 @@ func (s *PoolServer) RemoveVoucherHandler(w http.ResponseWriter, r *http.Request
 	return nil
 }
 
+func (s *PoolServer) SetUserIdHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
+	setUserId := messages.SetUserId{}
+	err := json.NewDecoder(r.Body).Decode(&setUserId)
+	if err != nil {
+		return err
+	}
+	reply, err := s.ApplyLocal(r.Context(), cartId, &setUserId)
+	if err != nil {
+		return err
+	}
+	return s.WriteResult(w, reply)
+}
+
+func (s *PoolServer) LineItemMarkingHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
+	itemIdStr := r.PathValue("itemId")
+	itemId, err := strconv.ParseInt(itemIdStr, 10, 64)
+	if err != nil {
+		return err
+	}
+	lineItemMarking := messages.LineItemMarking{Id: uint32(itemId)}
+	err = json.NewDecoder(r.Body).Decode(&lineItemMarking)
+	if err != nil {
+		return err
+	}
+	reply, err := s.ApplyLocal(r.Context(), cartId, &lineItemMarking)
+	if err != nil {
+		return err
+	}
+	return s.WriteResult(w, reply)
+}
+
+func (s *PoolServer) RemoveLineItemMarkingHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
+	itemIdStr := r.PathValue("itemId")
+	itemId, err := strconv.ParseInt(itemIdStr, 10, 64)
+	if err != nil {
+		return err
+	}
+	removeLineItemMarking := messages.RemoveLineItemMarking{Id: uint32(itemId)}
+	reply, err := s.ApplyLocal(r.Context(), cartId, &removeLineItemMarking)
+	if err != nil {
+		return err
+	}
+	return s.WriteResult(w, reply)
+}
+
+func (s *PoolServer) CreateCheckoutOrderHandler(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
+	createCheckoutOrder := messages.CreateCheckoutOrder{}
+	err := json.NewDecoder(r.Body).Decode(&createCheckoutOrder)
+	if err != nil {
+		return err
+	}
+	reply, err := s.ApplyLocal(r.Context(), cartId, &createCheckoutOrder)
+	if err != nil {
+		return err
+	}
+	return s.WriteResult(w, reply)
+}
+
 func (s *PoolServer) Serve(mux *http.ServeMux) {
 
 	// mux.HandleFunc("OPTIONS /cart", func(w http.ResponseWriter, r *http.Request) {
@@ -679,6 +737,11 @@ func (s *PoolServer) Serve(mux *http.ServeMux) {
 	handleFunc("PUT /cart/voucher", CookieCartIdHandler(s.ProxyHandler(s.AddVoucherHandler)))
 	handleFunc("PUT /cart/subscription-details", CookieCartIdHandler(s.ProxyHandler(s.SubscriptionDetailsHandler)))
 	handleFunc("DELETE /cart/voucher/{voucherId}", CookieCartIdHandler(s.ProxyHandler(s.RemoveVoucherHandler)))
+	handleFunc("PUT /cart/user", CookieCartIdHandler(s.ProxyHandler(s.SetUserIdHandler)))
+	handleFunc("PUT /cart/item/{itemId}/marking", CookieCartIdHandler(s.ProxyHandler(s.LineItemMarkingHandler)))
+	handleFunc("DELETE /cart/item/{itemId}/marking", CookieCartIdHandler(s.ProxyHandler(s.RemoveLineItemMarkingHandler)))
+
+	handleFunc("POST /cart/checkout-order", CookieCartIdHandler(s.ProxyHandler(s.CreateCheckoutOrderHandler)))
 
 	//mux.HandleFunc("GET /cart/checkout", CookieCartIdHandler(s.ProxyHandler(s.HandleCheckout)))
 	//mux.HandleFunc("GET /cart/confirmation/{orderId}", CookieCartIdHandler(s.ProxyHandler(s.HandleConfirmation)))
@@ -693,6 +756,11 @@ func (s *PoolServer) Serve(mux *http.ServeMux) {
 	handleFunc("PUT /cart/byid/{id}/delivery/{deliveryId}/pickupPoint", CartIdHandler(s.ProxyHandler(s.SetPickupPointHandler)))
 	handleFunc("PUT /cart/byid/{id}/voucher", CookieCartIdHandler(s.ProxyHandler(s.AddVoucherHandler)))
 	handleFunc("DELETE /cart/byid/{id}/voucher/{voucherId}", CookieCartIdHandler(s.ProxyHandler(s.RemoveVoucherHandler)))
+	handleFunc("PUT /cart/byid/{id}/user", CartIdHandler(s.ProxyHandler(s.SetUserIdHandler)))
+	handleFunc("PUT /cart/byid/{id}/item/{itemId}/marking", CartIdHandler(s.ProxyHandler(s.LineItemMarkingHandler)))
+	handleFunc("DELETE /cart/byid/{id}/item/{itemId}/marking", CartIdHandler(s.ProxyHandler(s.RemoveLineItemMarkingHandler)))
+
+	handleFunc("POST /cart/byid/{id}/checkout-order", CartIdHandler(s.ProxyHandler(s.CreateCheckoutOrderHandler)))
 	//mux.HandleFunc("GET /cart/byid/{id}/checkout", CartIdHandler(s.ProxyHandler(s.HandleCheckout)))
 	//mux.HandleFunc("GET /cart/byid/{id}/confirmation", CartIdHandler(s.ProxyHandler(s.HandleConfirmation)))
 

cmd/cart/product-fetcher.go

@@ -102,6 +102,8 @@ func ToItemAddMessage(item *index.DataItem, storeId *string, qty int, country st
 	category4, _ := item.GetStringFieldValue(13) //Fields[13].(string)
 	category5, _ := item.GetStringFieldValue(14) //.Fields[14].(string)
 
+	cgm, _ := item.GetStringFieldValue(35) // Customer Group Membership
+
 	return &messages.AddItem{
 		ItemId:      uint32(item.Id),
 		Quantity:    int32(qty),
@@ -126,6 +128,7 @@ func ToItemAddMessage(item *index.DataItem, storeId *string, qty int, country st
 		Outlet:      outlet,
 		StoreId:     storeId,
 		SaleStatus:  item.SaleStatus,
+		Cgm:         cgm,
 	}, nil
 }