Skip to content

Commit 562f9dc

Browse files
AfandyWAfandyW
authored
Merge pull request #21 from hammercode-dev/be-11/add_additional_link_field
[BE-11] - Add additional link field
2 parents 92abdde + 427b068 commit 562f9dc

37 files changed

+514
-417
lines changed

‎app/events/delivery/http/event.go‎

Lines changed: 49 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/gorilla/mux"
1010
"github.com/hammer-code/lms-be/domain"
11+
"github.com/hammer-code/lms-be/pkg/ngelog"
1112
"github.com/hammer-code/lms-be/utils"
12-
"github.com/sirupsen/logrus"
1313
)
1414

1515
// @Summary Create Event
@@ -26,36 +26,34 @@ import (
2626
func (h Handler) CreateEvent(w http.ResponseWriter, r *http.Request) {
2727
body, err := io.ReadAll(r.Body)
2828
if err != nil {
29-
logrus.Error("failed to read body : ", err)
29+
ngelog.Error(r.Context(), "failed to read body", err)
3030
utils.Response(domain.HttpResponse{
31-
Code: 500,
31+
Code: http.StatusInternalServerError,
3232
Message: err.Error(),
3333
}, w)
3434
return
3535
}
3636

3737
var payload domain.CreateEventPayload
3838
if err := json.Unmarshal(body, &payload); err != nil {
39-
logrus.Error("failed to unmarshal : ", err)
39+
ngelog.Error(r.Context(), "failed to unmarshal", err)
4040
utils.Response(domain.HttpResponse{
41-
Code: 500,
41+
Code: http.StatusInternalServerError,
4242
Message: err.Error(),
4343
}, w)
4444
return
4545
}
4646

4747
err = h.usecase.CreateEvent(r.Context(), payload)
4848
if err != nil {
49-
logrus.Error("failed to Create event : ", err)
50-
utils.Response(domain.HttpResponse{
51-
Code: 500,
52-
Message: err.Error(),
53-
}, w)
49+
ngelog.Error(r.Context(), "failed to create event", err)
50+
resp := utils.CustomErrorResponse(err)
51+
utils.Response(resp, w)
5452
return
5553
}
5654

5755
utils.Response(domain.HttpResponse{
58-
Code: 201,
56+
Code: http.StatusCreated,
5957
Message: "success",
6058
Data: nil,
6159
}, w)
@@ -76,46 +74,44 @@ func (h Handler) UpdateEvent(w http.ResponseWriter, r *http.Request) {
7674
idS := mux.Vars(r)["id"]
7775
id, err := strconv.ParseUint(idS, 10, 32)
7876
if err != nil {
79-
logrus.Error("failed to convert string to uint: ", err)
77+
ngelog.Error(r.Context(), "failed to convert string to uint", err)
8078
utils.Response(domain.HttpResponse{
81-
Code: 500,
79+
Code: http.StatusInternalServerError,
8280
Message: err.Error(),
8381
}, w)
8482
return
8583
}
8684

8785
body, err := io.ReadAll(r.Body)
8886
if err != nil {
89-
logrus.Error("failed to read body : ", err)
87+
ngelog.Error(r.Context(), "failed to read body", err)
9088
utils.Response(domain.HttpResponse{
91-
Code: 500,
89+
Code: http.StatusInternalServerError,
9290
Message: err.Error(),
9391
}, w)
9492
return
9593
}
9694

9795
var payload domain.UpdateEventPayload
9896
if err := json.Unmarshal(body, &payload); err != nil {
99-
logrus.Error("failed to unmarshal : ", err)
97+
ngelog.Error(r.Context(), "failed to unmarshal", err)
10098
utils.Response(domain.HttpResponse{
101-
Code: 500,
99+
Code: http.StatusInternalServerError,
102100
Message: err.Error(),
103101
}, w)
104102
return
105103
}
106104

107105
err = h.usecase.UpdateEvent(r.Context(), uint(id), payload)
108106
if err != nil {
109-
logrus.Error("failed to update event : ", err)
110-
utils.Response(domain.HttpResponse{
111-
Code: 500,
112-
Message: err.Error(),
113-
}, w)
107+
ngelog.Error(r.Context(), "failed to update event", err)
108+
resp := utils.CustomErrorResponse(err)
109+
utils.Response(resp, w)
114110
return
115111
}
116112

117113
utils.Response(domain.HttpResponse{
118-
Code: 200,
114+
Code: http.StatusOK,
119115
Message: "success",
120116
Data: nil,
121117
}, w)
@@ -137,26 +133,24 @@ func (h Handler) GetEventByID(w http.ResponseWriter, r *http.Request) {
137133

138134
id, err := strconv.ParseUint(idString, 10, 32)
139135
if err != nil {
140-
logrus.Error("failed to convert string to uint: ", err)
136+
ngelog.Error(r.Context(), "failed to convert string to uint", err)
141137
utils.Response(domain.HttpResponse{
142-
Code: 500,
138+
Code: http.StatusInternalServerError,
143139
Message: err.Error(),
144140
}, w)
145141
return
146142
}
147143

148144
data, err := h.usecase.GetEventByID(r.Context(), uint(id))
149145
if err != nil {
150-
logrus.Error("failed to get event : ", err)
151-
utils.Response(domain.HttpResponse{
152-
Code: 500,
153-
Message: err.Error(),
154-
}, w)
146+
ngelog.Error(r.Context(), "failed to get event by id", err)
147+
resp := utils.CustomErrorResponse(err)
148+
utils.Response(resp, w)
155149
return
156150
}
157151

158152
utils.Response(domain.HttpResponse{
159-
Code: 200,
153+
Code: http.StatusOK,
160154
Message: "success",
161155
Data: data,
162156
}, w)
@@ -178,26 +172,24 @@ func (h Handler) GetDetail(w http.ResponseWriter, r *http.Request) {
178172

179173
id, err := strconv.ParseUint(idString, 10, 32)
180174
if err != nil {
181-
logrus.Error("failed to convert string to uint: ", err)
175+
ngelog.Error(r.Context(), "failed to convert string to uint", err)
182176
utils.Response(domain.HttpResponse{
183-
Code: 500,
177+
Code: http.StatusInternalServerError,
184178
Message: err.Error(),
185179
}, w)
186180
return
187181
}
188182

189183
data, err := h.usecase.GetEventByID(r.Context(), uint(id))
190184
if err != nil {
191-
logrus.Error("failed to get event : ", err)
192-
utils.Response(domain.HttpResponse{
193-
Code: 500,
194-
Message: err.Error(),
195-
}, w)
185+
ngelog.Error(r.Context(), "failed to get event by id", err)
186+
resp := utils.CustomErrorResponse(err)
187+
utils.Response(resp, w)
196188
return
197189
}
198190

199191
utils.Response(domain.HttpResponse{
200-
Code: 200,
192+
Code: http.StatusOK,
201193
Message: "success",
202194
Data: data,
203195
}, w)
@@ -220,26 +212,24 @@ func (h Handler) DeleteEvent(w http.ResponseWriter, r *http.Request) {
220212

221213
value, err := strconv.ParseUint(idString, 10, 32)
222214
if err != nil {
223-
logrus.Error("failed to convert string to uint: ", err)
215+
ngelog.Error(r.Context(), "failed to convert string to uint", err)
224216
utils.Response(domain.HttpResponse{
225-
Code: 500,
217+
Code: http.StatusInternalServerError,
226218
Message: err.Error(),
227219
}, w)
228220
return
229221
}
230222

231223
err = h.usecase.DeleteEvent(r.Context(), uint(value))
232224
if err != nil {
233-
logrus.Error("failed to delete event : ", err)
234-
utils.Response(domain.HttpResponse{
235-
Code: 500,
236-
Message: err.Error(),
237-
}, w)
225+
ngelog.Error(r.Context(), "failed to delete event", err)
226+
resp := utils.CustomErrorResponse(err)
227+
utils.Response(resp, w)
238228
return
239229
}
240230

241231
utils.Response(domain.HttpResponse{
242-
Code: 200,
232+
Code: http.StatusOK,
243233
Message: "success",
244234
Data: nil,
245235
}, w)
@@ -265,9 +255,9 @@ func (h Handler) DeleteEvent(w http.ResponseWriter, r *http.Request) {
265255
func (h Handler) List(w http.ResponseWriter, r *http.Request) {
266256
flterPagination, err := domain.GetPaginationFromCtx(r)
267257
if err != nil {
268-
logrus.Error("failed to get pagination : ", err)
258+
ngelog.Error(r.Context(), "failed to get pagination", err)
269259
utils.Response(domain.HttpResponse{
270-
Code: 500,
260+
Code: http.StatusInternalServerError,
271261
Message: err.Error(),
272262
}, w)
273263
return
@@ -286,16 +276,14 @@ func (h Handler) List(w http.ResponseWriter, r *http.Request) {
286276
})
287277

288278
if err != nil {
289-
logrus.Error("failed to get event : ", err)
290-
utils.Response(domain.HttpResponse{
291-
Code: 500,
292-
Message: err.Error(),
293-
}, w)
279+
ngelog.Error(r.Context(), "failed to get events", err)
280+
resp := utils.CustomErrorResponse(err)
281+
utils.Response(resp, w)
294282
return
295283
}
296284

297285
utils.Response(domain.HttpResponse{
298-
Code: 200,
286+
Code: http.StatusOK,
299287
Message: "success",
300288
Data: data,
301289
Pagination: pagination,
@@ -323,9 +311,9 @@ func (h Handler) List(w http.ResponseWriter, r *http.Request) {
323311
func (h Handler) GetEvents(w http.ResponseWriter, r *http.Request) {
324312
flterPagination, err := domain.GetPaginationFromCtx(r)
325313
if err != nil {
326-
logrus.Error("failed to get pagination : ", err)
314+
ngelog.Error(r.Context(), "failed to get pagination", err)
327315
utils.Response(domain.HttpResponse{
328-
Code: 500,
316+
Code: http.StatusInternalServerError,
329317
Message: err.Error(),
330318
}, w)
331319
return
@@ -343,16 +331,14 @@ func (h Handler) GetEvents(w http.ResponseWriter, r *http.Request) {
343331
})
344332

345333
if err != nil {
346-
logrus.Error("failed to get event : ", err)
347-
utils.Response(domain.HttpResponse{
348-
Code: 500,
349-
Message: err.Error(),
350-
}, w)
334+
ngelog.Error(r.Context(), "failed to get events", err)
335+
resp := utils.CustomErrorResponse(err)
336+
utils.Response(resp, w)
351337
return
352338
}
353339

354340
utils.Response(domain.HttpResponse{
355-
Code: 200,
341+
Code: http.StatusOK,
356342
Message: "success",
357343
Data: data,
358344
Pagination: pagination,

‎app/events/delivery/http/list_event_pay.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66

77
"github.com/hammer-code/lms-be/domain"
8+
"github.com/hammer-code/lms-be/pkg/ngelog"
89
"github.com/hammer-code/lms-be/utils"
9-
"github.com/sirupsen/logrus"
1010
)
1111

1212
// ListEventPay
@@ -28,9 +28,9 @@ import (
2828
func (h Handler) ListEventPay(w http.ResponseWriter, r *http.Request) {
2929
flterPagination, err := domain.GetPaginationFromCtx(r)
3030
if err != nil {
31-
logrus.Error("failed to get pagination : ", err)
31+
ngelog.Error(r.Context(), "failed to get pagination", err)
3232
utils.Response(domain.HttpResponse{
33-
Code: 500,
33+
Code: http.StatusInternalServerError,
3434
Message: err.Error(),
3535
}, w)
3636
return
@@ -44,9 +44,9 @@ func (h Handler) ListEventPay(w http.ResponseWriter, r *http.Request) {
4444
if eventIDs != "" {
4545
eventIDU, err := strconv.ParseUint(eventIDs, 10, 32)
4646
if err != nil {
47-
logrus.Error("failed to convert string to uint: ", err)
47+
ngelog.Error(r.Context(), "failed to convert string to uint", err)
4848
utils.Response(domain.HttpResponse{
49-
Code: 500,
49+
Code: http.StatusInternalServerError,
5050
Message: err.Error(),
5151
}, w)
5252
return
@@ -63,16 +63,14 @@ func (h Handler) ListEventPay(w http.ResponseWriter, r *http.Request) {
6363
FilterPagination: flterPagination,
6464
})
6565
if err != nil {
66-
logrus.Error("failed to list event : ", err)
67-
utils.Response(domain.HttpResponse{
68-
Code: 500,
69-
Message: err.Error(),
70-
}, w)
66+
ngelog.Error(r.Context(), "failed to list event pay", err)
67+
resp := utils.CustomErrorResponse(err)
68+
utils.Response(resp, w)
7169
return
7270
}
7371

7472
utils.Response(domain.HttpResponse{
75-
Code: 200,
73+
Code: http.StatusOK,
7674
Message: "success",
7775
Data: data,
7876
Pagination: pagination,

‎app/events/delivery/http/list_registration.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"net/http"
55

66
"github.com/hammer-code/lms-be/domain"
7+
"github.com/hammer-code/lms-be/pkg/ngelog"
78
"github.com/hammer-code/lms-be/utils"
8-
"github.com/sirupsen/logrus"
99
)
1010

1111
// ListRegistration
@@ -27,9 +27,9 @@ import (
2727
func (h Handler) ListRegistration(w http.ResponseWriter, r *http.Request) {
2828
flterPagination, err := domain.GetPaginationFromCtx(r)
2929
if err != nil {
30-
logrus.Error("failed to get pagination : ", err)
30+
ngelog.Error(r.Context(), "failed to get pagination", err)
3131
utils.Response(domain.HttpResponse{
32-
Code: 500,
32+
Code: http.StatusInternalServerError,
3333
Message: err.Error(),
3434
}, w)
3535
return
@@ -46,16 +46,14 @@ func (h Handler) ListRegistration(w http.ResponseWriter, r *http.Request) {
4646
})
4747

4848
if err != nil {
49-
logrus.Error("failed to get registration event : ", err)
50-
utils.Response(domain.HttpResponse{
51-
Code: 500,
52-
Message: err.Error(),
53-
}, w)
49+
ngelog.Error(r.Context(), "failed to list registration event", err)
50+
resp := utils.CustomErrorResponse(err)
51+
utils.Response(resp, w)
5452
return
5553
}
5654

5755
utils.Response(domain.HttpResponse{
58-
Code: 200,
56+
Code: http.StatusOK,
5957
Message: "success",
6058
Data: data,
6159
Pagination: pagination,

0 commit comments

Comments
 (0)