fix codersdk, work on test

Emyrk · Emyrk · commit 395edcaa33cf · 2024-08-13T12:09:45.000-05:00
diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/url"
 
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
@@ -60,9 +61,30 @@ func (c *Client) CreateGroup(ctx context.Context, orgID uuid.UUID, req CreateGro
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
+// GroupsByOrganization
+// Deprecated: use Groups with GroupArguments instead.
 func (c *Client) GroupsByOrganization(ctx context.Context, orgID uuid.UUID) ([]Group, error) {
+	return c.Groups(ctx, GroupArguments{Organization: orgID.String()})
+}
+
+type GroupArguments struct {
+	// Organization can be an org UUID or name
+	Organization string
+	// HasMember can be a user uuid or username
+	HasMember string
+}
+
+func (c *Client) Groups(ctx context.Context, args GroupArguments) ([]Group, error) {
+	qp := url.Values{}
+	if args.Organization != "" {
+		qp.Set("organization", args.Organization)
+	}
+	if args.HasMember != "" {
+		qp.Set("has_member", args.HasMember)
+	}
+
 	res, err := c.Request(ctx, http.MethodGet,
-		fmt.Sprintf("/api/v2/organizations/%s/groups", orgID.String()),
+		fmt.Sprintf("/api/v2/groups?%s", qp.Encode()),
 		nil,
 	)
 	if err != nil {
diff --git a/enterprise/coderd/groups.go b/enterprise/coderd/groups.go
@@ -419,7 +419,7 @@ func (api *API) groups(rw http.ResponseWriter, r *http.Request) {
 	var filter database.GetGroupsParams
 	parser := httpapi.NewQueryParamParser()
 	// Organization selector can be an org ID or name
-	filter.OrganizationID = parser.UUIDorName(r.URL.Query(), uuid.Nil, "has_member", func(orgName string) (uuid.UUID, error) {
+	filter.OrganizationID = parser.UUIDorName(r.URL.Query(), uuid.Nil, "organization", func(orgName string) (uuid.UUID, error) {
 		org, err := api.Database.GetOrganizationByName(ctx, orgName)
 		if err != nil {
 			return uuid.Nil, xerrors.Errorf("organization %q not found", orgName)
@@ -438,6 +438,14 @@ func (api *API) groups(rw http.ResponseWriter, r *http.Request) {
 		}
 		return user.ID, nil
 	})
+	parser.ErrorExcessParams(r.URL.Query())
+	if len(parser.Errors) > 0 {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+			Message:     "Query parameters have invalid values.",
+			Validations: parser.Errors,
+		})
+		return
+	}
 
 	groups, err := api.Database.GetGroups(ctx, filter)
 	if httpapi.Is404Error(err) {
diff --git a/enterprise/coderd/groups_test.go b/enterprise/coderd/groups_test.go
@@ -568,6 +568,12 @@ func TestPatchGroup(t *testing.T) {
 	})
 }
 
+func sortAllGroups(groups []codersdk.Group) {
+	for i := range groups {
+		sortGroupMembers(&groups[i])
+	}
+}
+
 func sortGroupMembers(group *codersdk.Group) {
 	sort.Slice(group.Members, func(i, j int) bool {
 		return group.Members[i].ID.String() < group.Members[j].ID.String()
@@ -793,6 +799,8 @@ func TestGroup(t *testing.T) {
 func TestGroups(t *testing.T) {
 	t.Parallel()
 
+	// 5 users
+	// 2 custom groups + original org group
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()
 
@@ -822,26 +830,41 @@ func TestGroups(t *testing.T) {
 			AddUsers: []string{user2.ID.String(), user3.ID.String()},
 		})
 		require.NoError(t, err)
+		sortGroupMembers(&group1)
 
 		group2, err = userAdminClient.PatchGroup(ctx, group2.ID, codersdk.PatchGroupRequest{
 			AddUsers: []string{user4.ID.String(), user5.ID.String()},
 		})
 		require.NoError(t, err)
+		sortGroupMembers(&group2)
 
-		groups, err := userAdminClient.GroupsByOrganization(ctx, user.OrganizationID)
+		// Fetch everyone group for comparison
+		everyoneGroup, err := userAdminClient.Group(ctx, user.OrganizationID)
 		require.NoError(t, err)
+		sortGroupMembers(&everyoneGroup)
 
-		// sort group members so we can compare them
-		allGroups := append([]codersdk.Group{}, groups...)
-		allGroups = append(allGroups, group1, group2)
-		for i := range allGroups {
-			sortGroupMembers(&allGroups[i])
-		}
+		groups, err := userAdminClient.Groups(ctx, codersdk.GroupArguments{
+			Organization: user.OrganizationID.String(),
+		})
+		require.NoError(t, err)
+		sortAllGroups(groups)
 
 		// 'Everyone' group + 2 custom groups.
 		require.Len(t, groups, 3)
 		require.Contains(t, groups, group1)
 		require.Contains(t, groups, group2)
+
+		// Filter by user
+		user5Groups, err := userAdminClient.Groups(ctx, codersdk.GroupArguments{
+			HasMember: user5.Username,
+		})
+		require.NoError(t, err)
+		// Everyone group and group 2
+		require.ElementsMatch(t, user5Groups, []codersdk.Group{
+			everyoneGroup,
+			group2,
+		})
+
 	})
 }
 
