From b4b5f20902f2dfd96f7c3e8239fd552b571ed2fb Mon Sep 17 00:00:00 2001
From: Mike Gibson <mike@mgdigital.co.uk>
Date: Sat, 6 Jan 2024 17:20:08 +0000
Subject: [PATCH] Revert unneeded change

---
 internal/database/query/query.go | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/internal/database/query/query.go b/internal/database/query/query.go
index 1e59cde3..c235337c 100644
--- a/internal/database/query/query.go
+++ b/internal/database/query/query.go
@@ -224,7 +224,6 @@ type OptionBuilder interface {
 	WithHasNextPage(bool) OptionBuilder
 	withTotalCount() bool
 	applyCallbacks(context.Context, any) error
-	applyCallbacksCtx(context.Context, callbackContext, any) error
 	hasZeroLimit() bool
 	needsNextPage() bool
 	hasNextPage(nItems int) bool
@@ -508,26 +507,14 @@ func (b optionBuilder) applyPost(sq SubQuery) error {
 }
 
 func (b optionBuilder) applyCallbacks(ctx context.Context, results any) error {
-	return doApplyCallbacks(ctx, callbackContext{
+	cbCtx := callbackContext{
 		dbContext: b.dbContext,
 		Mutex:     &sync.Mutex{},
-	}, results, b.callbacks...)
-}
-
-func (b optionBuilder) applyCallbacksCtx(ctx context.Context, cbCtx callbackContext, results any) error {
-	for _, cb := range b.callbacks {
-		if err := cb(ctx, cbCtx, results); err != nil {
-			return err
-		}
 	}
-	return nil
-}
-
-func doApplyCallbacks(ctx context.Context, cbCtx callbackContext, results any, callbacks ...Callback) error {
 	var errs []error
 	wg := sync.WaitGroup{}
-	wg.Add(len(callbacks))
-	for _, cb := range callbacks {
+	wg.Add(len(b.callbacks))
+	for _, cb := range b.callbacks {
 		go (func(cb Callback) {
 			defer wg.Done()
 			if err := cb(ctx, cbCtx, results); err != nil {