Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NewErrors() and Improve NewError() #1728

Merged
merged 9 commits into from Jan 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 14 additions & 26 deletions app.go
Expand Up @@ -84,8 +84,8 @@ type ErrorHandler = func(*Ctx, error) error

// Error represents an error that occurred while handling a request.
type Error struct {
Code int `json:"code"`
Message string `json:"message"`
Code int `json:"code"`
balcieren marked this conversation as resolved.
Show resolved Hide resolved
Message interface{} `json:"message"`
}

// App denotes the Fiber application.
Expand Down Expand Up @@ -695,43 +695,31 @@ func (app *App) Group(prefix string, handlers ...Handler) Router {

// Error makes it compatible with the `error` interface.
func (e *Error) Error() string {
return e.Message
return fmt.Sprint(e.Message)
}

// NewError creates a new Error instance with an optional message
func NewError(code int, message ...string) *Error {
func NewError(code int, message ...interface{}) *Error {
e := &Error{
Code: code,
Code: code,
Message: utils.StatusMessage(code),
}
if len(message) > 0 {
e.Message = message[0]
} else {
e.Message = utils.StatusMessage(code)
}
return e
}

// NewErrors creates multiple new Errors instance with some message
func NewErrors(code int, messages ...string) []*Error {
var errors []*Error
// NewErrors creates multiple new Error messages
func NewErrors(code int, messages ...interface{}) *Error {
e := &Error{
Code: code,
Message: utils.StatusMessage(code),
}
if len(messages) > 0 {
for _, message := range messages {
e := &Error{
Code: code,
}
e.Message = message
errors = append(errors, e)
}
} else {
// Use default messages
e := &Error{
Code: code,
}
e.Message = utils.StatusMessage(code)
errors = append(errors, e)
e.Message = messages
}

return errors
return e
}

// Listener can be used to pass a custom listener.
Expand Down
13 changes: 6 additions & 7 deletions app_test.go
Expand Up @@ -1163,16 +1163,15 @@ func Benchmark_App_ETag_Weak(b *testing.B) {
func Test_NewError(t *testing.T) {
e := NewError(StatusForbidden, "permission denied")
utils.AssertEqual(t, StatusForbidden, e.Code)
utils.AssertEqual(t, "permission denied", e.Message)
utils.AssertEqual(t, "permission denied", fmt.Sprint(e.Message))
}

func Test_NewErrors(t *testing.T) {
errors := NewErrors(StatusBadRequest, []string{"error 1", "error 2"}...)
utils.AssertEqual(t, StatusBadRequest, errors[0].Code)
utils.AssertEqual(t, "error 1", errors[0].Message)

utils.AssertEqual(t, StatusBadRequest, errors[1].Code)
utils.AssertEqual(t, "error 2", errors[1].Message)
e := NewErrors(StatusBadRequest, "error 1", "error 2")
messages := e.Message.([]interface{})
utils.AssertEqual(t, StatusBadRequest, e.Code)
utils.AssertEqual(t, "error 1", fmt.Sprint(messages[0]))
utils.AssertEqual(t, "error 2", fmt.Sprint(messages[1]))
}

// go test -run Test_Test_Timeout
Expand Down