big ole refactor

internal/db/insert.go

@@ -3,7 +3,6 @@ package db
 import (
 	"context"
 	"fmt"
-	"net/http"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -11,13 +10,13 @@ import (
 )
 
 type inserter[T any] struct {
-	tx            bun.Tx
-	q             *bun.InsertQuery
-	model         *T
-	models        []*T
-	isBulk        bool
-	auditCallback AuditCallback
-	auditRequest  *http.Request
+	tx        bun.Tx
+	q         *bun.InsertQuery
+	model     *T
+	models    []*T
+	isBulk    bool
+	audit     *AuditMeta
+	auditInfo *AuditInfo
 }
 
 // Insert creates an inserter for a single model
@@ -76,11 +75,10 @@ func (i *inserter[T]) Returning(columns ...string) *inserter[T] {
 }
 
 // WithAudit enables audit logging for this insert operation
-// The callback will be invoked after successful insert with auto-generated audit info
-// If the callback returns an error, the transaction will be rolled back
-func (i *inserter[T]) WithAudit(r *http.Request, callback AuditCallback) *inserter[T] {
-	i.auditRequest = r
-	i.auditCallback = callback
+// If the provided *AuditInfo is nil, will use reflection to automatically work out the details
+func (i *inserter[T]) WithAudit(meta *AuditMeta, info *AuditInfo) *inserter[T] {
+	i.audit = meta
+	i.auditInfo = info
 	return i
 }
 
@@ -94,35 +92,29 @@ func (i *inserter[T]) Exec(ctx context.Context) error {
 	}
 
 	// Handle audit logging if enabled
-	if i.auditCallback != nil && i.auditRequest != nil {
-		tableName := extractTableName[T]()
-		resourceType := extractResourceType(tableName)
-		action := buildAction(resourceType, "create")
-
-		var info *AuditInfo
-		if i.isBulk {
-			// For bulk inserts, log once with count in details
-			info = &AuditInfo{
+	if i.audit != nil {
+		if i.auditInfo == nil {
+			tableName := extractTableName[T]()
+			resourceType := extractResourceType(tableName)
+			action := buildAction(resourceType, "create")
+			i.auditInfo = &AuditInfo{
 				Action:       action,
 				ResourceType: resourceType,
 				ResourceID:   nil,
-				Details: map[string]any{
-					"count": len(i.models),
-				},
-			}
-		} else {
-			// For single insert, log with resource ID
-			info = &AuditInfo{
-				Action:       action,
-				ResourceType: resourceType,
-				ResourceID:   extractPrimaryKey(i.model),
 				Details:      nil,
 			}
+			if i.isBulk {
+				i.auditInfo.Details = map[string]any{
+					"count": len(i.models),
+				}
+			} else {
+				i.auditInfo.ResourceID = extractPrimaryKey(i.model)
+			}
 		}
 
-		// Call audit callback - if it fails, return error to trigger rollback
-		if err := i.auditCallback(ctx, i.tx, info, i.auditRequest); err != nil {
-			return errors.Wrap(err, "audit.callback")
+		err = LogSuccess(ctx, i.tx, i.audit, i.auditInfo)
+		if err != nil {
+			return errors.Wrap(err, "LogSuccess")
 		}
 	}