feat: add group

Author: afumu

gormplus/mapper.go

@@ -81,7 +81,12 @@ 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.Order(q.OrderBuilder.String()).Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).Find(&results)
+	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).
+		Order(q.OrderBuilder.String())
+	if q.GroupBuilder.Len() > 0 {
+		resultDb.Group(q.GroupBuilder.String())
+	}
+	resultDb.Find(&results)
 	return resultDb, results
 }
 

gormplus/mapper_test.go

@@ -1,6 +1,7 @@
 package gormplus
 
 import (
+	"encoding/json"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
@@ -116,10 +117,13 @@ func TestSelectOne(t *testing.T) {
 
 func TestSelectList(t *testing.T) {
 	q := Query[Test1]{}
-	q.OrderByDesc("price").OrderByAsc("code")
+	q.Group("price", "code")
 	db, result := SelectList(&q)
 	fmt.Println(db.RowsAffected)
-	fmt.Println(result)
+	for _, v := range result {
+		marshal, _ := json.Marshal(v)
+		fmt.Println(string(marshal))
+	}
 }
 
 func TestSelectCount(t *testing.T) {

gormplus/query.go

@@ -9,6 +9,7 @@ import (
 type Query[T any] struct {
 	Columns      []string
 	OrderBuilder strings.Builder
+	GroupBuilder strings.Builder
 	QueryBuilder strings.Builder
 	Args         []any
 	LastCond     string
@@ -102,6 +103,16 @@ func (q *Query[T]) OrderByAsc(columns ...string) *Query[T] {
 	return q
 }
 
+func (q *Query[T]) Group(columns ...string) *Query[T] {
+	for _, v := range columns {
+		if q.GroupBuilder.Len() > 0 {
+			q.GroupBuilder.WriteString(constants.COMMA)
+		}
+		q.GroupBuilder.WriteString(v)
+	}
+	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)