Skip to content

Commit ad12991

Browse files
FarhanSalehFarhanSaleh
committed
refactor: replace logrus error logging with custom error handling in event usecases
1 parent 1f569c8 commit ad12991

11 files changed

Lines changed: 53 additions & 46 deletions

‎app/events/usecase/create_event.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ import (
55
"errors"
66

77
"github.com/hammer-code/lms-be/domain"
8-
"github.com/sirupsen/logrus"
8+
"github.com/hammer-code/lms-be/utils"
99
)
1010

1111
func (uc usecase) CreateEvent(ctx context.Context, payload domain.CreateEventPayload) error {
1212
dataImage, err := uc.imageRepository.GetImage(ctx, payload.FileName)
1313
if err != nil {
14-
logrus.Error("failed to create event", dataImage)
14+
err = utils.NewInternalServerError(ctx, err)
1515
return err
1616
}
1717

1818
if dataImage.IsUsed {
19-
err = errors.New("image not exists")
19+
err = utils.NewNotFoundError(ctx, "image not exists", errors.New("image not exists"))
2020
return err
2121
}
2222

@@ -41,13 +41,13 @@ func (uc usecase) CreateEvent(ctx context.Context, payload domain.CreateEventPay
4141

4242
eventID, err := uc.repository.CreateEvent(txCtx, data)
4343
if err != nil {
44-
logrus.Error("failed to create event", data)
44+
err = utils.NewInternalServerError(ctx, err)
4545
return err
4646
}
4747

4848
err = uc.imageRepository.UpdateUseImage(txCtx, dataImage.ID)
4949
if err != nil {
50-
logrus.Error("failed to update use image", data)
50+
err = utils.NewInternalServerError(ctx, err)
5151
return err
5252
}
5353

@@ -57,7 +57,7 @@ func (uc usecase) CreateEvent(ctx context.Context, payload domain.CreateEventPay
5757
Tag: tag,
5858
})
5959
if err != nil {
60-
logrus.Error("failed to create event tag", data)
60+
err = utils.NewInternalServerError(ctx, err)
6161
return err
6262
}
6363
}
@@ -68,7 +68,7 @@ func (uc usecase) CreateEvent(ctx context.Context, payload domain.CreateEventPay
6868
Name: speaker,
6969
})
7070
if err != nil {
71-
logrus.Error("failed to create event speaker", data)
71+
err = utils.NewInternalServerError(ctx, err)
7272
return err
7373
}
7474
}

‎app/events/usecase/create_event_pay.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,29 @@ import (
55
"errors"
66

77
"github.com/hammer-code/lms-be/domain"
8-
"github.com/sirupsen/logrus"
8+
"github.com/hammer-code/lms-be/utils"
99
)
1010

1111
func (uc usecase) CreateEventPay(ctx context.Context, payload domain.EventPayPayload) error {
1212
rEvent, err := uc.repository.GetRegistrationEvent(ctx, payload.OrderNo)
1313
if err != nil {
14-
logrus.Error("failed to get event")
14+
err = utils.NewInternalServerError(ctx, err)
1515
return err
1616
}
1717

1818
if rEvent.ID == 0 {
19-
return errors.New("registration order not found")
19+
err = utils.NewNotFoundError(ctx, "registration order not found", errors.New("registration order not found"))
20+
return err
2021
}
2122

2223
dataImage, err := uc.imageRepository.GetImage(ctx, payload.ImageProofPayment)
2324
if err != nil {
24-
logrus.Error("failed to create event", dataImage)
25+
err = utils.NewInternalServerError(ctx, err)
2526
return err
2627
}
2728

2829
if dataImage.IsUsed {
29-
err = errors.New("image not exists")
30+
err = utils.NewNotFoundError(ctx, "image not exists", errors.New("image not exists"))
3031
return err
3132
}
3233

@@ -41,13 +42,13 @@ func (uc usecase) CreateEventPay(ctx context.Context, payload domain.EventPayPay
4142
})
4243

4344
if err != nil {
44-
logrus.Error("failed to create pay event")
45+
err = utils.NewInternalServerError(txCtx, err)
4546
return err
4647
}
4748

4849
err = uc.imageRepository.UpdateUseImage(txCtx, dataImage.ID)
4950
if err != nil {
50-
logrus.Error("failed to update use image")
51+
err = utils.NewInternalServerError(txCtx, err)
5152
return err
5253
}
5354

‎app/events/usecase/create_registration_event.go‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,32 @@ import (
88

99
"github.com/hammer-code/lms-be/domain"
1010
"github.com/hammer-code/lms-be/pkg/hash"
11-
"github.com/sirupsen/logrus"
11+
"github.com/hammer-code/lms-be/utils"
1212
)
1313

