chore: update cosy

.air.toml

@@ -7,7 +7,7 @@ tmp_dir = "tmp"
 
 [build]
 # Just plain old shell command. You could use `make` as well.
-cmd = "CGO_ENABLED=1 go build -tags=jsoniter -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/server/settings.buildTime=$(date +%s)'\" -o ./tmp/main ."
+cmd = "CGO_ENABLED=1 go build -tags=jsoniter -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/server/settings.buildTime=$(date +%s)'\" -v -o ./tmp/main ."
 # Binary file yields from `cmd`.
 bin = "tmp/main"
 # Customize binary.

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"
 )
@@ -52,12 +52,6 @@ func (c *Ctx[T]) Create() {
 		return
 	}
 
-	tx := db.Preload(clause.Associations)
-	for _, v := range c.preloads {
-		tx = tx.Preload(v)
-	}
-	tx.Table(c.table, c.tableArgs...).First(&c.Model)
-
 	if len(c.executedHookFunc) > 0 {
 		for _, v := range c.executedHookFunc {
 			v(c)
@@ -67,6 +61,13 @@ func (c *Ctx[T]) Create() {
 			}
 		}
 	}
+
+	tx := db.Preload(clause.Associations)
+	for _, v := range c.preloads {
+		tx = tx.Preload(v)
+	}
+	tx.Table(c.table, c.tableArgs...).First(&c.Model)
+
 	if c.nextHandler != nil {
 		(*c.nextHandler)(c.ctx)
 	} else {

api/cosy/custom.go

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

api/cosy/delete.go

@@ -2,6 +2,7 @@ package cosy
 
 import (
 	"github.com/0xJacky/Nginx-UI/model"
+	"github.com/spf13/cast"
 	"gorm.io/gorm"
 	"net/http"
 )
@@ -20,9 +21,13 @@ func (c *Ctx[T]) Destroy() {
 	c.beforeExecuteHook()
 
 	db := model.UseDB()
-	var dbModel T
 
 	result := db
+
+	if cast.ToBool(c.ctx.Query("permanent")) || c.permanentlyDelete {
+		result = result.Unscoped()
+	}
+
 	if len(c.gormScopes) > 0 {
 		result = result.Scopes(c.gormScopes...)
 	}
@@ -30,9 +35,9 @@ func (c *Ctx[T]) Destroy() {
 	var err error
 	session := result.Session(&gorm.Session{})
 	if c.table != "" {
-		err = session.Table(c.table, c.tableArgs...).Take(&dbModel, id).Error
+		err = session.Table(c.table, c.tableArgs...).Take(c.OriginModel, id).Error
 	} else {
-		err = session.First(&dbModel, id).Error
+		err = session.First(&c.OriginModel, id).Error
 	}
 
 	if err != nil {
@@ -40,11 +45,7 @@ func (c *Ctx[T]) Destroy() {
 		return
 	}
 
-	if c.permanentlyDelete {
-		result = result.Unscoped()
-	}
-
-	err = result.Delete(&dbModel).Error
+	err = result.Delete(&c.OriginModel).Error
 	if err != nil {
 		errHandler(c.ctx, err)
 		return

api/cosy/error.go

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

api/cosy/filter.go

@@ -2,8 +2,8 @@ package cosy
 
 import (
 	"fmt"
-	"github.com/gin-gonic/gin"
 	"github.com/0xJacky/Nginx-UI/internal/logger"
+	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"strings"

api/cosy/list.go

@@ -49,13 +49,18 @@ func (c *Ctx[T]) result() (*gorm.DB, bool) {
 	result := model.UseDB()
 
 	if cast.ToBool(c.ctx.Query("trash")) {
+		tableName := c.table
+		if c.table == "" {
 			stmt := &gorm.Statement{DB: model.UseDB()}
 			err := stmt.Parse(&dbModel)
 			if err != nil {
 				logger.Error(err)
 				return nil, false
 			}
-		result = result.Unscoped().Where(stmt.Schema.Table + ".deleted_at IS NOT NULL")
+			tableName = stmt.Schema.Table
+		}
+
+		result = result.Unscoped().Where(tableName + ".deleted_at IS NOT NULL")
 	}
 
 	result = result.Model(&dbModel)

api/cosy/map2struct/hook.go

@@ -38,6 +38,35 @@ func ToTimeHookFunc() mapstructure.DecodeHookFunc {
 	}
 }
 
+func ToTimePtrHookFunc() mapstructure.DecodeHookFunc {
+	return func(
+		f reflect.Type,
+		t reflect.Type,
+		data interface{}) (interface{}, error) {
+		if t != reflect.TypeOf(&time.Time{}) {
+			return data, nil
+		}
+
+		switch f.Kind() {
+		case reflect.String:
+			if data == "" {
+				return nil, nil
+			}
+			v, err := cast.ToTimeInDefaultLocationE(data, timeLocation)
+			return &v, err
+		case reflect.Float64:
+			v := time.Unix(0, int64(data.(float64))*int64(time.Millisecond))
+			return &v, nil
+		case reflect.Int64:
+			v := time.Unix(0, data.(int64)*int64(time.Millisecond))
+			return &v, nil
+		default:
+			return data, nil
+		}
+		// Convert it by parsing
+	}
+}
+
 func ToDecimalHookFunc() mapstructure.DecodeHookFunc {
 	return func(f reflect.Type, t reflect.Type, data interface{}) (interface{}, error) {
 

api/cosy/map2struct/map2struct.go

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