Add Scope method features to DBO plugin

dbo/plugin.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"fmt"
 	"reflect"
+	"strings"
 
+	"github.com/Cyberpull/gokit/dbo/scopes"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 )
@@ -31,8 +33,8 @@ func (x *xPlugin) Initialize(db *gorm.DB) (err error) {
 func (x *xPlugin) onBeforeQuery() xPluginCallback {
 	return func(db *gorm.DB) {
 		model := reflect.New(db.Statement.Schema.ModelType)
-		// model := db.Statement.Schema.ModelType
 
+		// Process Tags
 		for _, field := range db.Statement.Schema.Fields {
 			tag := x.getFieldTag(field)
 
@@ -52,6 +54,19 @@ func (x *xPlugin) onBeforeQuery() xPluginCallback {
 				db = db.Preload(field.Name, args...)
 			}
 		}
+
+		// Process Scopes
+		for i := 0; i < model.NumMethod(); i++ {
+			name := model.Type().Method(i).Name
+
+			if strings.HasPrefix(name, "Scope") {
+				method, ok := model.Method(i).Interface().(scopes.Scope)
+
+				if ok {
+					db = method(db)
+				}
+			}
+		}
 	}
 }
 

tests/dbo_test.go

@@ -48,13 +48,24 @@ func (x *DBOTestSuite) SetupSuite() {
 	require.NoError(x.T(), err)
 
 	x.ins.AddMigrations(
+		&models.Actor{},
 		&models.Person{},
 		&models.Car{},
 		&models.Movie{},
 	)
 
 	require.NoError(x.T(), x.ins.Migrate())
 
+	x.ins.AddSeeders(func(db *gorm.DB) (err error) {
+		return db.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "id"}},
+			DoNothing: true,
+		}).Create([]*models.Actor{
+			{ID: 1, Name: "Christian Ezeani", Age: 25},
+			{ID: 2, Name: "John Doe", Age: 15},
+		}).Error
+	})
+
 	x.ins.AddSeeders(func(db *gorm.DB) (err error) {
 		return db.Clauses(clause.OnConflict{
 			Columns:   []clause.Column{{Name: "id"}},
@@ -107,6 +118,17 @@ func (x *DBOTestSuite) TestPluginPreload() {
 	require.Len(x.T(), entry.Movies, 1)
 }
 
+func (x *DBOTestSuite) TestPluginScope() {
+	db := x.ins.New()
+
+	entries := []models.Actor{}
+
+	result := db.Find(&entries)
+	require.NoError(x.T(), result.Error)
+	require.EqualValues(x.T(), int64(1), result.RowsAffected)
+	require.EqualValues(x.T(), uint64(1), entries[0].ID)
+}
+
 func (x *DBOTestSuite) TestSet() {
 	var data dbo.Set[string]
 

tests/models/actor.go

@@ -0,0 +1,15 @@
+package models
+
+import (
+	"gorm.io/gorm"
+)
+
+type Actor struct {
+	ID   uint64 `json:"id" gorm:"primaryKey;column:id;autoIncrement"`
+	Name string `gorm:"index;column:name"`
+	Age  int    `gorm:"index;column:age"`
+}
+
+func (x *Actor) ScopeAdult(db *gorm.DB) *gorm.DB {
+	return db.Where("age > ?", 18)
+}