Feature/add kubernetes deployment migration

src/backend/common/query.go

@@ -4,13 +4,17 @@ type QueryParam struct {
 	PageNo   int64                  `json:"pageNo"`
 	PageSize int64                  `json:"pageSize"`
 	Query    map[string]interface{} `json:"query"`
-	Sortby   []string               `json:"sortby"`
+	Sortby   string                 `json:"sortby"`
 	Groupby  []string               `json:"groupby"`
 	Relate   string                 `json:"relate"`
 }
 
 func (q *QueryParam) Offset() int64 {
-	return (q.PageNo - 1) * q.PageSize
+	offset := (q.PageNo - 1) * q.PageSize
+	if offset < 0 {
+		offset = 0
+	}
+	return offset
 }
 
 func (q *QueryParam) Limit() int64 {

src/backend/controllers/base/api.go

@@ -1,52 +1,15 @@
 package base
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
-	"strings"
 
-	"github.com/Qihoo360/wayne/src/backend/common"
 	"github.com/Qihoo360/wayne/src/backend/models"
-	"github.com/Qihoo360/wayne/src/backend/util/hack"
 	"github.com/Qihoo360/wayne/src/backend/util/logs"
-	"github.com/Qihoo360/wayne/src/backend/util/slice"
 	"github.com/astaxie/beego/orm"
-	"github.com/go-sql-driver/mysql"
-	"k8s.io/apimachinery/pkg/api/errors"
 )
 
