Better handling of preload where conditions and a few panic changes

2026-01-04 10:54:26 +00:00 · 2025-11-20 16:50:26 +02:00
parent 745564f2e7
commit 0d4909054c
5 changed files with 206 additions and 53 deletions
--- a/pkg/common/adapters/database/bun.go
+++ b/pkg/common/adapters/database/bun.go
@@ -46,8 +46,8 @@ func (b *BunAdapter) NewDelete() common.DeleteQuery {

 func (b *BunAdapter) Exec(ctx context.Context, query string, args ...interface{}) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunAdapter.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunAdapter.Exec", r)
 		}
 	}()
 	result, err := b.db.ExecContext(ctx, query, args...)
@@ -56,8 +56,8 @@ func (b *BunAdapter) Exec(ctx context.Context, query string, args ...interface{}

 func (b *BunAdapter) Query(ctx context.Context, dest interface{}, query string, args ...interface{}) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunAdapter.Query"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunAdapter.Query", r)
 		}
 	}()
 	return b.db.NewRaw(query, args...).Scan(ctx, dest)
@@ -86,8 +86,8 @@ func (b *BunAdapter) RollbackTx(ctx context.Context) error {

 func (b *BunAdapter) RunInTransaction(ctx context.Context, fn func(common.Database) error) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunAdapter.RunInTransaction"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunAdapter.RunInTransaction", r)
 		}
 	}()
 	return b.db.RunInTx(ctx, &sql.TxOptions{}, func(ctx context.Context, tx bun.Tx) error {
@@ -235,6 +235,11 @@ func (b *BunSelectQuery) Preload(relation string, conditions ...interface{}) com

 func (b *BunSelectQuery) PreloadRelation(relation string, apply ...func(common.SelectQuery) common.SelectQuery) common.SelectQuery {
 	b.query = b.query.Relation(relation, func(sq *bun.SelectQuery) *bun.SelectQuery {
+		defer func() {
+			if r := recover(); r != nil {
+				logger.HandlePanic("BunSelectQuery.PreloadRelation", r)
+			}
+		}()
 		if len(apply) == 0 {
 			return sq
 		}
@@ -294,8 +299,8 @@ func (b *BunSelectQuery) Having(having string, args ...interface{}) common.Selec

 func (b *BunSelectQuery) Scan(ctx context.Context, dest interface{}) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunSelectQuery.Scan"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunSelectQuery.Scan", r)
 		}
 	}()
 	if dest == nil {
@@ -306,8 +311,8 @@ func (b *BunSelectQuery) Scan(ctx context.Context, dest interface{}) (err error)

 func (b *BunSelectQuery) ScanModel(ctx context.Context) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunSelectQuery.ScanModel"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunSelectQuery.ScanModel", r)
 		}
 	}()
 	if b.query.GetModel() == nil {
@@ -319,8 +324,8 @@ func (b *BunSelectQuery) ScanModel(ctx context.Context) (err error) {

 func (b *BunSelectQuery) Count(ctx context.Context) (count int, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunSelectQuery.Count"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunSelectQuery.Count", r)
 			count = 0
 		}
 	}()
@@ -341,8 +346,8 @@ func (b *BunSelectQuery) Count(ctx context.Context) (count int, err error) {

 func (b *BunSelectQuery) Exists(ctx context.Context) (exists bool, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunSelectQuery.Exists"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunSelectQuery.Exists", r)
 			exists = false
 		}
 	}()
@@ -392,8 +397,8 @@ func (b *BunInsertQuery) Returning(columns ...string) common.InsertQuery {

 func (b *BunInsertQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunInsertQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunInsertQuery.Exec", r)
 		}
 	}()
 	if b.values != nil && len(b.values) > 0 {
@@ -478,8 +483,8 @@ func (b *BunUpdateQuery) Returning(columns ...string) common.UpdateQuery {

 func (b *BunUpdateQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunUpdateQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunUpdateQuery.Exec", r)
 		}
 	}()
 	result, err := b.query.Exec(ctx)
@@ -508,8 +513,8 @@ func (b *BunDeleteQuery) Where(query string, args ...interface{}) common.DeleteQ

 func (b *BunDeleteQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("BunDeleteQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("BunDeleteQuery.Exec", r)
 		}
 	}()
 	result, err := b.query.Exec(ctx)
--- a/pkg/common/adapters/database/gorm.go
+++ b/pkg/common/adapters/database/gorm.go
@@ -41,8 +41,8 @@ func (g *GormAdapter) NewDelete() common.DeleteQuery {

 func (g *GormAdapter) Exec(ctx context.Context, query string, args ...interface{}) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormAdapter.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormAdapter.Exec", r)
 		}
 	}()
 	result := g.db.WithContext(ctx).Exec(query, args...)
@@ -51,8 +51,8 @@ func (g *GormAdapter) Exec(ctx context.Context, query string, args ...interface{

 func (g *GormAdapter) Query(ctx context.Context, dest interface{}, query string, args ...interface{}) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormAdapter.Query"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormAdapter.Query", r)
 		}
 	}()
 	return g.db.WithContext(ctx).Raw(query, args...).Find(dest).Error
@@ -76,8 +76,8 @@ func (g *GormAdapter) RollbackTx(ctx context.Context) error {

 func (g *GormAdapter) RunInTransaction(ctx context.Context, fn func(common.Database) error) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormAdapter.RunInTransaction"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormAdapter.RunInTransaction", r)
 		}
 	}()
 	return g.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
@@ -273,8 +273,8 @@ func (g *GormSelectQuery) Having(having string, args ...interface{}) common.Sele

 func (g *GormSelectQuery) Scan(ctx context.Context, dest interface{}) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormSelectQuery.Scan"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormSelectQuery.Scan", r)
 		}
 	}()
 	return g.db.WithContext(ctx).Find(dest).Error
@@ -282,8 +282,8 @@ func (g *GormSelectQuery) Scan(ctx context.Context, dest interface{}) (err error

 func (g *GormSelectQuery) ScanModel(ctx context.Context) (err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormSelectQuery.ScanModel"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormSelectQuery.ScanModel", r)
 		}
 	}()
 	if g.db.Statement.Model == nil {
@@ -294,8 +294,8 @@ func (g *GormSelectQuery) ScanModel(ctx context.Context) (err error) {

 func (g *GormSelectQuery) Count(ctx context.Context) (count int, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormSelectQuery.Count"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormSelectQuery.Count", r)
 			count = 0
 		}
 	}()
@@ -306,8 +306,8 @@ func (g *GormSelectQuery) Count(ctx context.Context) (count int, err error) {

 func (g *GormSelectQuery) Exists(ctx context.Context) (exists bool, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormSelectQuery.Exists"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormSelectQuery.Exists", r)
 			exists = false
 		}
 	}()
@@ -354,8 +354,8 @@ func (g *GormInsertQuery) Returning(columns ...string) common.InsertQuery {

 func (g *GormInsertQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormInsertQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormInsertQuery.Exec", r)
 		}
 	}()
 	var result *gorm.DB
@@ -446,8 +446,8 @@ func (g *GormUpdateQuery) Returning(columns ...string) common.UpdateQuery {

 func (g *GormUpdateQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormUpdateQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormUpdateQuery.Exec", r)
 		}
 	}()
 	result := g.db.WithContext(ctx).Updates(g.updates)
@@ -478,8 +478,8 @@ func (g *GormDeleteQuery) Where(query string, args ...interface{}) common.Delete

 func (g *GormDeleteQuery) Exec(ctx context.Context) (res common.Result, err error) {
 	defer func() {
-		if panicErr := logger.RecoverPanic("GormDeleteQuery.Exec"); panicErr != nil {
-			err = panicErr
+		if r := recover(); r != nil {
+			err = logger.HandlePanic("GormDeleteQuery.Exec", r)
 		}
 	}()
 	result := g.db.WithContext(ctx).Delete(g.model)