@@ -2,27 +2,39 @@ package cosy
2
2
3
3
import (
4
4
"fmt"
5
+ "github.com/0xJacky/Nginx-UI/internal/logger"
5
6
"github.com/gin-gonic/gin"
6
7
"gorm.io/gorm"
8
+ "gorm.io/gorm/schema"
9
+ "sync"
7
10
)
8
11
9
12
func (c * Ctx [T ]) SortOrder () func (db * gorm.DB ) * gorm.DB {
10
13
return func (db * gorm.DB ) * gorm.DB {
11
14
sort := c .ctx .DefaultQuery ("order" , "desc" )
12
- order := fmt .Sprintf ("%s %s" , DefaultQuery (c .ctx , "sort_by" , c .itemKey ), sort )
13
- return db .Order (order )
15
+ if sort != "desc" && sort != "asc" {
16
+ sort = "desc"
17
+ }
18
+
19
+ // check if the order field is valid
20
+ // todo: maybe we can use more generic way to check if the sort_by is valid
21
+ order := DefaultQuery (c .ctx , "sort_by" , c .itemKey )
22
+ s , _ := schema .Parse (c .Model , & sync.Map {}, schema.NamingStrategy {})
23
+ if _ , ok := s .FieldsByDBName [order ]; ok {
24
+ order = fmt .Sprintf ("%s %s" , order , sort )
25
+ return db .Order (order )
26
+ } else {
27
+ logger .Error ("invalid order field:" , order )
28
+ }
29
+
30
+ return db
14
31
}
15
32
}
16
33
17
34
func (c * Ctx [T ]) OrderAndPaginate () func (db * gorm.DB ) * gorm.DB {
18
35
return func (db * gorm.DB ) * gorm.DB {
19
- sort := c .ctx .DefaultQuery ("order" , "desc" )
20
-
21
- order := fmt .Sprintf ("%s %s" , DefaultQuery (c .ctx , "sort_by" , c .itemKey ), sort )
22
- db = db .Order (order )
23
-
36
+ db = c .SortOrder ()(db )
24
37
_ , offset , pageSize := GetPagingParams (c .ctx )
25
-
26
38
return db .Offset (offset ).Limit (pageSize )
27
39
}
28
40
}
0 commit comments