Skip to content

Commit 4dd9f46

Browse files
committed
rename and moved to HttpStatusCoder below
1 parent 9e37c93 commit 4dd9f46

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

httperror.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ type HTTPStatusCoder interface {
1414
StatusCode() int
1515
}
1616

17+
// StatusCode returns status code from error if it implements HTTPStatusCoder interface.
18+
// If error does not implement the interface it returns 0.
19+
func StatusCode(err error) int {
20+
var sc HTTPStatusCoder
21+
if errors.As(err, &sc) {
22+
return sc.StatusCode()
23+
}
24+
return 0
25+
}
26+
1727
// Following errors can produce HTTP status code by implementing HTTPStatusCoder interface
1828
var (
1929
ErrBadRequest = &httpError{http.StatusBadRequest} // 400
@@ -73,16 +83,6 @@ func (he *HTTPError) Error() string {
7383
return fmt.Sprintf("code=%d, message=%v, err=%v", he.Code, msg, he.err.Error())
7484
}
7585

76-
// HTTPStatusCode returns status code from error if it implements HTTPStatusCoder interface.
77-
// If error does not implement the interface it returns 0.
78-
func HTTPStatusCode(err error) int {
79-
var sc HTTPStatusCoder
80-
if errors.As(err, &sc) {
81-
return sc.StatusCode()
82-
}
83-
return 0
84-
}
85-
8686
// Wrap eturns new HTTPError with given errors wrapped inside
8787
func (he HTTPError) Wrap(err error) error {
8888
return &HTTPError{

httperror_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestNewHTTPError(t *testing.T) {
6868
assert.Equal(t, err2, err)
6969
}
7070

71-
func TestHTTPStatusCode(t *testing.T) {
71+
func TestStatusCode(t *testing.T) {
7272
var testCases = []struct {
7373
name string
7474
err error
@@ -103,7 +103,7 @@ func TestHTTPStatusCode(t *testing.T) {
103103

104104
for _, tc := range testCases {
105105
t.Run(tc.name, func(t *testing.T) {
106-
assert.Equal(t, tc.expect, HTTPStatusCode(tc.err))
106+
assert.Equal(t, tc.expect, StatusCode(tc.err))
107107
})
108108
}
109109
}

0 commit comments

Comments
 (0)