Skip to content

Commit 2a0fec1

Browse files
committed
fix: standardize error handling with CustomErrorResponse across user endpoints
1 parent e3ccfb4 commit 2a0fec1

File tree

4 files changed

+15
-25
lines changed

4 files changed

+15
-25
lines changed

app/newsletters/delivery/http/newsletter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (h handler) Subscribe(w http.ResponseWriter, r *http.Request) {
3232

3333
err = h.usecase.Subscribe(r.Context(), payload.Email)
3434
if err != nil {
35-
resp := utils.CostumErr(err.Error())
35+
resp := utils.CustomErrorResponse(err)
3636
utils.Response(resp, w)
3737
return
3838
}

app/users/delivery/http/login_users.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,21 @@ import (
2323
func (h Handler) Login(w http.ResponseWriter, r *http.Request) {
2424
bodyBytes, err := io.ReadAll(r.Body)
2525
if err != nil {
26-
utils.Response(domain.HttpResponse{
27-
Code: 500,
28-
Message: err.Error(),
29-
}, w)
26+
resp := utils.CustomErrorResponse(err)
27+
utils.Response(resp, w)
3028
return
3129
}
3230

3331
loginInstance := domain.Login{}
3432
if err := json.Unmarshal(bodyBytes, &loginInstance); err != nil {
35-
utils.Response(domain.HttpResponse{
36-
Code: 500,
37-
Message: err.Error(),
38-
}, w)
33+
resp := utils.CustomErrorResponse(err)
34+
utils.Response(resp, w)
3935
return
4036
}
4137

4238
_, token, err := h.usecase.Login(r.Context(), loginInstance)
4339
if err != nil {
44-
resp := utils.CostumErr(err.Error())
40+
resp := utils.CustomErrorResponse(err)
4541
utils.Response(resp, w)
4642
return
4743
}

app/users/delivery/http/logout_users.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (h Handler) Logout(w http.ResponseWriter, r *http.Request) {
2222

2323
err := h.usecase.Logout(r.Context(), *token)
2424
if err != nil {
25-
resp := utils.CostumErr(err.Error())
25+
resp := utils.CustomErrorResponse(err)
2626
utils.Response(resp, w)
2727
return
2828
}

app/users/delivery/http/register_users.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,30 @@ import (
2525
func (h Handler) Register(w http.ResponseWriter, r *http.Request) {
2626
bodyBytes, err := io.ReadAll(r.Body)
2727
if err != nil {
28-
utils.Response(domain.HttpResponse{
29-
Code: 500,
30-
Message: err.Error(),
31-
}, w)
28+
resp := utils.CustomErrorResponse(err)
29+
utils.Response(resp, w)
3230
return
3331
}
3432

3533
user := domain.Register{}
3634
if err = json.Unmarshal(bodyBytes, &user); err != nil {
37-
utils.Response(domain.HttpResponse{
38-
Code: 500,
39-
Message: err.Error(),
40-
}, w)
35+
resp := utils.CustomErrorResponse(err)
36+
utils.Response(resp, w)
4137
return
4238
}
4339

4440
if user.Password != user.ConfirmPassword {
45-
utils.Response(domain.HttpResponse{
46-
Code: 400,
47-
Message: "Confirm password doesnt match",
48-
Data: nil,
49-
}, w)
41+
err := utils.NewBadRequestError("Confirm password doesn't match", nil)
42+
resp := utils.CustomErrorResponse(err)
43+
utils.Response(resp, w)
5044
return
5145
}
5246

5347
userInput := domain.RegistToUser(user)
5448
_, err = h.usecase.Register(r.Context(), userInput)
5549
if err != nil {
5650
logrus.Error("userUsecase: failed to register user")
57-
resp := utils.CostumErr(err.Error())
51+
resp := utils.CustomErrorResponse(err)
5852
utils.Response(resp, w)
5953
return
6054
}

0 commit comments

Comments
 (0)