1414
func (uc usecase) CreateRegistrationEvent(ctx context.Context, payload domain.RegisterEventPayload) (domain.RegisterEventResponse, error) {
1515
event, err := uc.repository.GetEvent(ctx, payload.EventID)
1616
if err != nil {
17-
logrus.Error("failed to get event")
17+
err = utils.NewInternalServerError(ctx, err)
1818
return domain.RegisterEventResponse{}, err
1919
}
2020

2121
if event.ID == 0 {
22-
return domain.RegisterEventResponse{}, errors.New("event not found")
22+
err = utils.NewNotFoundError(ctx, "event not found", errors.New("event not found"))
23+
return domain.RegisterEventResponse{}, err
2324
}
2425

2526
tNow := time.Now()
2627

2728
if !event.ReservationStartDate.Valid {
28-
return domain.RegisterEventResponse{}, errors.New("event is not start to booking")
29+
err = utils.NewBadRequestError(ctx, "event is not start to booking", errors.New("event is not start to booking"))
30+
return domain.RegisterEventResponse{}, err
2931
}
3032

3133
if event.ReservationEndDate.Valid {
3234
if tNow.After(event.ReservationEndDate.Time) {
33-
return domain.RegisterEventResponse{}, errors.New("priode booking has ended")
35+
err = utils.NewBadRequestError(ctx, "priode booking has ended", errors.New("priode booking has ended"))
36+
return domain.RegisterEventResponse{}, err
3437
}
3538
}
3639

@@ -58,19 +61,19 @@ func (uc usecase) CreateRegistrationEvent(ctx context.Context, payload domain.Re
5861
})
5962

6063
if err != nil {
61-
logrus.Error("failed to get event")
64+
err = utils.NewInternalServerError(ctx, err)
6265
return err
6366
}
6467

6568
if payload.ImageProofPayment != "" {
6669
dataImage, err := uc.imageRepository.GetImage(ctx, payload.ImageProofPayment)
6770
if err != nil {
68-
logrus.Error("failed to create event", dataImage)
71+
err = utils.NewInternalServerError(ctx, err)
6972
return err
7073
}
7174

7275
if dataImage.IsUsed {
73-
err = errors.New("image not exists")
76+
err = utils.NewNotFoundError(ctx, "image not exists", errors.New("image not exists"))
7477
return err
7578
}
7679

@@ -82,13 +85,13 @@ func (uc usecase) CreateRegistrationEvent(ctx context.Context, payload domain.Re
8285
})
8386

8487
if err != nil {
85-
logrus.Error("failed to create pay event")
88+
err = utils.NewInternalServerError(ctx, err)
8689
return err
8790
}
8891

8992
err = uc.imageRepository.UpdateUseImage(txCtx, dataImage.ID)
9093
if err != nil {
91-
logrus.Error("failed to update use image")
94+
err = utils.NewInternalServerError(ctx, err)
9295
return err
9396
}
9497
}

‎app/events/usecase/delete_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package usecase
33
import (
44
"context"
55

6-
"github.com/sirupsen/logrus"
6+
"github.com/hammer-code/lms-be/utils"
77
)
88

99
func (uc usecase) DeleteEvent(ctx context.Context, id uint) error {
1010
err := uc.repository.DeleteEvent(ctx, id)
1111
if err != nil {
12-
logrus.Error("failed to delete event by id: ", err)
12+
err = utils.NewInternalServerError(ctx, err)
1313
return err
1414
}
1515

‎app/events/usecase/get_event_general.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
"github.com/hammer-code/lms-be/config"
88
"github.com/hammer-code/lms-be/domain"
9-
"github.com/sirupsen/logrus"
9+
"github.com/hammer-code/lms-be/utils"
1010
)
1111

1212
func (uc usecase) GetEventByID(ctx context.Context, id uint) (domain.Event, error) {
1313
resp, err := uc.repository.GetEvent(ctx, id)
1414
if err != nil {
15-
logrus.Error("failed to get event by id: ", err)
15+
err = utils.NewInternalServerError(ctx, err)
1616
return resp, err
1717
}
1818
baseURL := config.GetConfig().BaseURL

‎app/events/usecase/get_events.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
"github.com/hammer-code/lms-be/config"
88
"github.com/hammer-code/lms-be/domain"
9-
"github.com/sirupsen/logrus"
9+
"github.com/hammer-code/lms-be/utils"
1010
)
1111

