add delete group endpoint

sreya · sreya · commit ff9d968929ab · 2022-09-22T18:34:59.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2790,7 +2790,7 @@ func (q *fakeQuerier) GetGroupMembers(_ context.Context, groupID uuid.UUID) ([]d
 	return users, nil
 }
 
-func (q *fakeQuerier) GetGroupsByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]database.Group, error) {
+func (q *fakeQuerier) GetGroupsByOrganizationID(_ context.Context, organizationID uuid.UUID) ([]database.Group, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
@@ -2803,3 +2803,17 @@ func (q *fakeQuerier) GetGroupsByOrganizationID(ctx context.Context, organizatio
 
 	return groups, nil
 }
+
+func (q *fakeQuerier) DeleteGroupByID(_ context.Context, id uuid.UUID) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for i, group := range q.groups {
+		if group.ID == id {
+			q.groups = append(q.groups[:i], q.groups[i+1:]...)
+			return nil
+		}
+	}
+
+	return sql.ErrNoRows
+}
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/groups.sql b/coderd/database/queries/groups.sql
@@ -84,3 +84,10 @@ DELETE FROM
 WHERE
 	user_id = $1;
 
+-- name: DeleteGroupByID :exec
+DELETE FROM 
+	groups 
+WHERE
+	id = $1;
+
+
diff --git a/coderd/groups.go b/coderd/groups.go
@@ -157,7 +157,25 @@ func (api *API) patchGroup(rw http.ResponseWriter, r *http.Request) {
 }
 
 func (api *API) deleteGroup(rw http.ResponseWriter, r *http.Request) {
+	var (
+		ctx   = r.Context()
+		group = httpmw.GroupParam(r)
+	)
+
+	if !api.Authorize(r, rbac.ActionDelete, rbac.ResourceGroup) {
+		httpapi.ResourceNotFound(rw)
+		return
+	}
 
+	err := api.Database.DeleteGroupByID(ctx, group.ID)
+	if err != nil {
+		httpapi.InternalServerError(rw, err)
+		return
+	}
+
+	httpapi.Write(rw, http.StatusOK, codersdk.Response{
+		Message: "Successfully deleted group!",
+	})
 }
 
 func (api *API) group(rw http.ResponseWriter, r *http.Request) {
diff --git a/coderd/groups_test.go b/coderd/groups_test.go
@@ -274,3 +274,29 @@ func TestGroups(t *testing.T) {
 		require.Len(t, groups, 0)
 	})
 }
+
+func TestDeleteGroup(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)
+		group1, err := client.CreateGroup(ctx, user.OrganizationID, codersdk.CreateGroupRequest{
+			Name: "hi",
+		})
+		require.NoError(t, err)
+
+		err = client.DeleteGroup(ctx, group1.ID)
+		require.NoError(t, err)
+
+		_, err = client.Group(ctx, group1.ID)
+		require.Error(t, err)
+		cerr, ok := codersdk.AsError(err)
+		require.True(t, ok)
+		require.Equal(t, http.StatusNotFound, cerr.StatusCode())
+	})
+}
diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -95,3 +95,19 @@ func (c *Client) PatchGroup(ctx context.Context, group uuid.UUID, req PatchGroup
 	var resp Group
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
+
+func (c *Client) DeleteGroup(ctx context.Context, group uuid.UUID) error {
+	res, err := c.Request(ctx, http.MethodDelete,
+		fmt.Sprintf("/api/v2/groups/%s", group.String()),
+		nil,
+	)
+	if err != nil {
+		return xerrors.Errorf("make request: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return readBodyAsError(res)
+	}
+	return nil
+}
