feat: add order

Author: afumu

constants/constants.go

@@ -1 +1,5 @@
 package constants
+
+const (
+	COMMA = ","
+)

constants/keyword.go

@@ -12,4 +12,6 @@ const (
 	Ge   = ">="
 	Lt   = "<"
 	Le   = "<="
+	Desc = "DESC"
+	Asc  = "ASC"
 )

gormplus/mapper.go

@@ -81,7 +81,7 @@ func SelectOne[T any](q *Query[T]) (*gorm.DB, T) {
 
 func SelectList[T any](q *Query[T]) (*gorm.DB, []T) {
 	var results []T
-	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).Find(&results)
+	resultDb := GormDb.Order(q.OrderBuilder.String()).Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).Find(&results)
 	return resultDb, results
 }
 

gormplus/mapper_test.go

@@ -4,13 +4,16 @@ import (
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 	"testing"
 )
 
 func init() {
 	dsn := "root:123456@tcp(127.0.0.1:3306)/test?charset=utf8mb4&parseTime=True&loc=Local"
 	var err error
-	GormDb, err = gorm.Open(mysql.Open(dsn), &gorm.Config{})
+	GormDb, err = gorm.Open(mysql.Open(dsn), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Info),
+	})
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -23,7 +26,7 @@ type Test1 struct {
 }
 
 func TestSave(t *testing.T) {
-	test1 := Test1{Code: "D455", Price: 100}
+	test1 := Test1{Code: "D455", Price: 200}
 	resultDb := Insert(&test1)
 	fmt.Println(resultDb)
 	fmt.Println(test1)
@@ -113,7 +116,7 @@ func TestSelectOne(t *testing.T) {
 
 func TestSelectList(t *testing.T) {
 	q := Query[Test1]{}
-	q.Eq("price", 200).Select("code", "price")
+	q.OrderByDesc("price").OrderByAsc("code")
 	db, result := SelectList(&q)
 	fmt.Println(db.RowsAffected)
 	fmt.Println(result)

gormplus/query.go

@@ -8,6 +8,7 @@ import (
 
 type Query[T any] struct {
 	Columns      []string
+	OrderBuilder strings.Builder
 	QueryBuilder strings.Builder
 	Args         []any
 	LastCond     string
@@ -91,6 +92,16 @@ func (q *Query[T]) Select(columns ...string) *Query[T] {
 	return q
 }
 
+func (q *Query[T]) OrderByDesc(columns ...string) *Query[T] {
+	q.buildOrder(constants.Desc, columns...)
+	return q
+}
+
+func (q *Query[T]) OrderByAsc(columns ...string) *Query[T] {
+	q.buildOrder(constants.Asc, columns...)
+	return q
+}
+
 func (q *Query[T]) addCond(column string, val any, condType string) {
 	if q.LastCond != constants.And && q.LastCond != constants.Or && q.QueryBuilder.Len() > 0 {
 		q.QueryBuilder.WriteString(constants.And)
@@ -102,3 +113,14 @@ func (q *Query[T]) addCond(column string, val any, condType string) {
 	q.LastCond = ""
 	q.Args = append(q.Args, val)
 }
+
+func (q *Query[T]) buildOrder(orderType string, columns ...string) {
+	for _, v := range columns {
+		if q.OrderBuilder.Len() > 0 {
+			q.OrderBuilder.WriteString(constants.COMMA)
+		}
+		q.OrderBuilder.WriteString(v)
+		q.OrderBuilder.WriteString(" ")
+		q.OrderBuilder.WriteString(orderType)
+	}
+}