enhance: update gonginx and cosy to latest version

Author: 0xJacky

api/cosy/cosy.go

@@ -14,34 +14,45 @@ func init() {
 }
 
 type Ctx[T any] struct {
-	ctx                   *gin.Context
-	rules                 gin.H
-	Payload               map[string]interface{}
-	Model                 T
-	abort                 bool
-	nextHandler           *gin.HandlerFunc
-	beforeDecodeHookFunc  []func(ctx *Ctx[T])
-	beforeExecuteHookFunc []func(ctx *Ctx[T])
-	executedHookFunc      []func(ctx *Ctx[T])
-	gormScopes            []func(tx *gorm.DB) *gorm.DB
-	preloads              []string
-	scan                  func(tx *gorm.DB) any
-	transformer           func(*T) any
-	permanentlyDelete     bool
-	SelectedFields        []string
-	itemKey               string
+	ctx                      *gin.Context
+	rules                    gin.H
+	Payload                  map[string]interface{}
+	Model                    T
+	OriginModel              T
+	table                    string
+	tableArgs                []interface{}
+	abort                    bool
+	nextHandler              *gin.HandlerFunc
+	skipAssociationsOnCreate bool
+	beforeDecodeHookFunc     []func(ctx *Ctx[T])
+	beforeExecuteHookFunc    []func(ctx *Ctx[T])
+	executedHookFunc         []func(ctx *Ctx[T])
+	gormScopes               []func(tx *gorm.DB) *gorm.DB
+	preloads                 []string
+	scan                     func(tx *gorm.DB) any
+	transformer              func(*T) any
+	permanentlyDelete        bool
+	SelectedFields           []string
+	itemKey                  string
 }
 
 func Core[T any](c *gin.Context) *Ctx[T] {
 	return &Ctx[T]{
-		ctx:                   c,
-		gormScopes:            make([]func(tx *gorm.DB) *gorm.DB, 0),
-		beforeExecuteHookFunc: make([]func(ctx *Ctx[T]), 0),
-		beforeDecodeHookFunc:  make([]func(ctx *Ctx[T]), 0),
-		itemKey:               "`id`",
+		ctx:                      c,
+		gormScopes:               make([]func(tx *gorm.DB) *gorm.DB, 0),
+		beforeExecuteHookFunc:    make([]func(ctx *Ctx[T]), 0),
+		beforeDecodeHookFunc:     make([]func(ctx *Ctx[T]), 0),
+		itemKey:                  "`id`",
+		skipAssociationsOnCreate: true,
 	}
 }
 
