twhelp/core-old
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 10 Projects Releases Wiki Activity

refactor: rename domain.UserError -> domain.Error
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Dawid Wysokiński 2022-12-31 11:00:30 +01:00
parent e9c0cb716e
commit c545ebd7d7
Signed by: Kichiyaki
GPG Key ID: B5445E357FB8B892
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/domain/error.go
View File

@ -32,7 +32,7 @@ func (e ErrorCode) String() string {
}
}
type UserError interface {
type Error interface {
error
UserError() string
Code() ErrorCode

8
internal/domain/error_test.go
View File

@ -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())

2
internal/domain/player_test.go
View File

@ -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())

2
internal/domain/server_test.go
View File

@ -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())

2
internal/domain/tribe_test.go
View File

@ -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())

2
internal/domain/version_test.go
View File

@ -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())

2
internal/domain/village_test.go
View File

@ -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())

2
internal/router/rest/rest.go
View File

@ -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}
}