Commite47b601

committed

add backend

1 parent6a6a7e6 commite47b601Copy full SHA for e47b601

File tree

-21

lines changed

-21

lines changed

Lines changed: 6 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,13 +142,9 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {`
`142`	`142`	`filter:= database.GetWorkspacesWithFilterParams{Deleted:false}`
`143`	`143`	`iforgFilter!="" {`
`144`	`144`	`orgID,err:=uuid.Parse(orgFilter)`
`145`		`-iferr!=nil {`
`146`		`-httpapi.Write(rw,http.StatusBadRequest, httpapi.Response{`
`147`		`-Message:fmt.Sprintf("organization_id must be a uuid: %s",err.Error()),`
`148`		`-})`
`149`		`-return`
	`145`	`+iferr==nil {`
	`146`	`+filter.OrganizationID=orgID`
`150`	`147`	`}`
`151`		`-filter.OrganizationID=orgID`
`152`	`148`	`}`
`153`	`149`	`ifownerFilter=="me" {`
`154`	`150`	`filter.OwnerID=apiKey.UserID`
`@@ -161,15 +157,12 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {`
`161`	`157`	`Username:ownerFilter,`
`162`	`158`	`Email:ownerFilter,`
`163`	`159`	`})`
`164`		`-iferr!=nil {`
`165`		`-httpapi.Write(rw,http.StatusBadRequest, httpapi.Response{`
`166`		`-Message:"owner must be a uuid or username",`
`167`		`-})`
`168`		`-return`
	`160`	`+iferr==nil {`
	`161`	`+filter.OwnerID=user.ID`
`169`	`162`	`}`
`170`		`-userID=user.ID`
	`163`	`+}else {`
	`164`	`+filter.OwnerID=userID`
`171`	`165`	`}`
`172`		`-filter.OwnerID=userID`
`173`	`166`	`}`
`174`	`167`	`ifnameFilter!="" {`
`175`	`168`	`filter.Name=nameFilter`

Lines changed: 3 additions & 8 deletions

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`	`typeWorkspaceFilterstruct {`
`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`		`-Ownerstring`
`205`		`-Namestring`
`206`		`-Deletedbool`
	`203`	+Ownerstring`json:"owner,omitempty"`
	`204`	+Namestring`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`	`iff.Name!="" {`
`221`	`219`	`q.Set("name",f.Name)`
`222`	`220`	`}`
`223`		`-iff.Deleted {`
`224`		`-q.Set("deleted",strconv.FormatBool(f.Deleted))`
`225`		`-}`
`226`	`221`	`r.URL.RawQuery=q.Encode()`
`227`	`222`	`}`
`228`	`223`	`}`

Comments

(0)