Fix DB commits of background task

Author: simondanielsson

cmd/internal/db/middleware.go

@@ -16,7 +16,7 @@ func AddDatabaseMiddleware(handler http.Handler, pool *pgxpool.Pool, logger logg
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			repository, tx, err := NewRepositoryWithTx(ctx, pool)
+			repository, commit, rollback, err := NewRepositoryWithTx(ctx, pool)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 			}
@@ -31,27 +31,29 @@ func AddDatabaseMiddleware(handler http.Handler, pool *pgxpool.Pool, logger logg
 			status, ok := r.Context().Value(constants.StatusCodeKey).(int)
 			if !ok {
 				logger.Err.Println("No status code found in context, rolling back tx")
-				_ = tx.Rollback(ctx)
+				_ = rollback(ctx)
 				return
 			}
 
 			if status >= http.StatusBadRequest {
-				_ = tx.Rollback(ctx)
-			} else if err := tx.Commit(ctx); err != nil {
+				_ = rollback(ctx)
+			} else if err := commit(ctx); err != nil {
 				// Response has already been sent - just log
 				logger.Err.Printf("tx commit failed: %v", err)
 			}
 		},
 	)
 }
 
-func NewRepositoryWithTx(ctx context.Context, pool *pgxpool.Pool) (*queries.Queries, pgx.Tx, error) {
+func NewRepositoryWithTx(ctx context.Context, pool *pgxpool.Pool) (q *queries.Queries, commit func(context.Context) error, rollback func(context.Context) error, err error) {
 	tx, err := pool.BeginTx(ctx, pgx.TxOptions{
 		IsoLevel:   pgx.Serializable,
 		AccessMode: pgx.ReadWrite,
 	})
 	if err != nil {
-		return nil, nil, fmt.Errorf("failed to start transaction: %w", err)
+		return nil, nil, nil, fmt.Errorf("failed to start transaction: %w", err)
 	}
-	return queries.New(pool).WithTx(tx), tx, nil
+	commit = func(ctx context.Context) error { return tx.Commit(ctx) }
+	rollback = func(ctx context.Context) error { return tx.Rollback(ctx) }
+	return queries.New(pool).WithTx(tx), commit, rollback, nil
 }

cmd/internal/logging/logging.go

@@ -5,8 +5,6 @@ import (
 	"log"
 )
 
-const DateFormat string = "Mon Jan 2 15:04:05 MST 2006"
-
 // Logger holds a out and err logger
 type Logger struct {
 	Out *log.Logger

cmd/internal/services/recital_service.go

@@ -49,10 +49,18 @@ func generateRecital(id int32, url string, pool *pgxpool.Pool, logger logging.Lo
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancel()
 
-	repository, _, err := db.NewRepositoryWithTx(ctx, pool)
+	repository, commit, rollback, err := db.NewRepositoryWithTx(ctx, pool)
 	if err != nil {
 		return err
 	}
+	defer func() {
+		// Rollback if an error occurred
+		if err != nil {
+			if err := rollback(ctx); err != nil {
+				logger.Err.Println(err)
+			}
+		}
+	}()
 
 	articleReader := article.NewReader(3 * time.Second)
 	articleContent, err := articleReader.Read(url)
@@ -98,7 +106,12 @@ func generateRecital(id int32, url string, pool *pgxpool.Pool, logger logging.Lo
 	if err := repository.UpdateRecitalStatus(ctx, queries.UpdateRecitalStatusParams{ID: id, Status: string(Completed)}); err != nil {
 		return err
 	}
+
+	if err := commit(ctx); err != nil {
+		return err
+	}
 	logger.Out.Println("Successfully generated and persisted recital.")
+
 	return nil
 }