From f09a4cc94fef77f5617019783df7e4664eff61ec Mon Sep 17 00:00:00 2001 From: Pedro Nasser Date: Wed, 27 Jul 2016 17:51:23 -0300 Subject: [PATCH] use *Route to bind json route creation --- api/server/router/routes_create.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/server/router/routes_create.go b/api/server/router/routes_create.go index c85c6620a..5733a081e 100644 --- a/api/server/router/routes_create.go +++ b/api/server/router/routes_create.go @@ -12,37 +12,37 @@ func handleRouteCreate(c *gin.Context) { store := c.MustGet("store").(models.Datastore) log := c.MustGet("log").(logrus.FieldLogger) - wroute := &models.RouteWrapper{} + route := &models.Route{} - err := c.BindJSON(wroute) + err := c.BindJSON(route) if err != nil { log.WithError(err).Error(models.ErrInvalidJSON) c.JSON(http.StatusBadRequest, simpleError(models.ErrInvalidJSON)) return } - if wroute.Route == nil { + if route == nil { log.WithError(err).Error(models.ErrInvalidJSON) c.JSON(http.StatusBadRequest, simpleError(models.ErrRoutesMissingNew)) return } - wroute.Route.AppName = c.Param("app") + route.AppName = c.Param("app") - if err := wroute.Validate(); err != nil { + if err := route.Validate(); err != nil { log.Error(err) c.JSON(http.StatusInternalServerError, simpleError(err)) return } - app, err := store.GetApp(wroute.Route.AppName) + app, err := store.GetApp(route.AppName) if err != nil { log.WithError(err).Error(models.ErrAppsGet) c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsGet)) return } if app == nil { - app, err = store.StoreApp(&models.App{Name: wroute.Route.AppName}) + app, err = store.StoreApp(&models.App{Name: route.AppName}) if err != nil { log.WithError(err).Error(models.ErrAppsCreate) c.JSON(http.StatusInternalServerError, simpleError(models.ErrAppsCreate)) @@ -50,7 +50,7 @@ func handleRouteCreate(c *gin.Context) { } } - route, err := store.StoreRoute(wroute.Route) + route, err = store.StoreRoute(route) if err != nil { log.WithError(err).Error(models.ErrRoutesCreate) c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesCreate))