add backend

f0ssel · f0ssel · commit e47b6010e4f7 · 2022-06-02T20:33:24.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -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 {
+			filter.OrganizationID = orgID
 		}
-		filter.OrganizationID = orgID
 	}
 	if ownerFilter == "me" {
 		filter.OwnerID = apiKey.UserID
@@ -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
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
 	"github.com/google/uuid"
@@ -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"`
 }
 
 // asRequestOption returns a function that can be used in (*Client).Request.
@@ -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()
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`	`"encoding/json"`
`6`	`6`	`"fmt"`
`7`	`7`	`"net/http"`
`8`		`- "strconv"`
`9`	`8`	`"time"`
`10`	`9`
`11`	`10`	`"github.com/google/uuid"`
`@@ -199,11 +198,10 @@ func (c *Client) PutExtendWorkspace(ctx context.Context, id uuid.UUID, req PutEx`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`type WorkspaceFilter struct {`
`202`		`- OrganizationID uuid.UUID`
	`201`	+ OrganizationID uuid.UUID `json:"organization_id,omitempty"`
`203`	`202`	`// Owner can be a user_id (uuid), "me", or a username`
`204`		`- Owner string`
`205`		`- Name string`
`206`		`- Deleted bool`
	`203`	+ Owner string `json:"owner,omitempty"`
	`204`	+ Name string `json:"name,omitempty"`
`207`	`205`	`}`
`208`	`206`
`209`	`207`	`// asRequestOption returns a function that can be used in (*Client).Request.`
`@@ -220,9 +218,6 @@ func (f WorkspaceFilter) asRequestOption() requestOption {`
`220`	`218`	`if f.Name != "" {`
`221`	`219`	`q.Set("name", f.Name)`
`222`	`220`	`}`
`223`		`- if f.Deleted {`
`224`		`- q.Set("deleted", strconv.FormatBool(f.Deleted))`
`225`		`- }`
`226`	`221`	`r.URL.RawQuery = q.Encode()`
`227`	`222`	`}`
`228`	`223`	`}`