refactor(Scopes): Refactored the Scopes method

Signed-off-by: Flc゛ <[email protected]>
go-gorm · Jan 19, 2024 · 370127a · 370127a
1 parent d70b4a3
commit 370127a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/internal/template/method.go b/internal/template/method.go
@@ -113,8 +113,16 @@ func ({{.S}} {{.QueryStructName}}Do) Offset(offset int) {{.ReturnObject}} {
 	return {{.S}}.withDO({{.S}}.DO.Offset(offset))
 }
 
-func ({{.S}} {{.QueryStructName}}Do) Scopes(funcs ...func(gen.Dao) gen.Dao) {{.ReturnObject}} {
-	return {{.S}}.withDO({{.S}}.DO.Scopes(funcs...))
+func ({{.S}} {{.QueryStructName}}Do) Scopes(funcs ...func({{.ReturnObject}}) {{.ReturnObject}}) {{.ReturnObject}} {
+	if funcs = nil {
+		return {{.ReturnObject}}
+	}
+
+	for _, f := range funcs {
+		{{.ReturnObject}} = f({{.ReturnObject}})
+	}
+	
+	return {{.ReturnObject}}
 }
 
 func ({{.S}} {{.QueryStructName}}Do) Unscoped() {{.ReturnObject}} {

diff --git a/internal/template/struct.go b/internal/template/struct.go
@@ -173,7 +173,7 @@ type I{{.ModelStructName}}Do interface {
 	Limit(limit int) I{{.ModelStructName}}Do
 	Offset(offset int) I{{.ModelStructName}}Do
 	Count() (count int64, err error)
-	Scopes(funcs ...func(gen.Dao) gen.Dao) I{{.ModelStructName}}Do
+	Scopes(funcs ...func(I{{.ModelStructName}}Do) I{{.ModelStructName}}Do) I{{.ModelStructName}}Do
 	Unscoped() I{{.ModelStructName}}Do
 	Create(values ...*{{.StructInfo.Package}}.{{.StructInfo.Type}}) error
 	CreateInBatches(values []*{{.StructInfo.Package}}.{{.StructInfo.Type}}, batchSize int) error