Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

feat(dataservices): unify access methods and abstract away redundant code [EE-5628] (#9115)

Browse source
This commit is contained in:
andres-portainer 2023-06-22 18:28:07 -03:00 • committed by GitHub
parent 4c6bbe9a2f
commit 4cc96b4b30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 714 additions and 1590 deletions
Download patch file Download diff file Expand all files Collapse all files

4
api/http/handler/teammemberships/teammembership_delete.go
View file

@ -31,7 +31,7 @@ func (handler *Handler) teamMembershipDelete(w http.ResponseWriter, r *http.Requ
return httperror.BadRequest("Invalid membership identifier route variable", err)
}
membership, err := handler.DataStore.TeamMembership().TeamMembership(portainer.TeamMembershipID(membershipID))
membership, err := handler.DataStore.TeamMembership().Read(portainer.TeamMembershipID(membershipID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a team membership with the specified identifier inside the database", err)
} else if err != nil {
@ -47,7 +47,7 @@ func (handler *Handler) teamMembershipDelete(w http.ResponseWriter, r *http.Requ
return httperror.Forbidden("Permission denied to delete the membership", errors.ErrResourceAccessDenied)
}
err = handler.DataStore.TeamMembership().DeleteTeamMembership(portainer.TeamMembershipID(membershipID))
err = handler.DataStore.TeamMembership().Delete(portainer.TeamMembershipID(membershipID))
if err != nil {
return httperror.InternalServerError("Unable to remove the team membership from the database", err)
}

2
api/http/handler/teammemberships/teammembership_list.go
View file

@ -21,7 +21,7 @@ import (
// @failure 500 "Server error"
// @router /team_memberships [get]
func (handler *Handler) teamMembershipList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
memberships, err := handler.DataStore.TeamMembership().TeamMemberships()
memberships, err := handler.DataStore.TeamMembership().ReadAll()
if err != nil {
return httperror.InternalServerError("Unable to retrieve team memberships from the database", err)
}

4
api/http/handler/teammemberships/teammembership_update.go
View file

@ -63,7 +63,7 @@ func (handler *Handler) teamMembershipUpdate(w http.ResponseWriter, r *http.Requ
return httperror.BadRequest("Invalid request payload", err)
}
membership, err := handler.DataStore.TeamMembership().TeamMembership(portainer.TeamMembershipID(membershipID))
membership, err := handler.DataStore.TeamMembership().Read(portainer.TeamMembershipID(membershipID))
if handler.DataStore.IsErrObjectNotFound(err) {
return httperror.NotFound("Unable to find a team membership with the specified identifier inside the database", err)
} else if err != nil {
@ -85,7 +85,7 @@ func (handler *Handler) teamMembershipUpdate(w http.ResponseWriter, r *http.Requ
membership.TeamID = portainer.TeamID(payload.TeamID)
membership.Role = portainer.MembershipRole(payload.Role)
err = handler.DataStore.TeamMembership().UpdateTeamMembership(membership.ID, membership)
err = handler.DataStore.TeamMembership().Update(membership.ID, membership)
if err != nil {
return httperror.InternalServerError("Unable to persist membership changes inside the database", err)
}