Skip to content

Commit

Permalink
refactor(context): remove redundant details from type names
Browse files Browse the repository at this point in the history
  • Loading branch information
bastean committed Jun 17, 2024
1 parent c459caa commit 27a666a
Show file tree
Hide file tree
Showing 23 changed files with 123 additions and 123 deletions.
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (

type CreateCommand = create.Command

func NewCreate(repository model.Repository, broker models.Broker) *create.CommandHandler {
useCase := &create.Create{
func NewCreate(repository model.Repository, broker models.Broker) *create.Handler {
usecase := &create.Create{
Repository: repository,
}

return &create.CommandHandler{
UseCase: useCase,
return &create.Handler{
UseCase: usecase,
Broker: broker,
}
}
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (

type DeleteCommand = delete.Command

func NewDelete(repository model.Repository, hashing model.Hashing) *delete.CommandHandler {
useCase := &delete.Delete{
func NewDelete(repository model.Repository, hashing model.Hashing) *delete.Handler {
usecase := &delete.Delete{
Repository: repository,
Hashing: hashing,
}

return &delete.CommandHandler{
UseCase: useCase,
return &delete.Handler{
UseCase: usecase,
}
}
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (

type LoginQuery = login.Query

func NewLogin(repository model.Repository, hashing model.Hashing) *login.QueryHandler {
useCase := &login.Login{
func NewLogin(repository model.Repository, hashing model.Hashing) *login.Handler {
usecase := &login.Login{
Repository: repository,
Hashing: hashing,
}

return &login.QueryHandler{
UseCase: useCase,
return &login.Handler{
UseCase: usecase,
}
}
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/read.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ type ReadQuery = read.Query

type ReadResponse = read.Response

func NewRead(repository model.Repository) *read.QueryHandler {
useCase := &read.Read{
func NewRead(repository model.Repository) *read.Handler {
usecase := &read.Read{
Repository: repository,
}

return &read.QueryHandler{
UseCase: useCase,
return &read.Handler{
UseCase: usecase,
}
}
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (

type UpdateCommand = update.Command

func NewUpdate(repository model.Repository, hashing model.Hashing) *update.CommandHandler {
useCase := &update.Update{
func NewUpdate(repository model.Repository, hashing model.Hashing) *update.Handler {
usecase := &update.Update{
Repository: repository,
Hashing: hashing,
}

return &update.CommandHandler{
UseCase: useCase,
return &update.Handler{
UseCase: usecase,
}
}
12 changes: 6 additions & 6 deletions pkg/cmd/server/service/user/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (
"github.com/bastean/codexgo/pkg/context/user/domain/model"
)

var Create *create.CommandHandler
var Create *create.Handler

var Read *read.QueryHandler
var Read *read.Handler

var Update *update.CommandHandler
var Update *update.Handler

var Delete *delete.CommandHandler
var Delete *delete.Handler

var Verify *verify.CommandHandler
var Verify *verify.Handler

var Login *login.QueryHandler
var Login *login.Handler

func Init(repository model.Repository, broker models.Broker, hashing model.Hashing) {
Create = NewCreate(repository, broker)
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/server/service/user/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (

type VerifyCommand = verify.Command

func NewVerify(repository model.Repository) *verify.CommandHandler {
useCase := &verify.Verify{
func NewVerify(repository model.Repository) *verify.Handler {
usecase := &verify.Verify{
Repository: repository,
}

return &verify.CommandHandler{
UseCase: useCase,
return &verify.Handler{
UseCase: usecase,
}
}
6 changes: 3 additions & 3 deletions pkg/context/shared/infrastructure/communications/rabbitmq.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ func (rmq *RabbitMQ) AddQueueMessageBind(queue *queues.Queue, bindingKeys []stri
Where: "AddQueueMessageBind",
What: "failure to bind a queue",
Why: errors.Meta{
"Queue": queue.Name,
"BindingKey": bindingKey,
"Exchange": rmq.exchange,
"Queue": queue.Name,
"Binding Key": bindingKey,
"Exchange": rmq.exchange,
},
Who: err,
})
Expand Down
4 changes: 2 additions & 2 deletions pkg/context/user/application/create/command.handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/bastean/codexgo/pkg/context/user/domain/aggregate"
)

type CommandHandler struct {
type Handler struct {
models.UseCase[*aggregate.User, types.Empty]
models.Broker
}

func (handler *CommandHandler) Handle(command *Command) error {
func (handler *Handler) Handle(command *Command) error {
user, err := aggregate.NewUser(&aggregate.UserPrimitive{
Id: command.Id,
Email: command.Email,
Expand Down
18 changes: 9 additions & 9 deletions pkg/context/user/application/create/command.handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@ import (
"github.com/stretchr/testify/suite"
)

type UserCreateTestSuite struct {
type CreateHandlerTestSuite struct {
suite.Suite
sut models.CommandHandler[*create.Command]
useCase models.UseCase[*aggregate.User, types.Empty]
usecase models.UseCase[*aggregate.User, types.Empty]
repository *persistence.RepositoryMock
broker *communications.BrokerMock
}

func (suite *UserCreateTestSuite) SetupTest() {
func (suite *CreateHandlerTestSuite) SetupTest() {
suite.broker = new(communications.BrokerMock)

suite.repository = new(persistence.RepositoryMock)

suite.useCase = &create.Create{
suite.usecase = &create.Create{
Repository: suite.repository,
}

suite.sut = &create.CommandHandler{
UseCase: suite.useCase,
suite.sut = &create.Handler{
UseCase: suite.usecase,
Broker: suite.broker,
}
}

func (suite *UserCreateTestSuite) TestCreate() {
func (suite *CreateHandlerTestSuite) TestCreate() {
command := create.RandomCommand()

user, _ := aggregate.NewUser(&aggregate.UserPrimitive{
Expand All @@ -58,6 +58,6 @@ func (suite *UserCreateTestSuite) TestCreate() {
suite.broker.AssertExpectations(suite.T())
}

func TestUnitUserCreateSuite(t *testing.T) {
suite.Run(t, new(UserCreateTestSuite))
func TestUnitCreateHandlerSuite(t *testing.T) {
suite.Run(t, new(CreateHandlerTestSuite))
}
16 changes: 8 additions & 8 deletions pkg/context/user/application/created/created.consumer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import (
"github.com/stretchr/testify/suite"
)

type UserCreatedTestSuite struct {
type CreatedConsumerTestSuite struct {
suite.Suite
sut models.Consumer
useCase models.UseCase[*event.CreatedSucceeded, types.Empty]
usecase models.UseCase[*event.CreatedSucceeded, types.Empty]
transport *communication.TransportMock
queues []*queues.Queue
}

func (suite *UserCreatedTestSuite) SetupTest() {
func (suite *CreatedConsumerTestSuite) SetupTest() {
queueName := queues.NewQueueName(&queues.QueueName{
Module: "queue",
Action: "assert",
Expand All @@ -34,17 +34,17 @@ func (suite *UserCreatedTestSuite) SetupTest() {

suite.transport = new(communication.TransportMock)

suite.useCase = &created.Created{
suite.usecase = &created.Created{
Transport: suite.transport,
}

suite.sut = &created.Consumer{
UseCase: suite.useCase,
UseCase: suite.usecase,
Queues: suite.queues,
}
}

func (suite *UserCreatedTestSuite) TestCreatedSucceeded() {
func (suite *CreatedConsumerTestSuite) TestCreatedSucceeded() {
message := event.RandomCreatedSucceeded()

user := new(event.CreatedSucceeded)
Expand All @@ -60,6 +60,6 @@ func (suite *UserCreatedTestSuite) TestCreatedSucceeded() {
suite.transport.AssertExpectations(suite.T())
}

func TestUnitUserCreatedSuite(t *testing.T) {
suite.Run(t, new(UserCreatedTestSuite))
func TestUnitCreatedConsumerSuite(t *testing.T) {
suite.Run(t, new(CreatedConsumerTestSuite))
}
4 changes: 2 additions & 2 deletions pkg/context/user/application/delete/command.handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ type Input struct {
Id, Password models.ValueObject[string]
}

type CommandHandler struct {
type Handler struct {
models.UseCase[*Input, types.Empty]
}

func (handler *CommandHandler) Handle(command *Command) error {
func (handler *Handler) Handle(command *Command) error {
id, errId := valueobj.NewId(command.Id)
password, errPassword := valueobj.NewPassword(command.Password)

Expand Down
18 changes: 9 additions & 9 deletions pkg/context/user/application/delete/command.handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@ import (
"github.com/stretchr/testify/suite"
)

type UserDeleteTestSuite struct {
type DeleteHandlerTestSuite struct {
suite.Suite
sut models.CommandHandler[*delete.Command]
useCase models.UseCase[*delete.Input, types.Empty]
usecase models.UseCase[*delete.Input, types.Empty]
hashing *cryptographic.HashingMock
repository *persistence.RepositoryMock
}

func (suite *UserDeleteTestSuite) SetupTest() {
func (suite *DeleteHandlerTestSuite) SetupTest() {
suite.repository = new(persistence.RepositoryMock)

suite.hashing = new(cryptographic.HashingMock)

suite.useCase = &delete.Delete{
suite.usecase = &delete.Delete{
Repository: suite.repository,
Hashing: suite.hashing,
}

suite.sut = &delete.CommandHandler{
UseCase: suite.useCase,
suite.sut = &delete.Handler{
UseCase: suite.usecase,
}
}

func (suite *UserDeleteTestSuite) TestDelete() {
func (suite *DeleteHandlerTestSuite) TestDelete() {
user := aggregate.RandomUser()

command := &delete.Command{
Expand All @@ -59,6 +59,6 @@ func (suite *UserDeleteTestSuite) TestDelete() {
suite.repository.AssertExpectations(suite.T())
}

func TestUnitUserDeleteSuite(t *testing.T) {
suite.Run(t, new(UserDeleteTestSuite))
func TestUnitDeleteHandlerSuite(t *testing.T) {
suite.Run(t, new(DeleteHandlerTestSuite))
}
4 changes: 2 additions & 2 deletions pkg/context/user/application/login/query.handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ type Input struct {
Email, Password models.ValueObject[string]
}

type QueryHandler struct {
type Handler struct {
models.UseCase[*Input, *aggregate.User]
}

func (handler *QueryHandler) Handle(query *Query) (*Response, error) {
func (handler *Handler) Handle(query *Query) (*Response, error) {
email, errEmail := valueobj.NewEmail(query.Email)
password, errPassword := valueobj.NewPassword(query.Password)

Expand Down
18 changes: 9 additions & 9 deletions pkg/context/user/application/login/query.handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@ import (
"github.com/stretchr/testify/suite"
)

type UserLoginTestSuite struct {
type LoginHandlerTestSuite struct {
suite.Suite
sut models.QueryHandler[*login.Query, *login.Response]
useCase models.UseCase[*login.Input, *aggregate.User]
usecase models.UseCase[*login.Input, *aggregate.User]
hashing *cryptographic.HashingMock
repository *persistence.RepositoryMock
}

func (suite *UserLoginTestSuite) SetupTest() {
func (suite *LoginHandlerTestSuite) SetupTest() {
suite.repository = new(persistence.RepositoryMock)

suite.hashing = new(cryptographic.HashingMock)

suite.useCase = &login.Login{
suite.usecase = &login.Login{
Repository: suite.repository,
Hashing: suite.hashing,
}

suite.sut = &login.QueryHandler{
UseCase: suite.useCase,
suite.sut = &login.Handler{
UseCase: suite.usecase,
}
}

func (suite *UserLoginTestSuite) TestLogin() {
func (suite *LoginHandlerTestSuite) TestLogin() {
user := aggregate.RandomUser()

query := &login.Query{
Expand Down Expand Up @@ -64,6 +64,6 @@ func (suite *UserLoginTestSuite) TestLogin() {
suite.EqualValues(expected, actual)
}

func TestUnitUserLoginSuite(t *testing.T) {
suite.Run(t, new(UserLoginTestSuite))
func TestUnitLoginHandlerSuite(t *testing.T) {
suite.Run(t, new(LoginHandlerTestSuite))
}
4 changes: 2 additions & 2 deletions pkg/context/user/application/read/query.handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/bastean/codexgo/pkg/context/user/domain/valueobj"
)

type QueryHandler struct {
type Handler struct {
models.UseCase[models.ValueObject[string], *aggregate.User]
}

func (handler *QueryHandler) Handle(query *Query) (*Response, error) {
func (handler *Handler) Handle(query *Query) (*Response, error) {
id, err := valueobj.NewId(query.Id)

if err != nil {
Expand Down
Loading

0 comments on commit 27a666a

Please sign in to comment.