1212
func (uc usecase) GetEvents(ctx context.Context, filter domain.EventFilter) (resp []domain.Event, pagination domain.Pagination, err error) {
1313
tData, datas, err := uc.repository.GetEvents(ctx, filter)
1414
if err != nil {
15-
logrus.Error("failed to get event")
15+
err = utils.NewInternalServerError(ctx, err)
1616
return
1717
}
1818

‎app/events/usecase/list_event_pay.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55

66
"github.com/hammer-code/lms-be/domain"
7-
"github.com/sirupsen/logrus"
7+
"github.com/hammer-code/lms-be/utils"
88
)
99

1010
func (uc usecase) ListEventPay(ctx context.Context, filter domain.EventFilter) (resp []domain.EventPay, pagination domain.Pagination, err error) {
1111
tData, datas, err := uc.repository.ListEventPay(ctx, filter)
1212
if err != nil {
13-
logrus.Error("failed to list event pay")
13+
err = utils.NewInternalServerError(ctx, err)
1414
return
1515
}
1616

‎app/events/usecase/list_registration_event.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"context"
55

66
"github.com/hammer-code/lms-be/domain"
7-
"github.com/sirupsen/logrus"
7+
"github.com/hammer-code/lms-be/utils"
88
)
99

1010
func (uc usecase) ListRegistration(ctx context.Context, filter domain.EventFilter) (resp []domain.RegistrationEvent, pagination domain.Pagination, err error) {
1111
tData, datas, err := uc.repository.ListRegistration(ctx, filter)
1212
if err != nil {
13-
logrus.Error("failed to get event")
13+
err = utils.NewInternalServerError(ctx, err)
1414
return
1515
}
1616

‎app/events/usecase/pay_process.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ import (
55
"errors"
66

77
"github.com/hammer-code/lms-be/domain"
8-
"github.com/sirupsen/logrus"
8+
"github.com/hammer-code/lms-be/utils"
99
)
1010

1111
func (uc usecase) PayProcess(ctx context.Context, payload domain.PayProcessPayload) error {
1212
rEvent, err := uc.repository.GetRegistrationEvent(ctx, payload.OrderNo)
1313
if err != nil {
14-
logrus.Error("failed to get event")
14+
err = utils.NewInternalServerError(ctx, err)
1515
return err
1616
}
1717

1818
if rEvent.ID == 0 {
19-
return errors.New("registration order not found")
19+
err = utils.NewNotFoundError(ctx, "registration order not found", errors.New("registration order not found"))
20+
return err
2021
}
2122

2223
if rEvent.Status == "SUCCESS" {
@@ -25,12 +26,13 @@ func (uc usecase) PayProcess(ctx context.Context, payload domain.PayProcessPaylo
2526

2627
eventPay, err := uc.repository.GetEventPay(ctx, payload.OrderNo)
2728
if err != nil {
28-
logrus.Error("failed to get event")
29+
err = utils.NewInternalServerError(ctx, err)
2930
return err
3031
}
3132

3233
if eventPay.ID == 0 {
33-
return errors.New("event pay order not found")
34+
err = utils.NewNotFoundError(ctx, "event pay order not found", errors.New("event pay order not found"))
35+
return err
3436
}
3537

3638
if eventPay.Status == "SUCCESS" {
@@ -45,13 +47,13 @@ func (uc usecase) PayProcess(ctx context.Context, payload domain.PayProcessPaylo
4547
err = uc.repository.UpdateEventPay(txCtx, eventPay)
4648

4749
if err != nil {
48-
logrus.Error("failed to update event pay")
50+
err = utils.NewInternalServerError(ctx, err)
4951
return err
5052
}
5153

5254
err = uc.repository.UpdateRegistrationEvent(txCtx, rEvent)
5355
if err != nil {
54-
logrus.Error("failed to update registration event pay")
56+
err = utils.NewInternalServerError(ctx, err)
5557
return err
5658
}
5759

‎app/events/usecase/registration_status.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ import (
55
"errors"
66

77
"github.com/hammer-code/lms-be/domain"
8-
"github.com/sirupsen/logrus"
8+
"github.com/hammer-code/lms-be/utils"
99
)
1010

1111
func (uc usecase) RegistrationStatus(ctx context.Context, orderNo string) (resp domain.RegisterStatusResponse, err error) {
1212
rEvent, err := uc.repository.GetRegistrationEvent(ctx, orderNo)
1313
if err != nil {
14-
logrus.Error("failed to get event")
14+
err = utils.NewInternalServerError(ctx, err)
1515
return resp, err
1616
}
1717

1818
if rEvent.ID == 0 {
19-
return resp, errors.New("registration order not found")
19+
err = utils.NewNotFoundError(ctx, "registration order not found", errors.New("registration order not found"))
20+
return resp, err
2021
}
2122

2223
return domain.RegisterStatusResponse{

0 commit comments

Comments
 (0)