+func (c *Ctx[T]) SetTable(table string, args ...interface{}) *Ctx[T] {
+	c.table = table
+	c.tableArgs = args
+	return c
+}
+
 func (c *Ctx[T]) SetItemKey(key string) *Ctx[T] {
 	c.itemKey = key
 	return c

api/cosy/create.go

@@ -1,9 +1,9 @@
 package cosy
 
 import (
+	"github.com/gin-gonic/gin"
 	"github.com/0xJacky/Nginx-UI/api/cosy/map2struct"
 	"github.com/0xJacky/Nginx-UI/model"
-	"github.com/gin-gonic/gin"
 	"gorm.io/gorm/clause"
 	"net/http"
 )
@@ -41,8 +41,11 @@ func (c *Ctx[T]) Create() {
 		return
 	}
 
-	// skip all associations
-	err = db.Omit(clause.Associations).Create(&c.Model).Error
+	if c.skipAssociationsOnCreate {
+		err = db.Omit(clause.Associations).Create(&c.Model).Error
+	} else {
+		err = db.Create(&c.Model).Error
+	}
 
 	if err != nil {
 		errHandler(c.ctx, err)
@@ -53,7 +56,7 @@ func (c *Ctx[T]) Create() {
 	for _, v := range c.preloads {
 		tx = tx.Preload(v)
 	}
-	tx.First(&c.Model)
+	tx.Table(c.table, c.tableArgs...).First(&c.Model)
 
 	if len(c.executedHookFunc) > 0 {
 		for _, v := range c.executedHookFunc {
@@ -70,3 +73,8 @@ func (c *Ctx[T]) Create() {
 		c.ctx.JSON(http.StatusOK, c.Model)
 	}
 }
+
+func (c *Ctx[T]) WithAssociations() *Ctx[T] {
+	c.skipAssociationsOnCreate = false
+	return c
+}

api/cosy/custom.go

@@ -1,8 +1,8 @@
 package cosy
 
 import (
-	"github.com/0xJacky/Nginx-UI/api/cosy/map2struct"
 	"github.com/gin-gonic/gin"
+	"github.com/0xJacky/Nginx-UI/api/cosy/map2struct"
 	"net/http"
 )
 

api/cosy/delete.go

@@ -27,7 +27,13 @@ func (c *Ctx[T]) Destroy() {
 		result = result.Scopes(c.gormScopes...)
 	}
 
-	err := result.Session(&gorm.Session{}).First(&dbModel, id).Error
+	var err error
+	session := result.Session(&gorm.Session{})
+	if c.table != "" {
+		err = session.Table(c.table, c.tableArgs...).Take(&dbModel, id).Error
+	} else {
+		err = session.First(&dbModel, id).Error
+	}
 
 	if err != nil {
 		errHandler(c.ctx, err)
@@ -73,7 +79,13 @@ func (c *Ctx[T]) Recover() {
 		result = result.Scopes(c.gormScopes...)
 	}
 
-	err := result.Session(&gorm.Session{}).First(&dbModel, id).Error
+	var err error
+	session := result.Session(&gorm.Session{})
+	if c.table != "" {
+		err = session.Table(c.table).Take(&dbModel, id).Error
+	} else {
+		err = session.First(&dbModel, id).Error
+	}
 
 	if err != nil {
 		errHandler(c.ctx, err)

api/cosy/error.go

@@ -2,8 +2,8 @@ package cosy
 
 import (
 	"errors"
-	"github.com/0xJacky/Nginx-UI/internal/logger"
 	"github.com/gin-gonic/gin"
+	"github.com/0xJacky/Nginx-UI/internal/logger"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"net/http"

api/cosy/filter.go

@@ -2,9 +2,10 @@ package cosy
 
 import (
 	"fmt"
-	"github.com/0xJacky/Nginx-UI/internal/logger"
 	"github.com/gin-gonic/gin"
+	"github.com/0xJacky/Nginx-UI/internal/logger"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 	"strings"
 )
 
@@ -63,16 +64,17 @@ func QueryToInSearch(c *gin.Context, db *gorm.DB, keys ...string) *gorm.DB {
 		if len(queryArray) == 0 {
 			queryArray = c.QueryArray(v)
 		}
-		if len(queryArray) > 0 {
-			var sb strings.Builder
+		if len(queryArray) == 1 && queryArray[0] == "" {
+			continue
+		}
+		if len(queryArray) >= 1 {
+			var builder strings.Builder
+			stmt := db.Statement
 
-			_, err := fmt.Fprintf(&sb, "`%s` IN ?", v)
-			if err != nil {
-				logger.Error(err)
-				continue
-			}
+			stmt.QuoteTo(&builder, clause.Column{Table: stmt.Table, Name: v})
+			builder.WriteString(" IN ?")
 
-			db = db.Where(sb.String(), queryArray)
+			db = db.Where(builder.String(), queryArray)
 		}
 	}
 	return db
@@ -148,7 +150,10 @@ func QueryToOrInSearch(c *gin.Context, db *gorm.DB, keys ...string) *gorm.DB {
 		if len(queryArray) == 0 {
 			queryArray = c.QueryArray(v)
 		}
-		if len(queryArray) > 0 {
+		if len(queryArray) == 1 && queryArray[0] == "" {
+			continue
+		}
+		if len(queryArray) >= 1 {
 			var sb strings.Builder
 
 			_, err := fmt.Fprintf(&sb, "`%s` IN ?", v)

api/cosy/list.go

@@ -25,14 +25,11 @@ func GetPagingParams(c *gin.Context) (page, offset, pageSize int) {
 }
 
 func (c *Ctx[T]) combineStdSelectorRequest() {
-	var StdSelectorInitParams struct {
-		ID []int `json:"id"`
-	}
+	StdSelectorInitID := c.ctx.QueryArray("id[]")
 
-	_ = c.ctx.ShouldBindJSON(&StdSelectorInitParams)
-	if len(StdSelectorInitParams.ID) > 0 {
+	if len(StdSelectorInitID) > 0 {
 		c.GormScope(func(tx *gorm.DB) *gorm.DB {
-			return tx.Where(c.itemKey+" IN ?", StdSelectorInitParams.ID)
+			return tx.Where(c.itemKey+" IN ?", StdSelectorInitID)
 		})
 	}
 }
@@ -62,6 +59,9 @@ func (c *Ctx[T]) result() (*gorm.DB, bool) {
 	}
 
 	result = result.Model(&dbModel)
+	if c.table != "" {
+		result = result.Table(c.table, c.tableArgs...)
+	}
 
 	c.combineStdSelectorRequest()
 
@@ -72,16 +72,30 @@ func (c *Ctx[T]) result() (*gorm.DB, bool) {
 	return result, true
 }
 
-func (c *Ctx[T]) ListAllData() ([]*T, bool) {
+func (c *Ctx[T]) ListAllData() (data any, ok bool) {
 	result, ok := c.result()
 	if !ok {
 		return nil, false
 	}
 
 	result = result.Scopes(c.SortOrder())
-	models := make([]*T, 0)
-	result.Find(&models)
-	return models, true
+	if c.scan == nil {
+		models := make([]*T, 0)
+		result.Find(&models)
+
+		if c.transformer != nil {
+			transformed := make([]any, 0)
+			for k := range models {
+				transformed = append(transformed, c.transformer(models[k]))
+			}
+			data = transformed
+		} else {
+			data = models
+		}
+	} else {
+		data = c.scan(result)
+	}
+	return data, true
 }
 
 func (c *Ctx[T]) PagingListData() (*model.DataList, bool) {
@@ -90,11 +104,11 @@ func (c *Ctx[T]) PagingListData() (*model.DataList, bool) {
 		return nil, false
 	}
 
-	result = result.Scopes(c.OrderAndPaginate())
+	scopesResult := result.Session(&gorm.Session{}).Scopes(c.OrderAndPaginate())
 	data := &model.DataList{}
 	if c.scan == nil {
 		models := make([]*T, 0)
-		result.Find(&models)
+		scopesResult.Find(&models)
 
 		if c.transformer != nil {
 			transformed := make([]any, 0)
@@ -106,9 +120,12 @@ func (c *Ctx[T]) PagingListData() (*model.DataList, bool) {
 			data.Data = models
 		}
 	} else {
-		data.Data = c.scan(result)
+		data.Data = c.scan(scopesResult)
 	}
 
+	var totalRecords int64
+	result.Session(&gorm.Session{}).Count(&totalRecords)
+
 	page := cast.ToInt(c.ctx.Query("page"))
 	if page == 0 {
 		page = 1
@@ -119,9 +136,6 @@ func (c *Ctx[T]) PagingListData() (*model.DataList, bool) {
 		pageSize = cast.ToInt(reqPageSize)
 	}
 
-	var totalRecords int64
-	result.Session(&gorm.Session{}).Count(&totalRecords)
-
 	data.Pagination = model.Pagination{
 		Total:       totalRecords,
 		PerPage:     pageSize,
@@ -137,3 +151,15 @@ func (c *Ctx[T]) PagingList() {
 		c.ctx.JSON(http.StatusOK, data)
 	}
 }
+
+// EmptyPagingList return empty list
+func (c *Ctx[T]) EmptyPagingList() {
+	pageSize := settings.ServerSettings.PageSize
+	if reqPageSize := c.ctx.Query("page_size"); reqPageSize != "" {
+		pageSize = cast.ToInt(reqPageSize)
+	}
+
+	data := &model.DataList{Data: make([]any, 0)}
+	data.Pagination.PerPage = pageSize
+	c.ctx.JSON(http.StatusOK, data)
+}

api/cosy/map2struct/hook.go

@@ -4,14 +4,15 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/shopspring/decimal"
 	"github.com/spf13/cast"
+	"gopkg.in/guregu/null.v4"
 	"reflect"
 	"time"
 )
 
 var timeLocation *time.Location
 
 func init() {
-	timeLocation = time.Local
+	timeLocation, _ = time.LoadLocation("Asia/Shanghai")
 }
 
 func ToTimeHookFunc() mapstructure.DecodeHookFunc {
@@ -54,3 +55,13 @@ func ToDecimalHookFunc() mapstructure.DecodeHookFunc {
 		return data, nil
 	}
 }
+
+func ToNullableStringHookFunc() mapstructure.DecodeHookFunc {
+	return func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
+		if t == reflect.TypeOf(null.String{}) {
+			return null.StringFrom(data.(string)), nil
+		}
+
+		return data, nil
+	}
+}

api/cosy/map2struct/map2struct.go

@@ -10,7 +10,7 @@ func WeakDecode(input, output interface{}) error {
 		Result:           output,
 		WeaklyTypedInput: true,
 		DecodeHook: mapstructure.ComposeDecodeHookFunc(
-			ToDecimalHookFunc(), ToTimeHookFunc(),
+			ToDecimalHookFunc(), ToTimeHookFunc(), ToNullableStringHookFunc(),
 		),
 		TagName: "json",
 	}

api/cosy/order.go

@@ -22,6 +22,10 @@ func (c *Ctx[T]) UpdateOrder() {
 
 	db := model.UseDB()
 
+	if c.table != "" {
+		db = db.Table(c.table, c.tableArgs...)
+	}
+
 	// update target
 	err := db.Model(&c.Model).Where("id = ?", json.TargetID).Update("order_id", gorm.Expr("order_id + ?", affectedLen*(-json.Direction))).Error