chore: code review

deansheather · deansheather · commit 205ea93343b4 · 2022-05-19T06:51:20.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -32,29 +32,28 @@ func (api *api) workspace(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// The `deleted` query parameter (which defaults to `false`) MUST match the
-	// `deleted` field on the workspace otherwise you will get a 410 Gone.
+	// `Deleted` field on the workspace otherwise you will get a 410 Gone.
 	var (
-		deletedStr = r.URL.Query().Get("deleted")
-		deleted    = false
+		deletedStr  = r.URL.Query().Get("deleted")
+		showDeleted = false
 	)
 	if deletedStr != "" {
 		var err error
-		deleted, err = strconv.ParseBool(deletedStr)
+		showDeleted, err = strconv.ParseBool(deletedStr)
 		if err != nil {
 			httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 				Message: fmt.Sprintf("invalid bool for 'deleted' query param: %s", err),
 			})
 			return
 		}
 	}
-	if workspace.Deleted != deleted {
-		if workspace.Deleted {
-			httpapi.Write(rw, http.StatusGone, httpapi.Response{
-				Message: fmt.Sprintf("workspace %q was deleted, you can view this workspace by specifying '?deleted=true' and trying again", workspace.ID.String()),
-			})
-			return
-		}
-
+	if workspace.Deleted && !showDeleted {
+		httpapi.Write(rw, http.StatusGone, httpapi.Response{
+			Message: fmt.Sprintf("workspace %q was deleted, you can view this workspace by specifying '?deleted=true' and trying again", workspace.ID.String()),
+		})
+		return
+	}
+	if !workspace.Deleted && showDeleted {
 		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 			Message: fmt.Sprintf("workspace %q is not deleted, please remove '?deleted=true' and try again", workspace.ID.String()),
 		})
