Address PR feedback: merge newTaskQueue functions and simplify test

Co-authored-by: cschleiden <[email protected]>

Author: Copilot

backend/redis/queue.go

@@ -44,11 +44,7 @@ type KeyInfo struct {
 	SetKey    string
 }
 
-func newTaskQueue[T any](ctx context.Context, rdb redis.UniversalClient, keyPrefix string, tasktype string) (*taskQueue[T], error) {
-	return newTaskQueueWithWorkerName[T](ctx, rdb, keyPrefix, tasktype, "")
-}
-
-func newTaskQueueWithWorkerName[T any](ctx context.Context, rdb redis.UniversalClient, keyPrefix string, tasktype string, workerName string) (*taskQueue[T], error) {
+func newTaskQueue[T any](ctx context.Context, rdb redis.UniversalClient, keyPrefix string, tasktype string, workerName string) (*taskQueue[T], error) {
 	// Ensure the key prefix ends with a colon
 	if keyPrefix != "" && keyPrefix[len(keyPrefix)-1] != ':' {
 		keyPrefix += ":"

backend/redis/queue_test.go

@@ -106,7 +106,7 @@ func Test_TaskQueue(t *testing.T) {
 
 				ctx := context.Background()
 
-				q, err := newTaskQueue[foo](context.Background(), client, "prefix", taskType)
+				q, err := newTaskQueue[foo](context.Background(), client, "prefix", taskType, "")
 				require.NoError(t, err)
 
 				_, err = client.Pipelined(ctx, func(p redis.Pipeliner) error {
@@ -135,7 +135,7 @@ func Test_TaskQueue(t *testing.T) {
 				})
 				require.NoError(t, err)
 
-				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType)
+				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType, "")
 				require.NoError(t, err)
 
 				// Dequeue using second worker
@@ -148,7 +148,7 @@ func Test_TaskQueue(t *testing.T) {
 		{
 			name: "Complete removes task",
 			f: func(t *testing.T, q *taskQueue[any]) {
-				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType)
+				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType, "")
 
 				ctx := context.Background()
 
@@ -182,7 +182,7 @@ func Test_TaskQueue(t *testing.T) {
 				type taskData struct {
 					Count int `json:"count"`
 				}
-				q, _ := newTaskQueue[taskData](context.Background(), client, "prefix", taskType)
+				q, _ := newTaskQueue[taskData](context.Background(), client, "prefix", taskType, "")
 
 				ctx := context.Background()
 
@@ -193,7 +193,7 @@ func Test_TaskQueue(t *testing.T) {
 				})
 				require.NoError(t, err)
 
-				q2, _ := newTaskQueue[taskData](context.Background(), client, "prefix", taskType)
+				q2, _ := newTaskQueue[taskData](context.Background(), client, "prefix", taskType, "")
 				require.NoError(t, err)
 
 				task, err := q2.Dequeue(ctx, client, []workflow.Queue{workflow.QueueDefault}, lockTimeout, blockTimeout)
@@ -221,7 +221,7 @@ func Test_TaskQueue(t *testing.T) {
 				require.NoError(t, err)
 
 				// Create second worker (with different name)
-				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType)
+				q2, _ := newTaskQueue[any](context.Background(), client, "prefix", taskType, "")
 				require.NoError(t, err)
 
 				task, err := q2.Dequeue(ctx, client, []workflow.Queue{workflow.QueueDefault}, lockTimeout, blockTimeout)
@@ -281,7 +281,7 @@ func Test_TaskQueue(t *testing.T) {
 
 			ctx := context.Background()
 
-			q, err := newTaskQueue[any](ctx, client, "prefix", taskType)
+			q, err := newTaskQueue[any](ctx, client, "prefix", taskType, "")
 			require.NoError(t, err)
 
 			q.Prepare(ctx, client, []workflow.Queue{workflow.QueueDefault})

backend/redis/redis.go

@@ -42,12 +42,12 @@ func NewRedisBackend(client redis.UniversalClient, opts ...RedisBackendOption) (
 
 	ctx := context.Background()
 
-	workflowQueue, err := newTaskQueueWithWorkerName[workflowData](ctx, client, options.KeyPrefix, "workflows", options.WorkerName)
+	workflowQueue, err := newTaskQueue[workflowData](ctx, client, options.KeyPrefix, "workflows", options.WorkerName)
 	if err != nil {
 		return nil, fmt.Errorf("creating workflow task queue: %w", err)
 	}
 
-	activityQueue, err := newTaskQueueWithWorkerName[activityData](ctx, client, options.KeyPrefix, "activities", options.WorkerName)
+	activityQueue, err := newTaskQueue[activityData](ctx, client, options.KeyPrefix, "activities", options.WorkerName)
 	if err != nil {
 		return nil, fmt.Errorf("creating activity task queue: %w", err)
 	}

backend/sqlite/sqlite_test.go

@@ -1,15 +1,10 @@
 package sqlite
 
 import (
-	"context"
 	"testing"
-	"time"
 
 	"github.com/cschleiden/go-workflows/backend"
-	"github.com/cschleiden/go-workflows/backend/history"
 	"github.com/cschleiden/go-workflows/backend/test"
-	"github.com/cschleiden/go-workflows/core"
-	"github.com/cschleiden/go-workflows/workflow"
 	"github.com/stretchr/testify/require"
 )
 
@@ -76,39 +71,5 @@ func Test_SqliteBackend_WorkerName(t *testing.T) {
 
 		// Verify the worker name is stored correctly
 		require.Equal(t, customWorkerName, backend.workerName)
-
-		// Create a workflow instance and task to ensure the worker name is actually used
-		ctx := context.Background()
-		instance := core.NewWorkflowInstance("test-instance", "test-execution")
-		
-		event := history.NewPendingEvent(
-			time.Now(),
-			history.EventType_WorkflowExecutionStarted,
-			&history.ExecutionStartedAttributes{
-				Queue: "test-queue",
-				Metadata: &workflow.Metadata{},
-			},
-		)
-
-		// Create workflow instance
-		err := backend.CreateWorkflowInstance(ctx, instance, event)
-		require.NoError(t, err)
-
-		// Get a workflow task (this should lock it with our custom worker name)
-		task, err := backend.GetWorkflowTask(ctx, []workflow.Queue{"test-queue"})
-		require.NoError(t, err)
-		require.NotNil(t, task)
-
-		// Query the database to verify our custom worker name is used
-		rows, err := backend.db.Query("SELECT worker FROM instances WHERE id = ? AND execution_id = ?", 
-			instance.InstanceID, instance.ExecutionID)
-		require.NoError(t, err)
-		defer rows.Close()
-
-		var workerNameFromDB string
-		require.True(t, rows.Next())
-		err = rows.Scan(&workerNameFromDB)
-		require.NoError(t, err)
-		require.Equal(t, customWorkerName, workerNameFromDB)
 	})
 }