优化结构

internal/worker/task_runtime_test.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	taskbiz "kra/internal/biz/task"
+	platformtask "kra/pkg/task"
 )
 
 type workerTaskRepo struct {
@@ -63,8 +64,9 @@ func (r *workerTaskRepo) ListTaskLogs(context.Context, int, int, uint, string) (
 }
 
 func newTestTaskScheduler(repo *workerTaskRepo) *TaskScheduler {
-	tasks := taskbiz.NewTaskUsecase(repo)
-	executor := &TaskExecutor{tasks: tasks}
+	methods := platformtask.NewRegistry()
+	tasks := taskbiz.NewTaskUsecaseWithRegistry(repo, methods)
+	executor := &TaskExecutor{tasks: tasks, methods: methods}
 	logger := slog.New(slog.NewTextHandler(io.Discard, nil))
 	return NewTaskScheduler(tasks, nil, executor, logger)
 }
@@ -136,16 +138,18 @@ func TestManualTriggerSkipsOverlappingExecution(t *testing.T) {
 	started := make(chan struct{}, 2)
 	release := make(chan struct{})
 	var calls atomic.Int32
-	taskbiz.RegisterTaskMethod(methodName, "test", func(context.Context, json.RawMessage) error {
+	methods := platformtask.NewRegistry()
+	methods.Register(platformtask.Method{Name: methodName, Description: "test", Run: func(context.Context, json.RawMessage) error {
 		calls.Add(1)
 		started <- struct{}{}
 		<-release
 		return nil
-	})
+	}})
 
 	task := &taskbiz.TimedTask{ID: 9, Name: "single", ExecutorType: taskbiz.TaskExecutorMethod, MethodName: methodName}
 	repo := &workerTaskRepo{items: []*taskbiz.TimedTask{task}, logs: make(chan *taskbiz.TimedTaskLog, 2)}
-	scheduler := newTestTaskScheduler(repo)
+	tasks := taskbiz.NewTaskUsecaseWithRegistry(repo, methods)
+	scheduler := NewTaskScheduler(tasks, nil, &TaskExecutor{tasks: tasks, methods: methods}, slog.New(slog.NewTextHandler(io.Discard, nil)))
 	if err := scheduler.TriggerID(context.Background(), task.ID); err != nil {
 		t.Fatalf("first manual trigger failed: %v", err)
 	}
@@ -193,16 +197,18 @@ func TestAutomaticAndManualTriggersShareOverlapGate(t *testing.T) {
 	started := make(chan struct{}, 1)
 	release := make(chan struct{})
 	var calls atomic.Int32
-	taskbiz.RegisterTaskMethod(methodName, "test", func(context.Context, json.RawMessage) error {
+	methods := platformtask.NewRegistry()
+	methods.Register(platformtask.Method{Name: methodName, Description: "test", Run: func(context.Context, json.RawMessage) error {
 		calls.Add(1)
 		started <- struct{}{}
 		<-release
 		return nil
-	})
+	}})
 
 	task := &taskbiz.TimedTask{ID: 10, Name: "shared-gate", ExecutorType: taskbiz.TaskExecutorMethod, MethodName: methodName}
 	repo := &workerTaskRepo{logs: make(chan *taskbiz.TimedTaskLog, 1)}
-	scheduler := newTestTaskScheduler(repo)
+	tasks := taskbiz.NewTaskUsecaseWithRegistry(repo, methods)
+	scheduler := NewTaskScheduler(tasks, nil, &TaskExecutor{tasks: tasks, methods: methods}, slog.New(slog.NewTextHandler(io.Discard, nil)))
 	if !scheduler.dispatch(task, "auto", true) {
 		t.Fatal("automatic dispatch was rejected while idle")
 	}