From db92a96067463258516b171e0b8946fb39dcf4ff Mon Sep 17 00:00:00 2001
From: ryan <ryantxu@gmail.com>
Date: Fri, 23 Mar 2018 11:36:44 +0100
Subject: [PATCH] move dashboard error to API (not sql)

---
 pkg/api/annotations.go      |  5 +++++
 pkg/api/annotations_test.go | 29 +++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
index e17cabb01a1..2c303f22b2b 100644
--- a/pkg/api/annotations.go
+++ b/pkg/api/annotations.go
@@ -63,6 +63,11 @@ func PostAnnotation(c *m.ReqContext, cmd dtos.PostAnnotationsCmd) Response {
 		return ApiError(500, "Failed to save annotation", err)
 	}
 
+	if cmd.DashboardId == 0 {
+		err := &CreateAnnotationError{"Missing DashboardID"}
+		return ApiError(500, "Failed to save annotation", err)
+	}
+
 	item := annotations.Item{
 		OrgId:       c.OrgId,
 		UserId:      c.UserId,
diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
index 7c298550673..bb891e012d2 100644
--- a/pkg/api/annotations_test.go
+++ b/pkg/api/annotations_test.go
@@ -14,10 +14,11 @@ import (
 func TestAnnotationsApiEndpoint(t *testing.T) {
 	Convey("Given an annotation without a dashboard id", t, func() {
 		cmd := dtos.PostAnnotationsCmd{
-			Time:     1000,
-			Text:     "annotation text",
-			Tags:     []string{"tag1", "tag2"},
-			IsRegion: false,
+			DashboardId: 1,
+			Time:        1000,
+			Text:        "annotation text",
+			Tags:        []string{"tag1", "tag2"},
+			IsRegion:    false,
 		}
 
 		updateCmd := dtos.UpdateAnnotationsCmd{
@@ -79,6 +80,26 @@ func TestAnnotationsApiEndpoint(t *testing.T) {
 					So(sc.resp.Code, ShouldEqual, 200)
 				})
 			})
+
+			Convey("Should note be able to save an annotation", func() {
+				cmd := dtos.PostAnnotationsCmd{
+					Time: 1000,
+					Text: "annotation text",
+				}
+				postAnnotationScenario("When calling POST without dashboardId", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+					sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+					So(sc.resp.Code, ShouldEqual, 500)
+				})
+
+				cmd := dtos.PostAnnotationsCmd{
+					Time:        1000,
+					DashboardId: 3,
+				}
+				postAnnotationScenario("When calling POST without text", "/api/annotations", "/api/annotations", role, cmd, func(sc *scenarioContext) {
+					sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
+					So(sc.resp.Code, ShouldEqual, 500)
+				})
+			})
 		})
 	})