-const (
-	defaultPageNo   = 1
-	defaultPageSize = 10
-)
-
-type Result struct {
-	Data interface{} `json:"data"`
-}
-
-type ErrorSubCode int
-
-const (
-	ErrorSubCodeInsufficientResource = 403001
-)
-
-var _ error = &ErrorResult{}
-
-// Error implements the Error interface.
-func (e *ErrorResult) Error() string {
-	return fmt.Sprintf("code:%d,subCode:%d,msg:%s", e.Code, e.SubCode, e.Msg)
-}
-
-type ErrorResult struct {
-	// http code
-	Code int `json:"code"`
-	// The custom code
-	SubCode int    `json:"subCode"`
-	Msg     string `json:"msg"`
-}
-
 type APIController struct {
 	LoggedInController
 
@@ -117,239 +80,38 @@ func (c *APIController) CheckPermission(perType string, perAction string) {
 func (c *APIController) Success(data interface{}) {
 	c.publishRequestMessage(http.StatusOK, data)
 
-	c.Ctx.Output.SetStatus(http.StatusOK)
-	c.Data["json"] = Result{Data: data}
-	c.ServeJSON()
+	c.ResultHandlerController.Success(data)
 }
 
 // Abort stops controller handler and show the error data， e.g. Prepare
 func (c *APIController) AbortForbidden(msg string) {
 	c.publishRequestMessage(http.StatusForbidden, msg)
 
-	logs.Info("Abort Forbidden error. %s", msg)
-	c.CustomAbort(http.StatusForbidden, hack.String(c.ErrorResult(http.StatusForbidden, msg)))
+	c.ResultHandlerController.AbortForbidden(msg)
 }
 
 func (c *APIController) AbortInternalServerError(msg string) {
 	c.publishRequestMessage(http.StatusInternalServerError, msg)
 
-	logs.Error("Abort InternalServerError error. %s", msg)
-	c.CustomAbort(http.StatusInternalServerError, hack.String(c.ErrorResult(http.StatusInternalServerError, msg)))
+	c.ResultHandlerController.AbortInternalServerError(msg)
 }
 
 func (c *APIController) AbortBadRequest(msg string) {
 	c.publishRequestMessage(http.StatusBadRequest, msg)
 
-	logs.Info("Abort BadRequest error. %s", msg)
-	c.CustomAbort(http.StatusBadRequest, hack.String(c.ErrorResult(http.StatusBadRequest, msg)))
-}
-
-// format BadRequest with param name.
-func (c *APIController) AbortBadRequestFormat(paramName string) {
-	msg := fmt.Sprintf("Invalid param %s !", paramName)
-	c.AbortBadRequest(msg)
+	c.ResultHandlerController.AbortBadRequest(msg)
 }
 
 func (c *APIController) AbortUnauthorized(msg string) {
 	c.publishRequestMessage(http.StatusUnauthorized, msg)
 
-	logs.Info("Abort Unauthorized error. %s", msg)
-	c.CustomAbort(http.StatusUnauthorized, hack.String(c.ErrorResult(http.StatusUnauthorized, msg)))
-
-}
+	c.ResultHandlerController.AbortUnauthorized(msg)
 
-func (c *APIController) ErrorResult(code int, msg string) []byte {
-	errorResult := ErrorResult{
-		Code: code,
-		Msg:  msg,
-	}
-	body, err := json.Marshal(errorResult)
-	if err != nil {
-		logs.Error("Json Marshal error. %v", err)
-		c.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
-	}
-	return body
 }
 
 // Handle return http code and body normally, need return
 func (c *APIController) HandleError(err error) {
-	errorResult := &ErrorResult{
-		Code: http.StatusInternalServerError,
-	}
-	switch e := err.(type) {
-	// deal with kubernetes errors
-	case errors.APIStatus:
-		errorResult.Code = int(e.Status().Code)
-		errorResult.SubCode = errorResult.Code
-		errorResult.Msg = e.Status().Message
-	case *mysql.MySQLError:
-		errorResult.Code = http.StatusBadRequest
-		errorResult.SubCode = int(e.Number)
-		errorResult.Msg = e.Message
-	case *ErrorResult:
-		errorResult = e
-	default:
-		if err == orm.ErrNoRows {
-			errorResult.Code = http.StatusNotFound
-		}
-		errorResult.SubCode = errorResult.Code
-		errorResult.Msg = http.StatusText(errorResult.Code)
-	}
-
-	if errorResult.Code >= http.StatusInternalServerError {
-		logs.Error("System error. %v", err)
-	} else {
-		logs.Info("Info error. %v", err)
-	}
-
-	c.Ctx.Output.SetStatus(errorResult.Code)
-
-	body, err := json.Marshal(errorResult)
-	if err != nil {
-		logs.Error("Json Marshal error. %v", err)
-		c.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
-	}
-
-	c.Ctx.Output.Body(body)
-
-	c.publishRequestMessage(errorResult.Code, err)
-}
-
-// TODO: 需要重构成独立的Controller，参考Django的generic views设计
-func (c *APIController) BuildQueryParam() *common.QueryParam {
-	pageNo := c.Input().Get("pageNo")
-	pageSize := c.Input().Get("pageSize")
-	if pageNo == "" {
-		pageNo = strconv.Itoa(defaultPageNo)
-	}
-
-	if pageSize == "" {
-		pageSize = strconv.Itoa(defaultPageSize)
-	}
-
-	no, err := strconv.ParseInt(pageNo, 10, 64)
-	if err != nil {
-		c.AbortBadRequest("Invalid pageNo in query.")
-	}
-	size, err := strconv.ParseInt(pageSize, 10, 64)
-	if err != nil {
-		c.AbortBadRequest("Invalid pageSize in query.")
-	}
-
-	qmap := map[string]interface{}{}
-	deletedStr := c.Input().Get("deleted")
-	if deletedStr != "" {
-		deleted, err := strconv.ParseBool(deletedStr)
-		if err != nil {
-			c.AbortBadRequest("Invalid deleted in query.")
-		}
-		qmap["deleted"] = deleted
-	}
-
-	filter := c.Input().Get("filter")
-	if filter != "" {
-		filters := strings.Split(filter, ",")
-		for _, param := range filters {
-			params := strings.Split(param, "=")
-			if len(params) != 2 {
-				continue
-			}
-			key, value := params[0], params[1]
-			// 兼容在filter中使用deleted参数
-			if key == "deleted" {
-				deleted, err := strconv.ParseBool(value)
-				if err != nil {
-					continue
-				}
-				qmap[key] = deleted
-				continue
-			}
-			qmap[params[0]] = params[1]
-		}
-	}
-
-	relate := ""
-	if c.Input().Get("relate") != "" {
-		relate = c.Input().Get("relate")
-	}
-
-	var sortbys []string
-	sortby := c.Input().Get("sortby")
-	if sortby != "" {
-		sortbys = slice.CamelToSnake(strings.Split(sortby, ","))
-	}
-
-	return &common.QueryParam{PageNo: no, PageSize: size, Query: qmap, Sortby: sortbys, Relate: relate}
-}
-
-func (c *APIController) GetIDFromURL() int64 {
-	return c.GetIntParamFromURL(":id")
-}
-
-func (c *APIController) GetIntParamFromURL(param string) int64 {
-	paramStr := c.Ctx.Input.Param(param)
-	if len(paramStr) == 0 {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in URL", param))
-	}
-
-	paramInt, err := strconv.ParseInt(paramStr, 10, 64)
-	if err != nil || paramInt < 0 {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in URL", param))
-	}
-
-	return paramInt
-}
-
-func (c *APIController) GetIntParamFromQuery(param string) int64 {
-	paramStr := c.Input().Get(param)
-	if len(paramStr) == 0 {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in Query", param))
-	}
-
-	paramInt, err := strconv.ParseInt(paramStr, 10, 64)
-	if err != nil || paramInt < 0 {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in Query", param))
-	}
-
-	return paramInt
-}
-
-func (c *APIController) GetBoolParamFromQuery(param string) bool {
-	paramStr := c.Input().Get(param)
-	if len(paramStr) == 0 {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in Query", param))
-	}
-
-	paramBool, err := strconv.ParseBool(paramStr)
-	if err != nil {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in Query", param))
-	}
-
-	return paramBool
-}
-
-func (c *APIController) GetBoolParamFromQueryWithDefault(param string, defaultValue bool) bool {
-	paramStr := c.Input().Get(param)
-	if len(paramStr) == 0 {
-		return defaultValue
-	}
-
-	paramBool, err := strconv.ParseBool(paramStr)
-	if err != nil {
-		c.AbortBadRequest(fmt.Sprintf("Invalid %s in Query", param))
-	}
-
-	return paramBool
-}
-
-func (c *APIController) GetDeleteFromQuery() bool {
-	return c.GetBoolParamFromQueryWithDefault("deleted", false)
-}
-
-func (c *APIController) GetLogicalFromQuery() bool {
-	return c.GetBoolParamFromQueryWithDefault("logical", true)
-}
+	code := c.ResultHandlerController.HandleError(err)
 
-func (c *APIController) GetIsOnlineFromQuery() bool {
-	return c.GetBoolParamFromQueryWithDefault("isOnline", false)
+	c.publishRequestMessage(code, err)
 }

src/backend/controllers/base/const.go

@@ -0,0 +1,12 @@
+package base
+
+const (
+	defaultPageNo   = 1
+	defaultPageSize = 10
+)
+
+type ErrorSubCode int
+
+const (
+	ErrorSubCodeInsufficientResource = 403001
+)

src/backend/controllers/base/logged.go

@@ -11,7 +11,6 @@ import (
 	"github.com/Qihoo360/wayne/src/backend/models"
 	"github.com/Qihoo360/wayne/src/backend/util/hack"
 	"github.com/Qihoo360/wayne/src/backend/util/logs"
-	"github.com/astaxie/beego"
 	"github.com/dgrijalva/jwt-go"
 )
 
@@ -25,7 +24,7 @@ var (
 )
 
 type LoggedInController struct {
-	beego.Controller
+	ParamBuilderController
 
 	User *models.User
 }