Skip to content

Commit 3b89620

Browse files
committed
refactor: Remove usage of utils.ToPtr in interceptor
1 parent 59a4691 commit 3b89620

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

pkg/middleware/interceptor.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"time"
1111

1212
"github.com/foss-opensolace/api.opensolace.com/pkg/exception"
13-
"github.com/foss-opensolace/api.opensolace.com/pkg/utils"
1413
"github.com/gofiber/fiber/v2"
1514
"github.com/hashicorp/go-multierror"
1615
)
@@ -70,17 +69,17 @@ func Interceptor() fiber.Handler {
7069

7170
response.Status = e.Code
7271
} else if e, ok := err.(exception.FieldTypeError); ok {
73-
response.ExceptionID = utils.ToPtr(exception.IdInvalidFieldType)
72+
response.ExceptionID = exception.IdInvalidFieldType.Ptr()
7473
response.Data = e.Error()
7574

7675
response.Status = fiber.StatusBadRequest
7776
} else if e, ok := err.(exception.FieldLayoutError); ok {
78-
response.ExceptionID = utils.ToPtr(exception.IdInvalidFieldLayout)
77+
response.ExceptionID = exception.IdInvalidFieldLayout.Ptr()
7978
response.Data = e.Error()
8079

8180
response.Status = fiber.StatusBadRequest
8281
} else if e, ok := err.(*multierror.Error); ok {
83-
response.ExceptionID = utils.ToPtr(exception.IdOneOrManyValidation)
82+
response.ExceptionID = exception.IdOneOrManyValidation.Ptr()
8483
response.Data = e.Errors
8584

8685
response.Status = fiber.StatusBadRequest
@@ -92,10 +91,10 @@ func Interceptor() fiber.Handler {
9291
response.Status = fiber.StatusInternalServerError
9392

9493
if strings.Contains("gorm", reflect.TypeOf(err).Name()) {
95-
response.ExceptionID = utils.ToPtr(exception.IdDBError)
94+
response.ExceptionID = exception.IdDBError.Ptr()
9695
response.Data = "Database error, we are addressing this issue. Please, try again later."
9796
} else {
98-
response.ExceptionID = utils.ToPtr(exception.IdServerError)
97+
response.ExceptionID = exception.IdServerError.Ptr()
9998
response.Data = "Server error, we are addressing this issue. Please, try again later."
10099
}
101100
}
@@ -104,7 +103,7 @@ func Interceptor() fiber.Handler {
104103
method := string(c.Request().Header.Method())
105104
route := string(c.Request().URI().PathOriginal())
106105
if e, ok := response.Data.(string); ok && strings.Contains(e, fmt.Sprintf("Cannot %s %s", method, route)) {
107-
response.ExceptionID = utils.ToPtr(exception.IdRouteError)
106+
response.ExceptionID = exception.IdRouteError.Ptr()
108107
response.Data = "Couldn't find route " + route
109108

110109
response.Status = fiber.StatusNotFound
@@ -115,7 +114,7 @@ func Interceptor() fiber.Handler {
115114
response.Data = nil
116115

117116
if response.ExceptionID == nil {
118-
response.ExceptionID = utils.ToPtr(exception.IdUnknown)
117+
response.ExceptionID = exception.IdUnknown.Ptr()
119118
}
120119
}
121120

0 commit comments

Comments
 (0)