refactor(cqrs): use standard message in commands

Author: bastean

internal/app/server/handler/user/create.go

@@ -7,22 +7,26 @@ import (
 
 	"github.com/bastean/codexgo/v4/internal/app/server/service/errs"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/reply"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
 )
 
 func Create(c *gin.Context) {
-	command := new(user.CreateCommand)
+	attributes := new(user.CreateCommandAttributes)
 
-	err := c.BindJSON(command)
+	err := c.BindJSON(attributes)
 
 	if err != nil {
 		errs.AbortByErr(c, errs.BindingJSON(err, "Create"))
 		return
 	}
 
-	err = communication.CommandBus.Dispatch(command)
+	err = command.Bus.Dispatch(command.New(
+		user.CreateCommandKey,
+		attributes,
+		new(user.CreateCommandMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErr(c, errors.BubbleUp(err, "Create"))

internal/app/server/handler/user/delete.go

@@ -10,7 +10,7 @@ import (
 	"github.com/bastean/codexgo/v4/internal/app/server/service/format"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/key"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/reply"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
 )
@@ -23,18 +23,22 @@ func Delete(c *gin.Context) {
 		return
 	}
 
-	command := new(user.DeleteCommand)
+	attributes := new(user.DeleteCommandAttributes)
 
-	err := c.BindJSON(command)
+	err := c.BindJSON(attributes)
 
 	if err != nil {
 		errs.AbortByErr(c, errs.BindingJSON(err, "Delete"))
 		return
 	}
 
-	command.Id = format.ToString(id)
+	attributes.Id = format.ToString(id)
 
-	err = communication.CommandBus.Dispatch(command)
+	err = command.Bus.Dispatch(command.New(
+		user.DeleteCommandKey,
+		attributes,
+		new(user.DeleteCommandMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErr(c, errors.BubbleUp(err, "Delete"))

internal/app/server/handler/user/update.go

@@ -9,7 +9,7 @@ import (
 	"github.com/bastean/codexgo/v4/internal/app/server/service/format"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/key"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/reply"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
 )
@@ -22,18 +22,22 @@ func Update(c *gin.Context) {
 		return
 	}
 
-	command := new(user.UpdateCommand)
+	attributes := new(user.UpdateCommandAttributes)
 
-	err := c.BindJSON(command)
+	err := c.BindJSON(attributes)
 
 	if err != nil {
 		errs.AbortByErr(c, errs.BindingJSON(err, "Update"))
 		return
 	}
 
-	command.Id = format.ToString(id)
+	attributes.Id = format.ToString(id)
 
-	err = communication.CommandBus.Dispatch(command)
+	err = command.Bus.Dispatch(command.New(
+		user.UpdateCommandKey,
+		attributes,
+		new(user.UpdateCommandMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErr(c, errors.BubbleUp(err, "Update"))

internal/app/server/handler/user/verify.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/bastean/codexgo/v4/internal/app/server/service/errs"
 	"github.com/bastean/codexgo/v4/internal/app/server/service/key"
-	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
+	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/module/user"
 )
@@ -20,11 +20,15 @@ func Verify(c *gin.Context) {
 		return
 	}
 
-	command := new(user.VerifyCommand)
+	attributes := new(user.VerifyCommandAttributes)
 
-	command.Id = id
+	attributes.Id = id
 
-	err := communication.CommandBus.Dispatch(command)
+	err := command.Bus.Dispatch(command.New(
+		user.VerifyCommandKey,
+		attributes,
+		new(user.VerifyCommandMeta),
+	))
 
 	if err != nil {
 		errs.AbortByErr(c, errors.BubbleUp(err, "Verify"))

internal/pkg/service/command/command.go

@@ -0,0 +1,24 @@
+package command
+
+import (
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/commands"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/infrastructure/communications/memory"
+)
+
+var (
+	Bus commands.Bus
+)
+
+var (
+	NewBus = memory.NewCommandBus
+)
+
+type (
+	Mapper  = memory.CommandMapper
+	Handler = commands.Handler
+)
+
+func New(key commands.Key, attributes, meta any) *commands.Command {
+	return messages.New[commands.Command](key, attributes, meta)
+}

internal/pkg/service/communication/communication.go

@@ -19,10 +19,9 @@ var Service = &struct {
 }
 
 var (
-	err        error
-	RabbitMQ   *rabbitmq.RabbitMQ
-	CommandBus *memory.CommandBus
-	QueryBus   *memory.QueryBus
+	err      error
+	RabbitMQ *rabbitmq.RabbitMQ
+	QueryBus *memory.QueryBus
 )
 
 func Up() error {

internal/pkg/service/communication/memory/command.go

@@ -1,6 +1,7 @@
 package module
 
 import (
+	"github.com/bastean/codexgo/v4/internal/pkg/service/command"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/communication"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/communication/memory"
 	"github.com/bastean/codexgo/v4/internal/pkg/service/errors"
@@ -39,11 +40,11 @@ func Start() error {
 
 	log.Starting(communication.Service.InMemory)
 
-	communication.CommandBus, err = memory.NewCommandBus([]memory.CommandHandler{
-		user.Create,
-		user.Update,
-		user.Delete,
-		user.Verify,
+	command.Bus, err = command.NewBus(command.Mapper{
+		user.CreateCommandKey: user.CreateHandler,
+		user.UpdateCommandKey: user.UpdateHandler,
+		user.DeleteCommandKey: user.DeleteHandler,
+		user.VerifyCommandKey: user.VerifyHandler,
 	})
 
 	if err != nil {
@@ -52,8 +53,8 @@ func Start() error {
 	}
 
 	communication.QueryBus, err = memory.NewQueryBus([]memory.QueryHandler{
-		user.Read,
-		user.Login,
+		user.ReadHandler,
+		user.LoginHandler,
 	})
 
 	if err != nil {

internal/pkg/service/module/module.go

@@ -9,11 +9,34 @@ import (
 	"github.com/bastean/codexgo/v4/pkg/context/user/application/verify"
 )
 
+var (
+	CreateHandler *create.Handler
+	ReadHandler   *read.Handler
+	UpdateHandler *update.Handler
+	DeleteHandler *delete.Handler
+	VerifyHandler *verify.Handler
+	LoginHandler  *login.Handler
+)
+
+var (
+	CreateCommandKey = create.CommandKey
+	UpdateCommandKey = update.CommandKey
+	DeleteCommandKey = delete.CommandKey
+	VerifyCommandKey = verify.CommandKey
+)
+
 type (
-	CreateCommand = create.Command
-	UpdateCommand = update.Command
-	DeleteCommand = delete.Command
-	VerifyCommand = verify.Command
+	CreateCommandAttributes = create.CommandAttributes
+	UpdateCommandAttributes = update.CommandAttributes
+	DeleteCommandAttributes = delete.CommandAttributes
+	VerifyCommandAttributes = verify.CommandAttributes
+)
+
+type (
+	CreateCommandMeta = create.CommandMeta
+	UpdateCommandMeta = update.CommandMeta
+	DeleteCommandMeta = delete.CommandMeta
+	VerifyCommandMeta = verify.CommandMeta
 )
 
 type (
@@ -25,12 +48,3 @@ type (
 	ReadResponse  = read.Response
 	LoginResponse = login.Response
 )
-
-var (
-	Create *create.Handler
-	Read   *read.Handler
-	Update *update.Handler
-	Delete *delete.Handler
-	Verify *verify.Handler
-	Login  *login.Handler
-)

internal/pkg/service/module/user/handler.go

@@ -13,40 +13,40 @@ import (
 )
 
 func Start(repository repository.Repository, bus events.Bus, hashing hashing.Hashing) {
-	Create = &create.Handler{
+	CreateHandler = &create.Handler{
 		Create: &create.Create{
 			Repository: repository,
 		},
 		Bus: bus,
 	}
 
-	Read = &read.Handler{
+	ReadHandler = &read.Handler{
 		Read: &read.Read{
 			Repository: repository,
 		},
 	}
 
-	Update = &update.Handler{
+	UpdateHandler = &update.Handler{
 		Update: &update.Update{
 			Repository: repository,
 			Hashing:    hashing,
 		},
 	}
 
-	Delete = &delete.Handler{
+	DeleteHandler = &delete.Handler{
 		Delete: &delete.Delete{
 			Repository: repository,
 			Hashing:    hashing,
 		},
 	}
 
-	Verify = &verify.Handler{
+	VerifyHandler = &verify.Handler{
 		Verify: &verify.Verify{
 			Repository: repository,
 		},
 	}
 
-	Login = &login.Handler{
+	LoginHandler = &login.Handler{
 		Login: &login.Login{
 			Repository: repository,
 			Hashing:    hashing,