add get group endpoint w/ tests

sreya · sreya · commit eea0aeeb9cb3 · 2022-09-22T17:36:18.000Z
diff --git a/coderd/groups.go b/coderd/groups.go
@@ -161,7 +161,23 @@ func (api *API) deleteGroup(rw http.ResponseWriter, r *http.Request) {
 }
 
 func (api *API) group(rw http.ResponseWriter, r *http.Request) {
+	var (
+		ctx   = r.Context()
+		group = httpmw.GroupParam(r)
+	)
+
+	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceTemplate) {
+		httpapi.ResourceNotFound(rw)
+		return
+	}
+
+	users, err := api.Database.GetGroupMembers(ctx, group.ID)
+	if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
+		httpapi.InternalServerError(rw, err)
+		return
+	}
 
+	httpapi.Write(rw, http.StatusOK, convertGroup(group, users))
 }
 
 func (api *API) groups(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/groups_test.go b/coderd/groups_test.go
@@ -172,3 +172,52 @@ func TestPatchGroup(t *testing.T) {
 		require.Equal(t, http.StatusBadRequest, cerr.StatusCode())
 	})
 }
+
+// TODO: test auth.
+func TestGroup(t *testing.T) {
+	t.Parallel()
+
+	t.Run("OK", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+
+		ctx, _ := testutil.Context(t)
+		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
+			Name: "hi",
+		})
+		require.NoError(t, err)
+
+		ggroup, err := client.Group(ctx, group.ID)
+		require.NoError(t, err)
+		require.Equal(t, group, ggroup)
+	})
+
+	t.Run("WithUsers", func(t *testing.T) {
+		t.Parallel()
+
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+
+		_, user2 := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
+		_, user3 := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
+
+		ctx, _ := testutil.Context(t)
+		group, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
+			Name: "hi",
+		})
+		require.NoError(t, err)
+
+		group, err = client.PatchGroup(ctx, group.ID, codersdk.PatchGroupRequest{
+			AddUsers: []string{user2.ID.String(), user3.ID.String()},
+		})
+		require.NoError(t, err)
+		require.Contains(t, group.Members, user2)
+		require.Contains(t, group.Members, user3)
+
+		ggroup, err := client.Group(ctx, group.ID)
+		require.NoError(t, err)
+		require.Equal(t, group, ggroup)
+	})
+}
diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -65,7 +65,7 @@ func (c *Client) Group(ctx context.Context, group uuid.UUID) (Group, error) {
 	}
 	defer res.Body.Close()
 
-	if res.StatusCode != http.StatusCreated {
+	if res.StatusCode != http.StatusOK {
 		return Group{}, readBodyAsError(res)
 	}
 	var resp Group

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func (c *Client) Group(ctx context.Context, group uuid.UUID) (Group, error) {`
`65`	`65`	`}`
`66`	`66`	`defer res.Body.Close()`
`67`	`67`
`68`		`- if res.StatusCode != http.StatusCreated {`
	`68`	`+ if res.StatusCode != http.StatusOK {`
`69`	`69`	`return Group{}, readBodyAsError(res)`
`70`	`70`	`}`
`71`	`71`	`var resp Group`