add backoffice and move stuff

cmd/cart/main.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"git.tornberg.me/go-cart-actor/pkg/actor"
+	"git.tornberg.me/go-cart-actor/pkg/cart"
 	"git.tornberg.me/go-cart-actor/pkg/discovery"
 	messages "git.tornberg.me/go-cart-actor/pkg/messages"
 	"git.tornberg.me/go-cart-actor/pkg/proxy"
@@ -46,7 +47,7 @@ func init() {
 }
 
 type App struct {
-	pool *actor.SimpleGrainPool[CartGrain]
+	pool *actor.SimpleGrainPool[cart.CartGrain]
 }
 
 var podIp = os.Getenv("POD_IP")
@@ -104,57 +105,48 @@ func main() {
 
 	reg := actor.NewMutationRegistry()
 	reg.RegisterMutations(
-		actor.NewMutation(AddItem, func() *messages.AddItem {
+		actor.NewMutation(cart.AddItem, func() *messages.AddItem {
 			return &messages.AddItem{}
 		}),
-		actor.NewMutation(ChangeQuantity, func() *messages.ChangeQuantity {
+		actor.NewMutation(cart.ChangeQuantity, func() *messages.ChangeQuantity {
 			return &messages.ChangeQuantity{}
 		}),
-		actor.NewMutation(RemoveItem, func() *messages.RemoveItem {
+		actor.NewMutation(cart.RemoveItem, func() *messages.RemoveItem {
 			return &messages.RemoveItem{}
 		}),
-		actor.NewMutation(InitializeCheckout, func() *messages.InitializeCheckout {
+		actor.NewMutation(cart.InitializeCheckout, func() *messages.InitializeCheckout {
 			return &messages.InitializeCheckout{}
 		}),
-		actor.NewMutation(OrderCreated, func() *messages.OrderCreated {
+		actor.NewMutation(cart.OrderCreated, func() *messages.OrderCreated {
 			return &messages.OrderCreated{}
 		}),
-		actor.NewMutation(RemoveDelivery, func() *messages.RemoveDelivery {
+		actor.NewMutation(cart.RemoveDelivery, func() *messages.RemoveDelivery {
 			return &messages.RemoveDelivery{}
 		}),
-		actor.NewMutation(SetDelivery, func() *messages.SetDelivery {
+		actor.NewMutation(cart.SetDelivery, func() *messages.SetDelivery {
 			return &messages.SetDelivery{}
 		}),
-		actor.NewMutation(SetPickupPoint, func() *messages.SetPickupPoint {
+		actor.NewMutation(cart.SetPickupPoint, func() *messages.SetPickupPoint {
 			return &messages.SetPickupPoint{}
 		}),
-		actor.NewMutation(ClearCart, func() *messages.ClearCartRequest {
+		actor.NewMutation(cart.ClearCart, func() *messages.ClearCartRequest {
 			return &messages.ClearCartRequest{}
 		}),
-		actor.NewMutation(AddVoucher, func() *messages.AddVoucher {
+		actor.NewMutation(cart.AddVoucher, func() *messages.AddVoucher {
 			return &messages.AddVoucher{}
 		}),
-		actor.NewMutation(RemoveVoucher, func() *messages.RemoveVoucher {
+		actor.NewMutation(cart.RemoveVoucher, func() *messages.RemoveVoucher {
 			return &messages.RemoveVoucher{}
 		}),
 	)
-	diskStorage := actor.NewDiskStorage[CartGrain]("data", reg)
-	poolConfig := actor.GrainPoolConfig[CartGrain]{
+	diskStorage := actor.NewDiskStorage[cart.CartGrain]("data", reg)
+	poolConfig := actor.GrainPoolConfig[cart.CartGrain]{
 		MutationRegistry: reg,
 		Storage:          diskStorage,
-		Spawn: func(id uint64) (actor.Grain[CartGrain], error) {
+		Spawn: func(id uint64) (actor.Grain[cart.CartGrain], error) {
 			grainSpawns.Inc()
-			ret := &CartGrain{
-				lastItemId:     0,
-				lastDeliveryId: 0,
-				Deliveries:     []*CartDelivery{},
-				Id:             CartId(id),
-				Items:          []*CartItem{},
-				TotalPrice:     NewPrice(),
-			}
+			ret := cart.NewCartGrain(id, time.Now())
 			// Set baseline lastChange at spawn; replay may update it to last event timestamp.
-			ret.lastChange = time.Now()
-			ret.lastAccess = time.Now()
 
 			err := diskStorage.LoadEvents(id, ret)
 
@@ -185,7 +177,7 @@ func main() {
 	amqpListener.DefineTopics()
 	pool.AddListener(amqpListener)
 
-	grpcSrv, err := actor.NewControlServer[*CartGrain](controlPlaneConfig, pool)
+	grpcSrv, err := actor.NewControlServer[*cart.CartGrain](controlPlaneConfig, pool)
 	if err != nil {
 		log.Fatalf("Error starting control plane gRPC server: %v\n", err)
 	}
@@ -282,14 +274,14 @@ func main() {
 				w.Write([]byte("no cart id to checkout is empty"))
 				return
 			}
-			parsed, ok := ParseCartId(cookie.Value)
+			parsed, ok := cart.ParseCartId(cookie.Value)
 			if !ok {
 				w.WriteHeader(http.StatusBadRequest)
 				w.Write([]byte("invalid cart id format"))
 				return
 			}
 			cartId := parsed
-			syncedServer.ProxyHandler(func(w http.ResponseWriter, r *http.Request, cartId CartId) error {
+			syncedServer.ProxyHandler(func(w http.ResponseWriter, r *http.Request, cartId cart.CartId) error {
 				order, err = syncedServer.CreateOrUpdateCheckout(r.Host, cartId)
 				if err != nil {
 					return err
@@ -443,7 +435,7 @@ func triggerOrderCompleted(syncedServer *PoolServer, order *CheckoutOrder) error
 		OrderId: order.ID,
 		Status:  order.Status,
 	}
-	cid, ok := ParseCartId(order.MerchantReference1)
+	cid, ok := cart.ParseCartId(order.MerchantReference1)
 	if !ok {
 		return fmt.Errorf("invalid cart id in order reference: %s", order.MerchantReference1)
 	}