From 3942ea911ed05712a5b4b0ed02fbe1e8517cddc1 Mon Sep 17 00:00:00 2001 From: matst80 Date: Wed, 15 Oct 2025 22:27:36 +0200 Subject: [PATCH] clean --- cmd/backoffice/main.go | 21 +------------- cmd/cart/main.go | 37 +----------------------- pkg/cart/cart-mutation-helper.go | 48 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 56 deletions(-) create mode 100644 pkg/cart/cart-mutation-helper.go diff --git a/cmd/backoffice/main.go b/cmd/backoffice/main.go index df3f33d..1b1c03b 100644 --- a/cmd/backoffice/main.go +++ b/cmd/backoffice/main.go @@ -11,7 +11,6 @@ import ( actor "git.tornberg.me/go-cart-actor/pkg/actor" "git.tornberg.me/go-cart-actor/pkg/cart" - messages "git.tornberg.me/go-cart-actor/pkg/messages" "github.com/matst80/slask-finder/pkg/messaging" amqp "github.com/rabbitmq/amqp091-go" ) @@ -35,24 +34,6 @@ var cartFileRe = regexp.MustCompile(`^(\d+)\.events\.log$`) var globalDisk *actor.DiskStorage[cart.CartGrain] -func buildRegistry() actor.MutationRegistry { - reg := actor.NewMutationRegistry() - reg.RegisterMutations( - actor.NewMutation(cart.AddItem, func() *messages.AddItem { return &messages.AddItem{} }), - actor.NewMutation(cart.ChangeQuantity, func() *messages.ChangeQuantity { return &messages.ChangeQuantity{} }), - actor.NewMutation(cart.RemoveItem, func() *messages.RemoveItem { return &messages.RemoveItem{} }), - actor.NewMutation(cart.InitializeCheckout, func() *messages.InitializeCheckout { return &messages.InitializeCheckout{} }), - actor.NewMutation(cart.OrderCreated, func() *messages.OrderCreated { return &messages.OrderCreated{} }), - actor.NewMutation(cart.RemoveDelivery, func() *messages.RemoveDelivery { return &messages.RemoveDelivery{} }), - actor.NewMutation(cart.SetDelivery, func() *messages.SetDelivery { return &messages.SetDelivery{} }), - actor.NewMutation(cart.SetPickupPoint, func() *messages.SetPickupPoint { return &messages.SetPickupPoint{} }), - actor.NewMutation(cart.ClearCart, func() *messages.ClearCartRequest { return &messages.ClearCartRequest{} }), - actor.NewMutation(cart.AddVoucher, func() *messages.AddVoucher { return &messages.AddVoucher{} }), - actor.NewMutation(cart.RemoveVoucher, func() *messages.RemoveVoucher { return &messages.RemoveVoucher{} }), - ) - return reg -} - func startMutationConsumer(ctx context.Context, conn *amqp.Connection, hub *Hub) error { ch, err := conn.Channel() if err != nil { @@ -103,7 +84,7 @@ func main() { _ = os.MkdirAll(dataDir, 0755) - reg := buildRegistry() + reg := cart.NewCartMultationRegistry() globalDisk = actor.NewDiskStorage[cart.CartGrain](dataDir, reg) fs := NewFileServer(dataDir) diff --git a/cmd/cart/main.go b/cmd/cart/main.go index 3179b3e..cd6d558 100644 --- a/cmd/cart/main.go +++ b/cmd/cart/main.go @@ -103,42 +103,7 @@ func main() { controlPlaneConfig := actor.DefaultServerConfig() - reg := actor.NewMutationRegistry() - reg.RegisterMutations( - actor.NewMutation(cart.AddItem, func() *messages.AddItem { - return &messages.AddItem{} - }), - actor.NewMutation(cart.ChangeQuantity, func() *messages.ChangeQuantity { - return &messages.ChangeQuantity{} - }), - actor.NewMutation(cart.RemoveItem, func() *messages.RemoveItem { - return &messages.RemoveItem{} - }), - actor.NewMutation(cart.InitializeCheckout, func() *messages.InitializeCheckout { - return &messages.InitializeCheckout{} - }), - actor.NewMutation(cart.OrderCreated, func() *messages.OrderCreated { - return &messages.OrderCreated{} - }), - actor.NewMutation(cart.RemoveDelivery, func() *messages.RemoveDelivery { - return &messages.RemoveDelivery{} - }), - actor.NewMutation(cart.SetDelivery, func() *messages.SetDelivery { - return &messages.SetDelivery{} - }), - actor.NewMutation(cart.SetPickupPoint, func() *messages.SetPickupPoint { - return &messages.SetPickupPoint{} - }), - actor.NewMutation(cart.ClearCart, func() *messages.ClearCartRequest { - return &messages.ClearCartRequest{} - }), - actor.NewMutation(cart.AddVoucher, func() *messages.AddVoucher { - return &messages.AddVoucher{} - }), - actor.NewMutation(cart.RemoveVoucher, func() *messages.RemoveVoucher { - return &messages.RemoveVoucher{} - }), - ) + reg := cart.NewCartMultationRegistry() diskStorage := actor.NewDiskStorage[cart.CartGrain]("data", reg) poolConfig := actor.GrainPoolConfig[cart.CartGrain]{ MutationRegistry: reg, diff --git a/pkg/cart/cart-mutation-helper.go b/pkg/cart/cart-mutation-helper.go new file mode 100644 index 0000000..891f9e1 --- /dev/null +++ b/pkg/cart/cart-mutation-helper.go @@ -0,0 +1,48 @@ +package cart + +import ( + "git.tornberg.me/go-cart-actor/pkg/actor" + messages "git.tornberg.me/go-cart-actor/pkg/messages" +) + +func NewCartMultationRegistry() actor.MutationRegistry { + + reg := actor.NewMutationRegistry() + reg.RegisterMutations( + actor.NewMutation(AddItem, func() *messages.AddItem { + return &messages.AddItem{} + }), + actor.NewMutation(ChangeQuantity, func() *messages.ChangeQuantity { + return &messages.ChangeQuantity{} + }), + actor.NewMutation(RemoveItem, func() *messages.RemoveItem { + return &messages.RemoveItem{} + }), + actor.NewMutation(InitializeCheckout, func() *messages.InitializeCheckout { + return &messages.InitializeCheckout{} + }), + actor.NewMutation(OrderCreated, func() *messages.OrderCreated { + return &messages.OrderCreated{} + }), + actor.NewMutation(RemoveDelivery, func() *messages.RemoveDelivery { + return &messages.RemoveDelivery{} + }), + actor.NewMutation(SetDelivery, func() *messages.SetDelivery { + return &messages.SetDelivery{} + }), + actor.NewMutation(SetPickupPoint, func() *messages.SetPickupPoint { + return &messages.SetPickupPoint{} + }), + actor.NewMutation(ClearCart, func() *messages.ClearCartRequest { + return &messages.ClearCartRequest{} + }), + actor.NewMutation(AddVoucher, func() *messages.AddVoucher { + return &messages.AddVoucher{} + }), + actor.NewMutation(RemoveVoucher, func() *messages.RemoveVoucher { + return &messages.RemoveVoucher{} + }), + ) + return reg + +}