feat(http): improve error handling (#1006)

This commit is contained in:
ze0s 2023-07-02 14:03:39 +02:00 committed by GitHub
parent 5cdf68bc77
commit c361f23139
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 94 additions and 66 deletions

View file

@ -42,13 +42,17 @@ func newFilterHandler(encoder encoder, service filterService) *filterHandler {
func (h filterHandler) Routes(r chi.Router) {
r.Get("/", h.getFilters)
r.Get("/{filterID}", h.getByID)
r.Get("/{filterID}/duplicate", h.duplicate)
r.Post("/", h.store)
r.Put("/{filterID}", h.update)
r.Patch("/{filterID}", h.updatePartial)
r.Put("/{filterID}/enabled", h.toggleEnabled)
r.Delete("/{filterID}", h.delete)
r.Route("/{filterID}", func(r chi.Router) {
r.Get("/", h.getByID)
r.Put("/", h.update)
r.Patch("/", h.updatePartial)
r.Delete("/", h.delete)
r.Get("/duplicate", h.duplicate)
r.Put("/enabled", h.toggleEnabled)
})
}
func (h filterHandler) getFilters(w http.ResponseWriter, r *http.Request) {
@ -92,7 +96,6 @@ func (h filterHandler) getFilters(w http.ResponseWriter, r *http.Request) {
trackers, err := h.service.Find(ctx, params)
if err != nil {
//
h.encoder.Error(w, err)
return
}
@ -149,14 +152,12 @@ func (h filterHandler) store(w http.ResponseWriter, r *http.Request) {
)
if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
filter, err := h.service.Store(ctx, data)
if err != nil {
// encode error
h.encoder.Error(w, err)
return
}
@ -171,14 +172,12 @@ func (h filterHandler) update(w http.ResponseWriter, r *http.Request) {
)
if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
filter, err := h.service.Update(ctx, data)
if err != nil {
// encode error
h.encoder.Error(w, err)
return
}
@ -202,13 +201,11 @@ func (h filterHandler) updatePartial(w http.ResponseWriter, r *http.Request) {
data.ID = id
if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
if err := h.service.UpdatePartial(ctx, data); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
@ -232,13 +229,11 @@ func (h filterHandler) toggleEnabled(w http.ResponseWriter, r *http.Request) {
}
if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
if err := h.service.ToggleEnabled(ctx, id, data.Enabled); err != nil {
// encode error
h.encoder.Error(w, err)
return
}
@ -259,7 +254,6 @@ func (h filterHandler) delete(w http.ResponseWriter, r *http.Request) {
}
if err := h.service.Delete(ctx, id); err != nil {
// return err
h.encoder.Error(w, err)
}