Clean up api and mocks

presleyp · presleyp · commit 0e2315c851d8 · 2022-03-22T21:52:09.000Z
diff --git a/site/src/api/index.ts b/site/src/api/index.ts
@@ -17,26 +17,6 @@ export const provisioners: Types.Provisioner[] = [
   },
 ]
 
-export namespace Project {
-  export const create = async (request: Types.CreateProjectRequest): Promise<Types.Project> => {
-    const response = await fetch(`/api/v2/projects/${request.organizationId}/`, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(request),
-    })
-
-    const body = await response.json()
-    await mutate("/api/v2/projects")
-    if (!response.ok) {
-      throw new Error(body.message)
-    }
-
-    return body
-  }
-}
-
 export namespace Workspace {
   export const create = async (request: Types.CreateWorkspaceRequest): Promise<Types.Workspace> => {
     const response = await fetch(`/api/v2/users/me/workspaces`, {
diff --git a/site/src/test_helpers/entities.ts b/site/src/test_helpers/entities.ts
@@ -39,5 +39,5 @@ export const MockWorkspace: Workspace = {
   created_at: "",
   updated_at: "",
   project_id: MockProject.id,
-  owner_id: MockUser.id
+  owner_id: MockUser.id,
 }
diff --git a/site/src/test_helpers/handlers.ts b/site/src/test_helpers/handlers.ts
@@ -2,25 +2,24 @@ import { rest } from "msw"
 import * as M from "./entities"
 
 export const handlers = [
-  rest.post("/api/v2/users/me/workspaces", async (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(M.MockWorkspace))
-  }),
-  rest.get("/api/v2/projects/:organizationId", async (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(M.MockProject))
+  // organizations
+  rest.get("/api/v2/organizations/:organizationId", async (req, res, ctx) => {
+    return res(ctx.status(200), ctx.json(M.MockOrganization))
   }),
-  rest.get("/api/v2/users/me/organizations/:organizationId", async (req, res, ctx) => {
+  rest.get("/api/v2/organizations/:organizationId/projects/:projectId", async (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(M.MockProject))
   }),
-  rest.get("/api/v2/workspaces/:workspaceId", async (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(M.MockWorkspace))
-  }),
+
+  // projects
   rest.get("/api/v2/projects/:projectId", async (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(M.MockProject))
   }),
-  rest.get("/api/v2/organizations/:organizationId", async (req, res, ctx) => {
-    return res(ctx.status(200), ctx.json(M.MockOrganization))
+
+  // users
+  rest.post("/api/v2/users/me/workspaces", async (req, res, ctx) => {
+    return res(ctx.status(200), ctx.json(M.MockWorkspace))
   }),
-  rest.get("/api/v2/organizations/:organizationId/projects/:projectId", async (req, res, ctx) => {
+  rest.get("/api/v2/users/me/organizations/:organizationId", async (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(M.MockOrganization))
   }),
   rest.post("/api/v2/users/login", async (req, res, ctx) => {
@@ -35,4 +34,9 @@ export const handlers = [
   rest.get("/api/v2/users/me/keys", async (req, res, ctx) => {
     return res(ctx.status(200), ctx.json(M.MockAPIKey))
   }),
+
+  // workspaces
+  rest.get("/api/v2/workspaces/:workspaceId", async (req, res, ctx) => {
+    return res(ctx.status(200), ctx.json(M.MockWorkspace))
+  }),
 ]

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ export const MockWorkspace: Workspace = {`
`39`	`39`	`created_at: "",`
`40`	`40`	`updated_at: "",`
`41`	`41`	`project_id: MockProject.id,`
`42`		`- owner_id: MockUser.id`
	`42`	`+ owner_id: MockUser.id,`
`43`	`43`	`}`