Create initial workspaces API

coder · bryphe-coder · Jan 19, 2022 · Jan 19, 2022 · Jan 19, 2022 · Jan 19, 2022
commit 6726f40cf0ddfa7e4ec6bcf876a95d5768343d9c
diff --git a/coderd/api.go b/coderd/api.go
@@ -1,17 +1,17 @@
 package coderd
 
-import "context"
-
 // API offers an HTTP API. Routes are located in routes.go.
 type API struct {
 	// Services.
-	projectService *projectService
+	projectService   *projectService
+	workspaceService *workspaceService
 }
 
 // New returns an instantiated API.
-func NewAPI(ctx context.Context) *API {
+func NewAPI() *API {
 	api := &API{
-		projectService: newProjectService(),
+		projectService:   newProjectService(),
+		workspaceService: newWorkspaceService(),
 	}
 	return api
 }
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -1,7 +1,6 @@
 package coderd
 
 import (
-	"context"
 	"net/http"
 
 	"cdr.dev/slog"
@@ -24,7 +23,7 @@ const (
 
 // New constructs the Coder API into an HTTP handler.
 func New(options *Options) http.Handler {
-	api := NewAPI(context.Background())
+	api := NewAPI()
 	r := chi.NewRouter()
 	r.Route("/api/v2", func(r chi.Router) {
 		r.Get("/", func(w http.ResponseWriter, r *http.Request) {
@@ -43,6 +42,17 @@ func New(options *Options) http.Handler {
 				// TODO: Extract organization and add to context
 				r.Get("/", api.projectService.getProjects)
 				r.Post("/", api.projectService.createProject)
+
+				r.Get("/{projectId}", api.projectService.getProjectById)
+				// TODO: Get project by id
+			})
+		})
+
+		// Workspaces endpoint
+		r.Route("/workspaces", func(r chi.Router) {
+			r.Route("/{organization}", func(r chi.Router) {
+				r.Get("/", api.workspaceService.getWorkspaces)
+				r.Get("/{projectId}", api.workspaceService.getWorkspaceById)
 			})
 		})
 

diff --git a/coderd/projects.go b/coderd/projects.go
@@ -36,9 +36,7 @@ func newProjectService() *projectService {
 }
 
 func (ps *projectService) getProjects(w http.ResponseWriter, r *http.Request) {
-
 	// Construct a couple hard-coded projects to return the UI
-
 	terraformProject := Project{
 		Id:          "test_terraform_project_id",
 		Name:        "Terraform",
@@ -81,6 +79,11 @@ func (ps *projectService) getProjects(w http.ResponseWriter, r *http.Request) {
 	xjson.Write(w, http.StatusOK, projects)
 }
 
+func (ps *projectService) getProjectById(w http.ResponseWriter, r *http.Request) {
+	// TODO: Get a project by id
+	xjson.Write(w, http.StatusNotFound, nil)
+}
+
 func (ps *projectService) createProject(w http.ResponseWriter, r *http.Request) {
 	// TODO: Validate arguments
 	// Organization context

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -0,0 +1,48 @@
+package coderd
+
+import (
+	"net/http"
+
+	"github.com/coder/coder/xjson"
+)
+
+type Workspace struct {
+	Id        string `json:"id" validate:"required"`
+	Name      string `json:"name" validate:"required"`
+	ProjectId string `json:"project_id" validate:"required"`
+}
+
+// Placeholder type of workspaceService
+type workspaceService struct {
+}
+
+func newWorkspaceService() *workspaceService {
+	workspaceService := &workspaceService{}
+	return workspaceService
+}
+
+func (ws *workspaceService) getWorkspaces(w http.ResponseWriter, r *http.Request) {
+	// Dummy workspace to return
+	workspace := Workspace{
+		Id:        "test-workspace",
+		Name:      "Test Workspace",
+		ProjectId: "test-project-id",
+	}
+
+	workspaces := []Workspace{
+		workspace,
+	}
+
+	xjson.Write(w, http.StatusOK, workspaces)
+}
+
+func (ws *workspaceService) getWorkspaceById(w http.ResponseWriter, r *http.Request) {
+	// TODO: Read workspace off context
+	// Dummy workspace to return
+	workspace := Workspace{
+		Id:        "test-workspace",
+		Name:      "Test Workspace",
+		ProjectId: "test-project-id",
+	}
+	xjson.Write(w, http.StatusOK, workspace)
+}