From 7b230232b87012ce99fe3dddcc87f6aa18737ee5 Mon Sep 17 00:00:00 2001
From: Pedro Nasser <pedronasser@gmail.com>
Date: Tue, 30 Aug 2016 13:42:55 -0300
Subject: [PATCH] standard route response

---
 api/server/apps_create.go   |  2 +-
 api/server/apps_get.go      |  2 +-
 api/server/apps_list.go     |  2 +-
 api/server/apps_update.go   |  2 +-
 api/server/helpers.go       | 16 ++++++++--------
 api/server/routes_create.go |  2 +-
 api/server/routes_get.go    |  2 +-
 api/server/routes_list.go   |  2 +-
 api/server/routes_update.go |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/api/server/apps_create.go b/api/server/apps_create.go
index ffbbbac91..3577b0b8e 100644
--- a/api/server/apps_create.go
+++ b/api/server/apps_create.go
@@ -56,5 +56,5 @@ func handleAppCreate(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusCreated, appResponse{"App successfully created", wapp})
+	c.JSON(http.StatusCreated, appResponse{"App successfully created", wapp.App})
 }
diff --git a/api/server/apps_get.go b/api/server/apps_get.go
index 23514f07a..f4cc59c89 100644
--- a/api/server/apps_get.go
+++ b/api/server/apps_get.go
@@ -29,5 +29,5 @@ func handleAppGet(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, &models.AppWrapper{app})
+	c.JSON(http.StatusOK, appResponse{"Successfully loaded app", app})
 }
diff --git a/api/server/apps_list.go b/api/server/apps_list.go
index ad74a7f5a..acce3cb10 100644
--- a/api/server/apps_list.go
+++ b/api/server/apps_list.go
@@ -23,5 +23,5 @@ func handleAppList(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, &models.AppsWrapper{apps})
+	c.JSON(http.StatusOK, appsResponse{"Successfully listed applications", apps})
 }
diff --git a/api/server/apps_update.go b/api/server/apps_update.go
index 22192321a..a805ab2d2 100644
--- a/api/server/apps_update.go
+++ b/api/server/apps_update.go
@@ -39,5 +39,5 @@ func handleAppUpdate(c *gin.Context) {
 	wapp.App = app
 
 	// Nothing to update right now in apps
-	c.JSON(http.StatusOK, appResponse{"App successfully updated", wapp})
+	c.JSON(http.StatusOK, appResponse{"App successfully updated", wapp.App})
 }
diff --git a/api/server/helpers.go b/api/server/helpers.go
index be4facbda..561c6f9a1 100644
--- a/api/server/helpers.go
+++ b/api/server/helpers.go
@@ -17,23 +17,23 @@ import (
 )
 
 type appResponse struct {
-	Message string
-	App     models.AppWrapper
+	Message string      `json:"message"`
+	App     *models.App `json:"app"`
 }
 
 type appsResponse struct {
-	Message string
-	Apps    models.AppsWrapper
+	Message string      `json:"message"`
+	Apps    models.Apps `json:"apps"`
 }
 
 type routeResponse struct {
-	Message string
-	Route   models.RouteWrapper
+	Message string        `json:"message"`
+	Route   *models.Route `json:"route"`
 }
 
 type routesResponse struct {
-	Message string
-	Routes  models.RoutesWrapper
+	Message string        `json:"message"`
+	Routes  models.Routes `json:"routes"`
 }
 
 func testRouter() *gin.Engine {
diff --git a/api/server/routes_create.go b/api/server/routes_create.go
index b3d3c8c9b..4cdf55c87 100644
--- a/api/server/routes_create.go
+++ b/api/server/routes_create.go
@@ -75,5 +75,5 @@ func handleRouteCreate(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusCreated, routeResponse{"Route successfully created", wroute})
+	c.JSON(http.StatusCreated, routeResponse{"Route successfully created", wroute.Route})
 }
diff --git a/api/server/routes_get.go b/api/server/routes_get.go
index 9273a6531..83255a246 100644
--- a/api/server/routes_get.go
+++ b/api/server/routes_get.go
@@ -33,5 +33,5 @@ func handleRouteGet(c *gin.Context) {
 
 	log.WithFields(logrus.Fields{"route": route}).Debug("Got route")
 
-	c.JSON(http.StatusOK, &models.RouteWrapper{route})
+	c.JSON(http.StatusOK, routeResponse{"Successfully loaded route", route})
 }
diff --git a/api/server/routes_list.go b/api/server/routes_list.go
index 5837f49f2..c5aa4d128 100644
--- a/api/server/routes_list.go
+++ b/api/server/routes_list.go
@@ -37,5 +37,5 @@ func handleRouteList(c *gin.Context) {
 
 	log.WithFields(logrus.Fields{"routes": routes}).Debug("Got routes")
 
-	c.JSON(http.StatusOK, &models.RoutesWrapper{Routes: routes})
+	c.JSON(http.StatusOK, routesResponse{"Sucessfully listed routes", routes})
 }
diff --git a/api/server/routes_update.go b/api/server/routes_update.go
index 5424e952e..cd61c2dcd 100644
--- a/api/server/routes_update.go
+++ b/api/server/routes_update.go
@@ -45,5 +45,5 @@ func handleRouteUpdate(c *gin.Context) {
 		return
 	}
 
-	c.JSON(http.StatusOK, routeResponse{"Route successfully updated", wroute})
+	c.JSON(http.StatusOK, routeResponse{"Route successfully updated", wroute.Route})
 }