synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: create and modify organization groups (#13887)

Browse Source
This commit is contained in:
Kayla Washburn-Love
2024-07-22 09:47:14 -06:00
committed by GitHub
parent dd99457a04
commit 0a71c34d46
24 changed files with 1205 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
enterprise/coderd/groups.go
View File

@ -2,6 +2,7 @@ package coderd
import (
"database/sql"
"errors"
"fmt"
"net/http"
@ -170,9 +171,9 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
OrganizationID: group.OrganizationID,
UserID: uuid.MustParse(id),
}))
if xerrors.Is(err, sql.ErrNoRows) {
if errors.Is(err, sql.ErrNoRows) {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: fmt.Sprintf("User %q must be a member of organization %q", id, group.ID),
Message: fmt.Sprintf("User must be a member of organization %q", group.Name),
})
return
}
@ -364,7 +365,7 @@ func (api *API) group(rw http.ResponseWriter, r *http.Request) {
)
users, err := api.Database.GetGroupMembersByGroupID(ctx, group.ID)
if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
if err != nil && !errors.Is(err, sql.ErrNoRows) {
httpapi.InternalServerError(rw, err)
return
}
@ -391,7 +392,7 @@ func (api *API) groups(rw http.ResponseWriter, r *http.Request) {
)
groups, err := api.Database.GetGroupsByOrganizationID(ctx, org.ID)
if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
if err != nil && !errors.Is(err, sql.ErrNoRows) {
httpapi.InternalServerError(rw, err)
return
}