1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 12:25:22 +02:00

chore(handlers): replace structs by functions for HTTP errors EE-4227 (#7664)

This commit is contained in:
andres-portainer 2022-09-14 20:42:39 -03:00 committed by GitHub
parent 7accdf704c
commit 9ef5636718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
157 changed files with 1123 additions and 1147 deletions

View file

@ -44,15 +44,15 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
var payload teamCreatePayload
err := request.DecodeAndValidateJSONPayload(r, &payload)
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
return httperror.BadRequest("Invalid request payload", err)
}
team, err := handler.DataStore.Team().TeamByName(payload.Name)
if err != nil && !handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve teams from the database", err}
return httperror.InternalServerError("Unable to retrieve teams from the database", err)
}
if team != nil {
return &httperror.HandlerError{http.StatusConflict, "A team with the same name already exists", errors.New("Team already exists")}
return &httperror.HandlerError{StatusCode: http.StatusConflict, Message: "A team with the same name already exists", Err: errors.New("Team already exists")}
}
team = &portainer.Team{
@ -61,7 +61,7 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
err = handler.DataStore.Team().Create(team)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the team inside the database", err}
return httperror.InternalServerError("Unable to persist the team inside the database", err)
}
for _, teamLeader := range payload.TeamLeaders {
@ -73,7 +73,7 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
err = handler.DataStore.TeamMembership().Create(membership)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist team leadership inside the database", err}
return httperror.InternalServerError("Unable to persist team leadership inside the database", err)
}
}