feat: save jobs after execution #8

job.go

@@ -131,7 +131,7 @@ func (j *Job[T]) GetScheduler() Scheduler {
 // Execute executes the job
 func (j *Job[T]) Execute(ctx context.Context) (RunGenericResult, error) {
 	startTime := time.Now()
-	r, runnerError := j.runner.Run()
+	r, runnerError := j.runner.Run(ctx)
 	endTime := time.Now()
 	elapsedTime := endTime.Sub(startTime)
 

job_test.go

@@ -113,7 +113,7 @@ echo "Hello World"
 	if err != nil {
 		t.Fatal(err)
 	}
-	tmpfile.Write([]byte(scriptContent))
+	_, _ = tmpfile.Write([]byte(scriptContent))
 
 	defer tmpfile.Close()
 
@@ -135,7 +135,7 @@ echo "Hello World"
 	assert.NotEqual(t, 0, stats.TimeMetrics.MinRunTime)
 
 	// Simulate a failed run
-	job.Execute(context.Background()) // Assume Execute updates stats and returns an error
+	_, _ = job.Execute(context.Background()) // Assume Execute updates stats and returns an error
 	stats = job.stats
 
 	assert.Equal(t, 2, stats.RunCount)

manager.go

@@ -326,6 +326,7 @@ func (m *Manager) GetLogger() Logger {
 	return m.logger
 }
 
+// handleJobEvents handles job events
 func (m *Manager) handleJobEvents() {
 
 	for event := range m.jobEventCh {

runnable-counter.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"sync"
 )
@@ -37,7 +38,7 @@ func (c *CounterRunnable) GetCount() int {
 }
 
 // Run runs the counter
-func (c *CounterRunnable) Run() (RunResult[CounterResult], error) {
+func (c *CounterRunnable) Run(_ context.Context) (RunResult[CounterResult], error) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 

runnable-counter_test.go

@@ -2,13 +2,17 @@ package jobqueue
 
 import (
 	"testing"
+
+	"context"
 )
 
 func TestRunnableCounter(t *testing.T) {
 
 	runner := &CounterRunnable{}
 
-	r, err := runner.Run()
+	ctx := context.Background()
+
+	r, err := runner.Run(ctx)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}

runnable-dummy.go

 package jobqueue
 
+import "context"
+
 func NewDummyRunnableFromMap(data map[string]any) (*DummyRunnable, error) {
 	return &DummyRunnable{}, nil
 }
@@ -10,7 +12,7 @@ type DummyResult struct {
 
 type DummyRunnable struct{}
 
-func (d *DummyRunnable) Run() (RunResult[DummyResult], error) {
+func (d *DummyRunnable) Run(_ context.Context) (RunResult[DummyResult], error) {
 	return RunResult[DummyResult]{
 		Status: ResultStatusSuccess,
 	}, nil

runnable-dummy_test.go

 package jobqueue
 
 import (
+	"context"
 	"testing"
 )
 
@@ -8,7 +9,8 @@ func TestDummyRunnable(t *testing.T) {
 
 	runner := &DummyRunnable{}
 
-	_, err := runner.Run()
+	ctx := context.Background()
+	_, err := runner.Run(ctx)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}

runnable-fileoperation.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"os"
 )
@@ -47,7 +48,7 @@ type FileOperationRunnable struct {
 	Content   string // Optional, je nach Operation
 }
 
-func (f *FileOperationRunnable) Run() (RunResult[FileOperationResult], error) {
+func (f *FileOperationRunnable) Run(_ context.Context) (RunResult[FileOperationResult], error) {
 	switch f.Operation {
 	case FileOperationRead:
 		content, err := os.ReadFile(f.FilePath)

runnable-fileoperation_test.go

 package jobqueue
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 	"path"
@@ -15,26 +16,28 @@ func TestFileOperationRunnable(t *testing.T) {
 		t.Fatalf("Failed to change directory: %v", err)
 	}
 
+	ctx := context.Background()
+
 	testFilePath := path.Join(dir, "test.txt")
 	testContent := "Hello, World!"
 
 	// Test FileOperationCreate
 	createRunner := FileOperationRunnable{Operation: FileOperationCreate, FilePath: testFilePath}
-	_, err = createRunner.Run()
+	_, err = createRunner.Run(ctx)
 	if err != nil {
 		t.Fatalf("Failed to create file: %v", err)
 	}
 
 	// Test FileOperationWrite
 	writeRunner := FileOperationRunnable{Operation: FileOperationWrite, FilePath: testFilePath, Content: testContent}
-	_, err = writeRunner.Run()
+	_, err = writeRunner.Run(ctx)
 	if err != nil {
 		t.Fatalf("Failed to write to file: %v", err)
 	}
 
 	// Test FileOperationRead
 	readRunner := FileOperationRunnable{Operation: FileOperationRead, FilePath: testFilePath}
-	result, err := readRunner.Run()
+	result, err := readRunner.Run(ctx)
 	if err != nil || result.Data.Content != testContent {
 		t.Fatalf("Failed to read from file: %v", err)
 	}
@@ -42,7 +45,7 @@ func TestFileOperationRunnable(t *testing.T) {
 	// Test FileOperationAppend
 	appendContent := " Appended."
 	appendRunner := FileOperationRunnable{Operation: FileOperationAppend, FilePath: testFilePath, Content: appendContent}
-	_, err = appendRunner.Run()
+	_, err = appendRunner.Run(ctx)
 	if err != nil {
 		t.Fatalf("Failed to append to file: %v", err)
 	}
@@ -55,7 +58,7 @@ func TestFileOperationRunnable(t *testing.T) {
 
 	// Test FileOperationDelete
 	deleteRunner := FileOperationRunnable{Operation: FileOperationDelete, FilePath: testFilePath}
-	_, err = deleteRunner.Run()
+	_, err = deleteRunner.Run(ctx)
 	if err != nil {
 		t.Fatalf("Failed to delete file: %v", err)
 	}

runnable-gorm.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
@@ -38,34 +39,41 @@ type DBRunnable struct {
 	Type  string
 	DSN   string
 	Query string
-	db    *gorm.DB // internal for testing
 }
 
-func (d *DBRunnable) Run() (RunResult[DBResult], error) {
+type dbKey struct{}
+
+// DBRunnableWithDB returns a new context with the provided gorm.DB injected.
+func DBRunnableWithDB(ctx context.Context, db *gorm.DB) context.Context {
+	return context.WithValue(ctx, dbKey{}, db)
+}
+
+// GetDBFromContext tries to retrieve a *gorm.DB from the context. If it exists, returns the db and true, otherwise returns nil and false.
+func getDBFromContext(ctx context.Context) (*gorm.DB, bool) {
+	db, ok := ctx.Value(dbKey{}).(*gorm.DB)
+	return db, ok
+}
+
+func (d *DBRunnable) Run(ctx context.Context) (RunResult[DBResult], error) {
 	var db *gorm.DB
+	var ok bool
 	var err error
 
-	if d.db == nil {
-
+	if db, ok = getDBFromContext(ctx); !ok {
+		// No *gorm.DB in context, create a new connection
 		switch d.Type {
 		case "mysql":
 			db, err = gorm.Open(mysql.Open(d.DSN), &gorm.Config{})
-
 		default:
 			return RunResult[DBResult]{Status: ResultStatusFailed}, ErrUnsupportedDatabaseType
 		}
-	} else {
-		db = d.db
-	}
 
 		if err != nil {
 			return RunResult[DBResult]{Status: ResultStatusFailed}, err
 		}
+	}
 
-	var result *gorm.DB
-
-	result = db.Exec(d.Query)
-
+	result := db.Exec(d.Query)
 	if result.Error != nil {
 		return RunResult[DBResult]{Status: ResultStatusFailed}, result.Error
 	}

runnable-gorm_test.go

 package jobqueue
 
 import (
+	"context"
 	"github.com/DATA-DOG/go-sqlmock"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
@@ -29,12 +30,14 @@ func TestDBRunnable_Run(t *testing.T) {
 	// Erstellen Sie die zu testende Instanz
 	runnable := &DBRunnable{
 		Type:  "mysql",
-		db:    gormDB, // Injizierte Mock-DB
 		Query: "SELECT * FROM table_name",
 	}
 
+	ctx := context.Background()
+	ctx = DBRunnableWithDB(ctx, gormDB)
+
 	// Rufen Sie die Run()-Methode auf und überprüfen Sie die Ergebnisse
-	result, err := runnable.Run()
+	result, err := runnable.Run(ctx)
 
 	// Überprüfungen hier
 	if err != nil {

runnable-http.go

@@ -2,6 +2,7 @@ package jobqueue
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -49,11 +50,11 @@ type HTTPRunnable struct {
 	Body   string
 }
 
-func (h *HTTPRunnable) Run() (RunResult[HTTPResult], error) {
+func (h *HTTPRunnable) Run(ctx context.Context) (RunResult[HTTPResult], error) {
 	client := &http.Client{}
 
 	reqBody := bytes.NewBufferString(h.Body)
-	req, err := http.NewRequest(h.Method, h.URL, reqBody)
+	req, err := http.NewRequestWithContext(ctx, h.Method, h.URL, reqBody)
 	if err != nil {
 		return RunResult[HTTPResult]{Status: ResultStatusFailed}, err
 	}

runnable-http_test.go

 package jobqueue
 
 import (
+	"context"
 	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
@@ -23,7 +24,8 @@ func TestHTTPRunnable_Run(t *testing.T) {
 		Body: "",
 	}
 
-	result, err := httpRunnable.Run()
+	ctx := context.Background()
+	result, err := httpRunnable.Run(ctx)
 
 	// Assertions
 	assert.NoError(t, err)

runnable-mail.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"net/smtp"
 )
@@ -83,7 +84,7 @@ type MailRunnable struct {
 	Headers  map[string]string
 }
 
-func (m *MailRunnable) Run() (RunResult[MailResult], error) {
+func (m *MailRunnable) Run(_ context.Context) (RunResult[MailResult], error) {
 
 	smtpServer := m.Server + ":" + m.Port
 

runnable-mail_test.go

@@ -170,7 +170,8 @@ func TestMailRunner(t *testing.T) {
 		},
 	}
 
-	result, err := mailRunnable.Run()
+	xtx := context.Background()
+	result, err := mailRunnable.Run(xtx)
 
 	// Assertions
 	assert.NoError(t, err)

runnable-sftp.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
@@ -103,7 +104,7 @@ type SFTPRunnable struct {
 	TransferDirection Direction
 }
 
-func (s *SFTPRunnable) Run() (RunResult[SFTPResult], error) {
+func (s *SFTPRunnable) Run(_ context.Context) (RunResult[SFTPResult], error) {
 
 	var authMethod ssh.AuthMethod
 

runnable-sftp_test.go

@@ -177,7 +177,8 @@ func TestSFTPCRunnerLocalToRemote(t *testing.T) {
 		TransferDirection: LocalToRemote,
 	}
 
-	result, err := sftpRunnable.Run()
+	ctx = context.Background()
+	result, err := sftpRunnable.Run(ctx)
 
 	// Assertions
 	assert.NoError(t, err)
@@ -280,7 +281,8 @@ func TestSFTPCRunnerRemoteToLocal(t *testing.T) {
 	}
 
 	// Methode aufrufen
-	result, err := sftpRunnable.Run()
+	ctx = context.Background()
+	result, err := sftpRunnable.Run(ctx)
 
 	// Assertions
 	assert.NoError(t, err)

runnable-shell.go

 package jobqueue
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -38,7 +39,7 @@ type ShellRunnable struct {
 	Script     string
 }
 
-func (s *ShellRunnable) Run() (RunResult[ShellResult], error) {
+func (s *ShellRunnable) Run(ctx context.Context) (RunResult[ShellResult], error) {
 
 	scriptPath := s.ScriptPath
 
@@ -75,7 +76,7 @@ func (s *ShellRunnable) Run() (RunResult[ShellResult], error) {
 	}
 
 	// #nosec
-	cmd := exec.Command("sh", scriptPath)
+	cmd := exec.CommandContext(ctx, "sh", scriptPath)
 	output, err := cmd.Output()
 
 	var stderr []byte

runnable-shell_test.go

 package jobqueue
 
 import (
+	"context"
 	"os"
 	"path"
 	"testing"
@@ -27,7 +28,8 @@ func TestShellRunnable_Run(t *testing.T) {
 	shellRunnable := ShellRunnable{ScriptPath: fp.Name()}
 
 	// Run-Methode aufrufen
-	result, err := shellRunnable.Run()
+	ctx := context.Background()
+	result, err := shellRunnable.Run(ctx)
 
 	// Überprüfungen
 	if err != nil {

runnable.go

 package jobqueue
 
+import (
+	"context"
+)
+
 type ResultStatus int
 
 const (
@@ -21,7 +25,7 @@ func (r RunResult[T]) GetStatus() ResultStatus {
 }
 
 type Runnable[T any] interface {
-	Run() (RunResult[T], error)
+	Run(ctx context.Context) (RunResult[T], error)
 	GetType() string
 
 	GetPersistence() RunnableImport