refactor: refactor SelectList

Author: afumu

gormplus/mapper.go

@@ -75,14 +75,29 @@ func SelectByIds[T any](ids ...any) (*gorm.DB, []T) {
 
 func SelectOne[T any](q *Query[T]) (*gorm.DB, T) {
 	var entity T
-	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.QueryArgs...).First(&entity)
+	resultDb := GormDb.Select(q.SelectColumns).Where(q.QueryBuilder.String(), q.QueryArgs...).First(&entity)
 	return resultDb, entity
 }
 
 func SelectList[T any](q *Query[T]) (*gorm.DB, []T) {
 	var results []T
-	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.QueryArgs...).
-		Order(q.OrderBuilder.String())
+	resultDb := GormDb.Model(new(T))
+
+	if len(q.DistinctColumns) > 0 {
+		resultDb.Distinct(q.DistinctColumns)
+	}
+
+	if len(q.SelectColumns) > 0 {
+		resultDb.Select(q.SelectColumns)
+	}
+
+	if q.QueryBuilder.Len() > 0 {
+		resultDb.Where(q.QueryBuilder.String(), q.QueryArgs...)
+	}
+
+	if q.OrderBuilder.Len() > 0 {
+		resultDb.Order(q.OrderBuilder.String())
+	}
 
 	if q.GroupBuilder.Len() > 0 {
 		resultDb.Group(q.GroupBuilder.String())

gormplus/mapper_test.go

@@ -117,7 +117,6 @@ func TestSelectOne(t *testing.T) {
 
 func TestSelectList(t *testing.T) {
 	q := Query[Test1]{}
-	q.Group("price", "code").Having("count(*) > ?", 1)
 	db, result := SelectList(&q)
 	fmt.Println(db.RowsAffected)
 	for _, v := range result {

gormplus/query.go

@@ -7,14 +7,15 @@ import (
 )
 
 type Query[T any] struct {
-	Columns       []string
-	QueryBuilder  strings.Builder
-	QueryArgs     []any
-	OrderBuilder  strings.Builder
-	GroupBuilder  strings.Builder
-	HavingBuilder strings.Builder
-	HavingArgs    []any
-	LastCond      string
+	SelectColumns   []string
+	DistinctColumns []string
+	QueryBuilder    strings.Builder
+	QueryArgs       []any
+	OrderBuilder    strings.Builder
+	GroupBuilder    strings.Builder
+	HavingBuilder   strings.Builder
+	HavingArgs      []any
+	LastCond        string
 }
 
 func (q *Query[T]) Eq(column string, val any) *Query[T] {
@@ -76,6 +77,11 @@ func (q *Query[T]) In(column string, val ...any) *Query[T] {
 	return q
 }
 
+func (q *Query[T]) Distinct(column ...string) *Query[T] {
+	q.DistinctColumns = column
+	return q
+}
+
 func (q *Query[T]) And() *Query[T] {
 	q.QueryBuilder.WriteString(constants.And)
 	q.QueryBuilder.WriteString(" ")
@@ -91,7 +97,7 @@ func (q *Query[T]) Or() *Query[T] {
 }
 
 func (q *Query[T]) Select(columns ...string) *Query[T] {
-	q.Columns = append(q.Columns, columns...)
+	q.SelectColumns = append(q.SelectColumns, columns...)
 	return q
 }