refactor(context): remove message type aliases

Author: bastean

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

@@ -19,6 +19,6 @@ type (
 	Handler = commands.Handler
 )
 
-func New(key commands.Key, attributes, meta any) *commands.Command {
-	return messages.New[commands.Command](key, attributes, meta)
+func New(key messages.Key, attributes, meta any) *messages.Message {
+	return messages.New(key, attributes, meta)
 }

internal/pkg/service/communication/query/query.go

@@ -19,6 +19,6 @@ type (
 	Handler = queries.Handler
 )
 
-func New(key queries.Key, attributes, meta any) *queries.Query {
-	return messages.New[queries.Query](key, attributes, meta)
+func New(key messages.Key, attributes, meta any) *messages.Message {
+	return messages.New(key, attributes, meta)
 }

pkg/context/notification/application/confirmation/consumer.go

@@ -3,15 +3,15 @@ package confirmation
 import (
 	"github.com/bastean/codexgo/v4/pkg/context/notification/domain/cases"
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/errors"
-	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/events"
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/events/user"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
 )
 
 type Consumer struct {
 	cases.Confirmation
 }
 
-func (c *Consumer) On(event *events.Event) error {
+func (c *Consumer) On(event *messages.Message) error {
 	account, ok := event.Attributes.(*user.CreatedSucceededAttributes)
 
 	if !ok {

pkg/context/notification/application/confirmation/consumer_test.go

@@ -33,7 +33,7 @@ func (s *ConfirmationTestSuite) SetupTest() {
 }
 
 func (s *ConfirmationTestSuite) TestConsumer() {
-	event := messages.RandomWithAttributes[events.Event](new(user.CreatedSucceededAttributes), true)
+	event := messages.RandomWithAttributes(new(user.CreatedSucceededAttributes), true)
 
 	s.transfer.Mock.On("Submit", event.Attributes)
 

pkg/context/shared/domain/aggregates/root.go

@@ -2,13 +2,13 @@ package aggregates
 
 import (
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/errors"
-	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/events"
+	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/services"
 )
 
 type Root struct {
 	Created, Updated *Time
-	Events           []*events.Event
+	Events           []*messages.Message
 }
 
 func (r *Root) CreationStamp() error {
@@ -26,7 +26,6 @@ func (r *Root) CreationStamp() error {
 	}
 
 	r.Created = created
-
 	r.Updated = created
 
 	return nil
@@ -44,20 +43,20 @@ func (r *Root) UpdatedStamp() error {
 	return nil
 }
 
-func (r *Root) Record(events ...*events.Event) {
+func (r *Root) Record(events ...*messages.Message) {
 	r.Events = append(r.Events, events...)
 }
 
-func (r *Root) Pull() []*events.Event {
+func (r *Root) Pull() []*messages.Message {
 	recorded := r.Events
 
-	r.Events = []*events.Event{}
+	r.Events = []*messages.Message{}
 
 	return recorded
 }
 
 func NewRoot() (*Root, error) {
 	return &Root{
-		Events: []*events.Event{},
+		Events: []*messages.Message{},
 	}, nil
 }

pkg/context/shared/domain/commands/command.go

@@ -4,17 +4,11 @@ import (
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
 )
 
-type (
-	Key = messages.Key
-)
-
-type Command messages.Message
-
 type Handler interface {
-	Handle(*Command) error
+	Handle(*messages.Message) error
 }
 
 type Bus interface {
-	Register(Key, Handler) error
-	Dispatch(*Command) error
+	Register(messages.Key, Handler) error
+	Dispatch(*messages.Message) error
 }

pkg/context/shared/domain/events/event.go

@@ -4,18 +4,11 @@ import (
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
 )
 
-type (
-	Key       = messages.Key
-	Recipient = messages.Recipient
-)
-
-type Event messages.Message
-
 type Consumer interface {
-	On(*Event) error
+	On(*messages.Message) error
 }
 
 type Bus interface {
-	Subscribe(Key, Consumer) error
-	Publish(*Event) error
+	Subscribe(messages.Key, Consumer) error
+	Publish(*messages.Message) error
 }

pkg/context/shared/domain/messages/key_test.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/events"
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/messages"
 )
 
@@ -24,7 +23,7 @@ func (s *KeyTestSuite) TestWithValidValue() {
 		Status:       messages.Status.Succeeded,
 	}
 
-	expected := events.Key("codexgo.user.1.event.user.created.succeeded")
+	expected := messages.Key("codexgo.user.1.event.user.created.succeeded")
 
 	actual := messages.NewKey(components)
 

pkg/context/shared/domain/messages/message.go

@@ -1,15 +1,15 @@
 package messages
 
-type Message = struct {
+type Message struct {
 	ID         string
 	OccurredOn string
 	Key        Key
 	Attributes any
 	Meta       any
 }
 
-func New[T ~Message](key Key, attributes, meta any) *T {
-	return &T{
+func New(key Key, attributes, meta any) *Message {
+	return &Message{
 		Key:        key,
 		Attributes: attributes,
 		Meta:       meta,

pkg/context/shared/domain/messages/message.mother.go

@@ -5,8 +5,8 @@ import (
 	"github.com/bastean/codexgo/v4/pkg/context/shared/domain/services"
 )
 
-func Random[T ~Message]() *T {
-	return &T{
+func Random() *Message {
+	return &Message{
 		ID:         services.Create.UUID(),
 		OccurredOn: services.Create.TimeZoneFull(),
 		Key:        Key(services.Create.LoremIpsumWord()),
@@ -15,8 +15,8 @@ func Random[T ~Message]() *T {
 	}
 }
 
-func RandomWithKey[T ~Message](key Key) *T {
-	return &T{
+func RandomWithKey(key Key) *Message {
+	return &Message{
 		ID:         services.Create.UUID(),
 		OccurredOn: services.Create.TimeZoneFull(),
 		Key:        key,
@@ -25,7 +25,7 @@ func RandomWithKey[T ~Message](key Key) *T {
 	}
 }
 
-func RandomWithAttributes[T ~Message](attributes any, shouldRandomize bool) *T {
+func RandomWithAttributes(attributes any, shouldRandomize bool) *Message {
 	if shouldRandomize {
 		err := services.Create.Struct(attributes)
 
@@ -34,7 +34,7 @@ func RandomWithAttributes[T ~Message](attributes any, shouldRandomize bool) *T {
 		}
 	}
 
-	return &T{
+	return &Message{
 		ID:         services.Create.UUID(),
 		OccurredOn: services.Create.TimeZoneFull(),
 		Key:        Key(services.Create.LoremIpsumWord()),