Add SeederEntry interface to dbo

Author: christianezeani

dbo/instance.go

@@ -10,10 +10,9 @@ type Instance interface {
 	New() *gorm.DB
 	DB(db ...*gorm.DB) (value *gorm.DB, err error)
 	AddMigrations(models ...any)
-	AddSeederEntries(entries ...SeederEntry)
 	AddSeeders(handlers ...SeederHandler)
 	Migrate(seed ...bool) (err error)
-	Seed() (err error)
+	Seed(entries ...SeederEntry) (err error)
 }
 
 // ======================
@@ -53,10 +52,6 @@ func (s *dbInstance) AddSeeders(handlers ...SeederHandler) {
 	s.seeders.Add(handlers...)
 }
 
-func (s *dbInstance) AddSeederEntries(entries ...SeederEntry) {
-	s.seeders.AddEntries(entries...)
-}
-
 func (s *dbInstance) Migrate(seed ...bool) (err error) {
 	if err = s.migrations.Run(s.db); err != nil {
 		return
@@ -69,7 +64,7 @@ func (s *dbInstance) Migrate(seed ...bool) (err error) {
 	return
 }
 
-func (s *dbInstance) Seed() (err error) {
+func (s *dbInstance) Seed(entries ...SeederEntry) (err error) {
 	return s.seeders.Run(s.db)
 }
 

dbo/seeder.go

@@ -10,8 +10,7 @@ import (
 type SeederHandler func(db *gorm.DB) (err error)
 
 type DBSeeder interface {
-	AddEntries(entries ...SeederEntry)
-	Run(db *gorm.DB) (err error)
+	Seed(db *gorm.DB, entries []SeederEntry) (err error)
 }
 
 type SeederEntry interface {
@@ -21,27 +20,14 @@ type SeederEntry interface {
 
 type dbSeeder struct {
 	opts     *Options
-	entries  []SeederEntry
 	handlers []SeederHandler
 }
 
 func (x *dbSeeder) Add(handlers ...SeederHandler) {
 	x.handlers = append(x.handlers, handlers...)
 }
 
-func (x *dbSeeder) AddEntries(entries ...SeederEntry) {
-	x.entries = append(x.entries, entries...)
-}
-
 func (x *dbSeeder) Run(db *gorm.DB) (err error) {
-	for _, entry := range x.entries {
-		tx := NewSession(db)
-
-		if err = x.RunEntry(tx, entry); err != nil {
-			return
-		}
-	}
-
 	for _, handler := range x.handlers {
 		tx := NewSession(db)
 
@@ -69,6 +55,18 @@ func (x *dbSeeder) RunEntry(db *gorm.DB, entry SeederEntry) (err error) {
 	return
 }
 
+func (x *dbSeeder) Seed(db *gorm.DB, entries []SeederEntry) (err error) {
+	for _, entry := range entries {
+		tx := NewSession(db)
+
+		if err = x.RunEntry(tx, entry); err != nil {
+			return
+		}
+	}
+
+	return
+}
+
 // ===================
 
 var Seeder dbSeeder
@@ -84,7 +82,6 @@ func newSeeder(opts *Options) *dbSeeder {
 }
 
 func initSeeders(x *dbSeeder) {
-	x.entries = []SeederEntry{}
 	x.handlers = []SeederHandler{}
 }