Jun 3, 2022 · Jun 1, 2022 · Jun 1, 2022 · Jun 1, 2022 · Jun 2, 2022 · Jun 2, 2022
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
 filter := database.GetWorkspacesWithFilterParams{Deleted: false}
 if orgFilter != "" {
 orgID, err := uuid.Parse(orgFilter)
 if err != nil {
 httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 Message: fmt.Sprintf("organization_id must be a uuid: %s", err.Error()),
 })
 return
 if err == nil {
 filter.OrganizationID = orgID
 }
 filter.OrganizationID = orgID
 }
 if ownerFilter == "me" {
 filter.OwnerID = apiKey.UserID
 Username: ownerFilter,
 Email:    ownerFilter,
 })
 if err != nil {
 httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 Message: "owner must be a uuid or username",
 })
 return
 if err == nil {
 filter.OwnerID = user.ID
 }
 userID = user.ID
 } else {
 filter.OwnerID = userID
 }
 filter.OwnerID = userID
 }
 if nameFilter != "" {
 filter.Name = nameFilter
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
 "encoding/json"
 "fmt"
 "net/http"
 "strconv"
 "time"

 "github.com/google/uuid"
 }

 type WorkspaceFilter struct {
 OrganizationID uuid.UUID
 OrganizationID uuid.UUID `json:"organization_id,omitempty"`
 // Owner can be a user_id (uuid), "me", or a username
 Owner   string
 Name    string
 Deleted bool
 Owner string `json:"owner,omitempty"`
 Name  string `json:"name,omitempty"`
 }

 // asRequestOption returns a function that can be used in (*Client).Request.
 if f.Name != "" {
 q.Set("name", f.Name)
 }
 if f.Deleted {
 q.Set("deleted", strconv.FormatBool(f.Deleted))
 }
 r.URL.RawQuery = q.Encode()
 }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -142,13 +142,9 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {
		filter := database.GetWorkspacesWithFilterParams{Deleted: false}
		if orgFilter != "" {
		orgID, err := uuid.Parse(orgFilter)
		if err != nil {
		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
		Message: fmt.Sprintf("organization_id must be a uuid: %s", err.Error()),
		})
		return
		if err == nil {
f0ssel marked this conversation as resolved. Show resolvedHide resolved
		filter.OrganizationID = orgID
		}
		filter.OrganizationID = orgID
		}
		if ownerFilter == "me" {
		filter.OwnerID = apiKey.UserID
Expand All		@@ -161,15 +157,12 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {
		Username: ownerFilter,
		Email: ownerFilter,
		})
		if err != nil {
		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
		Message: "owner must be a uuid or username",
		})
		return
		if err == nil {
		filter.OwnerID = user.ID
		}
		userID = user.ID
		} else {
		filter.OwnerID = userID
		}
		filter.OwnerID = userID
		}
		if nameFilter != "" {
		filter.Name = nameFilter
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@ import (
		"encoding/json"
		"fmt"
		"net/http"
		"strconv"
		"time"

		"github.com/google/uuid"
Expand DownExpand Up		@@ -199,11 +198,10 @@ func (c *Client) PutExtendWorkspace(ctx context.Context, id uuid.UUID, req PutEx
		}

		type WorkspaceFilter struct {
		OrganizationID uuid.UUID
		OrganizationID uuid.UUID `json:"organization_id,omitempty"`
		// Owner can be a user_id (uuid), "me", or a username
		Owner string
		Name string
		Deleted bool
		Owner string `json:"owner,omitempty"`
		Name string `json:"name,omitempty"`
f0ssel marked this conversation as resolved. Show resolvedHide resolved
		}

		// asRequestOption returns a function that can be used in (*Client).Request.
Expand All		@@ -220,9 +218,6 @@ func (f WorkspaceFilter) asRequestOption() requestOption {
		if f.Name != "" {
		q.Set("name", f.Name)
		}
		if f.Deleted {
		q.Set("deleted", strconv.FormatBool(f.Deleted))
		}
		r.URL.RawQuery = q.Encode()
		}
		}
Expand Down