add support for pointer parameters in functions (#22)

Author: siherrmann

core/runner.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/siherrmann/queuer/helper"
 	"github.com/siherrmann/queuer/model"
+	vh "github.com/siherrmann/validator/helper"
 )
 
 type Runner struct {
@@ -35,12 +36,11 @@ func NewRunner(options *model.Options, task interface{}, parameters ...interface
 	}
 
 	for i, param := range parameters {
-		// Convert json float to int if the parameter is int
-		if taskInputParameters[i].Kind() == reflect.Int && reflect.TypeOf(param).Kind() == reflect.Float64 {
-			parameters[i] = int(param.(float64))
-		} else if taskInputParameters[i].Kind() != reflect.TypeOf(param).Kind() {
+		paramConverted, err := vh.AnyToType(param, taskInputParameters[i])
+		if err != nil {
 			return nil, fmt.Errorf("parameter %d of task must be of type %s, got %s", i, taskInputParameters[i].Kind(), reflect.TypeOf(param).Kind())
 		}
+		parameters[i] = paramConverted
 	}
 
 	err = helper.CheckValidTaskWithParameters(task, parameters...)

core/runner_test.go

@@ -425,3 +425,138 @@ outerLoop:
 		}
 	}
 }
+
+// Test structs for struct parameter tests
+type TestConfig struct {
+	Name  string
+	Value int
+}
+
+type TestData struct {
+	ID      int
+	Message string
+	Active  bool
+}
+
+// Task function that accepts a struct and pointer to struct
+func taskWithStructParams(config TestConfig, data *TestData) (string, error) {
+	if data == nil {
+		return "", fmt.Errorf("data cannot be nil")
+	}
+	return fmt.Sprintf("%s-%d: %s (ID: %d, Active: %t)", config.Name, config.Value, data.Message, data.ID, data.Active), nil
+}
+
+// TestNewRunnerWithStructParameters tests the runner with struct and pointer-to-struct parameters
+func TestNewRunnerWithStructParameters(t *testing.T) {
+	tests := []struct {
+		name       string
+		param1     interface{}
+		param2     interface{}
+		wantErr    bool
+		wantResult string
+	}{
+		{
+			name: "Valid Struct and Pointer",
+			param1: TestConfig{
+				Name:  "config",
+				Value: 42,
+			},
+			param2: &TestData{
+				ID:      1,
+				Message: "test message",
+				Active:  true,
+			},
+			wantErr:    false,
+			wantResult: "config-42: test message (ID: 1, Active: true)",
+		},
+		{
+			name: "Map to Struct and Map to Pointer Conversion",
+			param1: map[string]interface{}{
+				"Name":  "fromMap",
+				"Value": 99,
+			},
+			param2: map[string]interface{}{
+				"ID":      2,
+				"Message": "converted from map",
+				"Active":  false,
+			},
+			wantErr:    false,
+			wantResult: "fromMap-99: converted from map (ID: 2, Active: false)",
+		},
+		{
+			name: "Struct Value and Map to Pointer",
+			param1: TestConfig{
+				Name:  "direct",
+				Value: 10,
+			},
+			param2: map[string]interface{}{
+				"ID":      3,
+				"Message": "mixed params",
+				"Active":  true,
+			},
+			wantErr:    false,
+			wantResult: "direct-10: mixed params (ID: 3, Active: true)",
+		},
+		{
+			name: "Map to Struct with Type Conversion",
+			param1: map[string]interface{}{
+				"Name":  "typeConv",
+				"Value": 25.0, // float64 should convert to int
+			},
+			param2: map[string]interface{}{
+				"ID":      4.0, // float64 should convert to int
+				"Message": "type conversion test",
+				"Active":  true,
+			},
+			wantErr:    false,
+			wantResult: "typeConv-25: type conversion test (ID: 4, Active: true)",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			mockTask, err := model.NewTask(taskWithStructParams)
+			require.NoError(t, err, "Failed to create mock task")
+
+			job := &model.Job{
+				TaskName: mockTask.Name,
+				Parameters: []interface{}{
+					test.param1,
+					test.param2,
+				},
+				Options: &model.Options{
+					OnError: &model.OnError{
+						Timeout: 5.0,
+					},
+				},
+			}
+
+			runner, err := NewRunnerFromJob(mockTask, job)
+			if test.wantErr {
+				assert.Error(t, err, "NewRunnerFromJob should return an error")
+				return
+			}
+
+			require.NoError(t, err, "NewRunnerFromJob should not return an error")
+			assert.NotNil(t, runner)
+
+			go runner.Run(context.Background())
+
+		outerLoop:
+			for {
+				select {
+				case err := <-runner.ErrorChannel:
+					assert.NoError(t, err, "Runner should not return an error")
+					break outerLoop
+				case results := <-runner.ResultsChannel:
+					assert.NotNil(t, results)
+					assert.Len(t, results, 1)
+					assert.Equal(t, test.wantResult, results[0])
+					break outerLoop
+				case <-time.After(2 * time.Second):
+					t.Fatal("Test timed out")
+				}
+			}
+		})
+	}
+}

go.mod

@@ -68,6 +68,7 @@ require (
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/shirou/gopsutil/v4 v4.25.10 // indirect
 	github.com/siherrmann/queuerSql v0.0.0-20251130135331-9ed23b19fae5
+	github.com/siherrmann/validator v0.11.0
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.10.1
 	github.com/tklauser/go-sysconf v0.3.16 // indirect

go.sum

@@ -127,6 +127,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shirou/gopsutil/v4 v4.25.10 h1:at8lk/5T1OgtuCp+AwrDofFRjnvosn0nkN2OLQ6g8tA=
 github.com/shirou/gopsutil/v4 v4.25.10/go.mod h1:+kSwyC8DRUD9XXEHCAFjK+0nuArFJM0lva+StQAcskM=
+github.com/siherrmann/validator v0.11.0 h1:DTLzGvwZUJwhr842xZkX/m7ed4DMFKJ9AKoYDk4+cNs=
+github.com/siherrmann/validator v0.11.0/go.mod h1:LqNNViIg5YKzO4SX4zMdafyffL6xCWuRqSyt1szpolo=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=