From 89b27b35ba894aea7084f6663fad98b2b0f58805 Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Thu, 16 Nov 2017 16:18:03 +0100
Subject: [PATCH] fix: Use Response as return type

---
 pkg/api/annotations.go | 35 +++++++++++++----------------------
 pkg/api/api.go         |  4 ++--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
index db1a2f668ae..32a0a3035d3 100644
--- a/pkg/api/annotations.go
+++ b/pkg/api/annotations.go
@@ -49,13 +49,12 @@ func (e *CreateAnnotationError) Error() string {
 	return e.message
 }
 
-func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) {
+func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) Response {
 	repo := annotations.GetRepository()
 
 	if cmd.Text == "" {
 		err := &CreateAnnotationError{"text field should not be empty"}
-		c.JsonApiErr(500, "Failed to save annotation", err)
-		return
+		return ApiError(500, "Failed to save annotation", err)
 	}
 
 	item := annotations.Item{
@@ -74,8 +73,7 @@ func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) {
 	}
 
 	if err := repo.Save(&item); err != nil {
-		c.JsonApiErr(500, "Failed to save annotation", err)
-		return
+		return ApiError(500, "Failed to save annotation", err)
 	}
 
 	startID := item.Id
@@ -89,27 +87,24 @@ func PostAnnotation(c *middleware.Context, cmd dtos.PostAnnotationsCmd) {
 		}
 
 		if err := repo.Update(&item); err != nil {
-			c.JsonApiErr(500, "Failed set regionId on annotation", err)
-			return
+			return ApiError(500, "Failed set regionId on annotation", err)
 		}
 
 		item.Id = 0
 		item.Epoch = cmd.TimeEnd / 1000
 
 		if err := repo.Save(&item); err != nil {
-			c.JsonApiErr(500, "Failed save annotation for region end time", err)
-			return
+			return ApiError(500, "Failed save annotation for region end time", err)
 		}
 
-		c.JSON(200, util.DynMap{
+		return Json(200, util.DynMap{
 			"message": "Annotation added",
 			"id":      startID,
 			"endId":   item.Id,
 		})
-		return
 	}
 
-	c.JSON(200, util.DynMap{
+	return Json(200, util.DynMap{
 		"message": "Annotation added",
 		"id":      startID,
 	})
@@ -123,13 +118,12 @@ func formatGraphiteAnnotation(what string, data string) string {
 	return text
 }
 
-func PostGraphiteAnnotation(c *middleware.Context, cmd dtos.PostGraphiteAnnotationsCmd) {
+func PostGraphiteAnnotation(c *middleware.Context, cmd dtos.PostGraphiteAnnotationsCmd) Response {
 	repo := annotations.GetRepository()
 
 	if cmd.What == "" {
 		err := &CreateAnnotationError{"what field should not be empty"}
-		c.JsonApiErr(500, "Failed to save Graphite annotation", err)
-		return
+		return ApiError(500, "Failed to save Graphite annotation", err)
 	}
 
 	if cmd.When == 0 {
@@ -152,14 +146,12 @@ func PostGraphiteAnnotation(c *middleware.Context, cmd dtos.PostGraphiteAnnotati
 				tagsArray = append(tagsArray, tagStr)
 			} else {
 				err := &CreateAnnotationError{"tag should be a string"}
-				c.JsonApiErr(500, "Failed to save Graphite annotation", err)
-				return
+				return ApiError(500, "Failed to save Graphite annotation", err)
 			}
 		}
 	default:
 		err := &CreateAnnotationError{"unsupported tags format"}
-		c.JsonApiErr(500, "Failed to save Graphite annotation", err)
-		return
+		return ApiError(500, "Failed to save Graphite annotation", err)
 	}
 
 	item := annotations.Item{
@@ -171,11 +163,10 @@ func PostGraphiteAnnotation(c *middleware.Context, cmd dtos.PostGraphiteAnnotati
 	}
 
 	if err := repo.Save(&item); err != nil {
-		c.JsonApiErr(500, "Failed to save Graphite annotation", err)
-		return
+		return ApiError(500, "Failed to save Graphite annotation", err)
 	}
 
-	c.JSON(200, util.DynMap{
+	return Json(200, util.DynMap{
 		"message": "Graphite annotation added",
 		"id":      item.Id,
 	})
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 75ad23fbb21..ba5e7ae4e10 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -288,11 +288,11 @@ func (hs *HttpServer) registerRoutes() {
 		apiRoute.Post("/annotations/mass-delete", reqOrgAdmin, bind(dtos.DeleteAnnotationsCmd{}), wrap(DeleteAnnotations))
 
 		apiRoute.Group("/annotations", func(annotationsRoute RouteRegister) {
-			annotationsRoute.Post("/", bind(dtos.PostAnnotationsCmd{}), PostAnnotation)
+			annotationsRoute.Post("/", bind(dtos.PostAnnotationsCmd{}), wrap(PostAnnotation))
 			annotationsRoute.Delete("/:annotationId", wrap(DeleteAnnotationById))
 			annotationsRoute.Put("/:annotationId", bind(dtos.UpdateAnnotationsCmd{}), wrap(UpdateAnnotation))
 			annotationsRoute.Delete("/region/:regionId", wrap(DeleteAnnotationRegion))
-			annotationsRoute.Post("/graphite", bind(dtos.PostGraphiteAnnotationsCmd{}), PostGraphiteAnnotation)
+			annotationsRoute.Post("/graphite", bind(dtos.PostGraphiteAnnotationsCmd{}), wrap(PostGraphiteAnnotation))
 		}, reqEditorRole)
 
 		// error test