diff --git a/internal/domain/error.go b/internal/domain/error.go index 3fcfc89..0941fe7 100644 --- a/internal/domain/error.go +++ b/internal/domain/error.go @@ -32,7 +32,7 @@ func (e ErrorCode) String() string { } } -type UserError interface { +type Error interface { error UserError() string Code() ErrorCode diff --git a/internal/domain/error_test.go b/internal/domain/error_test.go index a365bff..8f31ce3 100644 --- a/internal/domain/error_test.go +++ b/internal/domain/error_test.go @@ -26,7 +26,7 @@ func TestValidationError(t *testing.T) { Min: 25, }, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, fmt.Sprintf("%s: %s", err.Field, err.Err.Error()), err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.ErrorIs(t, err, err.Err) @@ -39,7 +39,7 @@ func TestMinError(t *testing.T) { err := domain.MinError{ Min: 25, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "must be no less than 25", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeValidationError, err.Code()) @@ -51,7 +51,7 @@ func TestMaxError(t *testing.T) { err := domain.MaxError{ Max: 25, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "must be no greater than 25", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeValidationError, err.Code()) @@ -63,7 +63,7 @@ func TestMaxLengthError(t *testing.T) { err := domain.MaxLengthError{ Max: 25, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "the length must be no more than 25", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeValidationError, err.Code()) diff --git a/internal/domain/player_test.go b/internal/domain/player_test.go index dc8f00a..cf0704a 100644 --- a/internal/domain/player_test.go +++ b/internal/domain/player_test.go @@ -75,7 +75,7 @@ func TestPlayerNotFoundError(t *testing.T) { err := domain.PlayerNotFoundError{ ID: 1234, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "player (id=1234) not found", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeEntityNotFound, err.Code()) diff --git a/internal/domain/server_test.go b/internal/domain/server_test.go index ddd1009..43a3837 100644 --- a/internal/domain/server_test.go +++ b/internal/domain/server_test.go @@ -146,7 +146,7 @@ func TestServerNotFoundError(t *testing.T) { err := domain.ServerNotFoundError{ Key: "pl151", } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "server (key=pl151) not found", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeEntityNotFound, err.Code()) diff --git a/internal/domain/tribe_test.go b/internal/domain/tribe_test.go index 881e847..ef8385e 100644 --- a/internal/domain/tribe_test.go +++ b/internal/domain/tribe_test.go @@ -76,7 +76,7 @@ func TestTribeNotFoundError(t *testing.T) { err := domain.TribeNotFoundError{ ID: 1234, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "tribe (id=1234) not found", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeEntityNotFound, err.Code()) diff --git a/internal/domain/version_test.go b/internal/domain/version_test.go index 70c9274..69a84c5 100644 --- a/internal/domain/version_test.go +++ b/internal/domain/version_test.go @@ -13,7 +13,7 @@ func TestVersionNotFoundError(t *testing.T) { err := domain.VersionNotFoundError{ VerCode: "pl", } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "version (code=pl) not found", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeEntityNotFound, err.Code()) diff --git a/internal/domain/village_test.go b/internal/domain/village_test.go index 5bb661a..6c56b10 100644 --- a/internal/domain/village_test.go +++ b/internal/domain/village_test.go @@ -46,7 +46,7 @@ func TestVillageNotFoundError(t *testing.T) { err := domain.VillageNotFoundError{ ID: 1234, } - var _ domain.UserError = err + var _ domain.Error = err assert.Equal(t, "village (id=1234) not found", err.Error()) assert.Equal(t, err.Error(), err.UserError()) assert.Equal(t, domain.ErrorCodeEntityNotFound, err.Code()) diff --git a/internal/router/rest/rest.go b/internal/router/rest/rest.go index 9e8951c..ef82b82 100644 --- a/internal/router/rest/rest.go +++ b/internal/router/rest/rest.go @@ -195,7 +195,7 @@ func (e internalServerError) Unwrap() error { } func renderErr(w http.ResponseWriter, err error) { - var userError domain.UserError + var userError domain.Error if !errors.As(err, &userError) { userError = internalServerError{err: err} }