route filter improvement

This commit is contained in:
Pedro Nasser
2016-08-13 19:25:07 -03:00
parent 680bd08137
commit c5025142bf
8 changed files with 96 additions and 12 deletions

View File

@@ -15,17 +15,20 @@ func handleRouteList(c *gin.Context) {
ctx := c.MustGet("ctx").(context.Context)
log := titancommon.Logger(ctx)
appName := c.Param("app")
filter := &models.RouteFilter{
AppName: appName,
}
filter := &models.RouteFilter{}
if img := c.Query("image"); img != "" {
filter.Image = img
}
routes, err := Api.Datastore.GetRoutes(filter)
var routes []*models.Route
var err error
if app := c.Param("app"); app != "" {
routes, err = Api.Datastore.GetRoutesByApp(app, filter)
} else {
routes, err = Api.Datastore.GetRoutes(filter)
}
if err != nil {
log.WithError(err).Error(models.ErrRoutesGet)
c.JSON(http.StatusInternalServerError, simpleError(models.ErrRoutesGet))