expose uid and id on folder, add NewDashboard method to accept folderId

Author: Gordon Irving

dashboard.go

@@ -15,15 +15,20 @@ type DashboardMeta struct {
 
 type DashboardSaveResponse struct {
 	Slug    string `json:"slug"`
+	Id      int64  `json:"id"`
+	Uid     string `json:"uid"`
 	Status  string `json:"status"`
 	Version int64  `json:"version"`
 }
 
 type Dashboard struct {
-	Meta  DashboardMeta          `json:"meta"`
-	Model map[string]interface{} `json:"dashboard"`
+	Meta      DashboardMeta          `json:"meta"`
+	Model     map[string]interface{} `json:"dashboard"`
+	Folder    int64                  `json:"folderId"`
+	Overwrite bool                   `json:overwrite`
 }
 
+// Deprecated: use NewDashboard instead
 func (c *Client) SaveDashboard(model map[string]interface{}, overwrite bool) (*DashboardSaveResponse, error) {
 	wrapper := map[string]interface{}{
 		"dashboard": model,
@@ -38,6 +43,35 @@ func (c *Client) SaveDashboard(model map[string]interface{}, overwrite bool) (*D
 		return nil, err
 	}
 
+	resp, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	if resp.StatusCode != 200 {
+		data, _ = ioutil.ReadAll(resp.Body)
+		return nil, fmt.Errorf("status: %d, body: %s", resp.StatusCode, data)
+	}
+
+	data, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	result := &DashboardSaveResponse{}
+	err = json.Unmarshal(data, &result)
+	return result, err
+}
+
+func (c *Client) NewDashboard(dashboard Dashboard) (*DashboardSaveResponse, error) {
+	data, err := json.Marshal(dashboard)
+	if err != nil {
+		return nil, err
+	}
+	req, err := c.newRequest("POST", "/api/dashboards/db", nil, bytes.NewBuffer(data))
+	if err != nil {
+		return nil, err
+	}
+
 	resp, err := c.Do(req)
 	if err != nil {
 		return nil, err

folder.go

@@ -10,6 +10,7 @@ import (
 
 type Folder struct {
 	Id    int64  `json:"id"`
+	Uid   string `json:"uid"`
 	Title string `json:"title"`
 }
 
@@ -56,44 +57,40 @@ func (c *Client) Folder(id int64) (Folder, error) {
 	return folder, err
 }
 
-func (c *Client) NewFolder(name string) (int64, error) {
+func (c *Client) NewFolder(title string) (Folder, error) {
+	folder := Folder{}
 	dataMap := map[string]string{
-		"name": name,
+		"title": title,
 	}
 	data, err := json.Marshal(dataMap)
-	id := int64(0)
 	req, err := c.newRequest("POST", "/api/folders", nil, bytes.NewBuffer(data))
 	if err != nil {
-		return id, err
+		return folder, err
 	}
 	resp, err := c.Do(req)
 	if err != nil {
-		return id, err
+		return folder, err
 	}
 	if resp.StatusCode != 200 {
-		return id, errors.New(resp.Status)
+		return folder, errors.New(resp.Status)
 	}
 	data, err = ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return id, err
+		return folder, err
 	}
-	tmp := struct {
-		Id int64 `json:"id"`
-	}{}
-	err = json.Unmarshal(data, &tmp)
+	err = json.Unmarshal(data, &folder)
 	if err != nil {
-		return id, err
+		return folder, err
 	}
-	id = tmp.Id
-	return id, err
+	return folder, err
 }
 
-func (c *Client) UpdateFolder(id int64, name string) error {
+func (c *Client) UpdateFolder(id string, name string) error {
 	dataMap := map[string]string{
 		"name": name,
 	}
 	data, err := json.Marshal(dataMap)
-	req, err := c.newRequest("PUT", fmt.Sprintf("/api/folders/%d", id), nil, bytes.NewBuffer(data))
+	req, err := c.newRequest("PUT", fmt.Sprintf("/api/folders/%s", id), nil, bytes.NewBuffer(data))
 	if err != nil {
 		return err
 	}
@@ -107,8 +104,8 @@ func (c *Client) UpdateFolder(id int64, name string) error {
 	return err
 }
 
-func (c *Client) DeleteFolder(id int64) error {
-	req, err := c.newRequest("DELETE", fmt.Sprintf("/api/folders/%d", id), nil, nil)
+func (c *Client) DeleteFolder(id string) error {
+	req, err := c.newRequest("DELETE", fmt.Sprintf("/api/folders/%s", id), nil, nil)
 	if err != nil {
 		return err
 	}

folder_test.go

@@ -130,7 +130,7 @@ func TestNewFolder(t *testing.T) {
 
 	t.Log(pretty.PrettyFormat(resp))
 
-	if resp != 1 {
+	if resp.Uid != "nErXDvCkzz" {
 		t.Error("Not correctly parsing returned creation message.")
 	}
 }
@@ -139,7 +139,7 @@ func TestUpdateFolder(t *testing.T) {
 	server, client := gapiTestTools(200, updatedFolderJSON)
 	defer server.Close()
 
-	err := client.UpdateFolder(int64(1), "test-folder")
+	err := client.UpdateFolder("nErXDvCkzz", "test-folder")
 	if err != nil {
 		t.Error(err)
 	}
@@ -149,7 +149,7 @@ func TestDeleteFolder(t *testing.T) {
 	server, client := gapiTestTools(200, deletedFolderJSON)
 	defer server.Close()
 
-	err := client.DeleteFolder(int64(1))
+	err := client.DeleteFolder("nErXDvCkzz")
 	if err != nil {
 		t.Error(err)
 	}