From 412b2fe0c2b7da008061124630e9737295569c25 Mon Sep 17 00:00:00 2001 From: Robin Olsen Date: Thu, 12 Feb 2026 22:06:48 +0100 Subject: [PATCH] add config to tasks use fmt.Errorf --- cmd/survey/tasks/task.go | 46 +++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/cmd/survey/tasks/task.go b/cmd/survey/tasks/task.go index 71b54eb..9e6553b 100644 --- a/cmd/survey/tasks/task.go +++ b/cmd/survey/tasks/task.go @@ -3,43 +3,55 @@ package tasks import ( "context" - "errors" + "fmt" "github.com/LazyBachelor/LazyPM/internal/service" tea "github.com/charmbracelet/bubbletea" ) -func NewTask(interfaceType Interface, aboutScreen tea.Model, questionnaire tea.Model) *Task { +type Task struct { + Config TaskConfig + interfaceType Interface + aboutScreen tea.Model + questionnaire tea.Model + + validateFunc ValidateFunc + dbStateFunc DbStateFunc +} + +func NewTask(aboutScreen tea.Model, questionnaire tea.Model) *Task { return &Task{ - interfaceType: interfaceType, aboutScreen: aboutScreen, questionnaire: questionnaire, } } -func (t *Task) SetValidateFunc(fn ValidateFunc) { - t.validateFunc = fn -} - -func (t *Task) SetDbStateFunc(fn DbStateFunc) { - t.dbStateFunc = fn +func (t *Task) SetConfigFunc(fn ConfigFunc) { + t.Config = fn() } func (t *Task) SetInterface(interfaceType Interface) { t.interfaceType = interfaceType } -func (t *Task) Validate(ctx context.Context, svc *service.Services) (bool, error) { - if t.validateFunc == nil { - return false, errors.New("validateFunc is not set") - } - return t.validateFunc(ctx, svc) +func (t *Task) SetDbStateFunc(fn DbStateFunc) { + t.dbStateFunc = fn } -func (t *Task) MigrateToTask(ctx context.Context, svc *service.Services, task *Task) error { - t = task +func (t *Task) SetValidateFunc(fn ValidateFunc) { + t.validateFunc = fn +} + +func (t *Task) Initialize(ctx context.Context, svc *service.Services) error { if t.dbStateFunc == nil { - return errors.New("dbStateFunc is not set") + return fmt.Errorf("dbStateFunc is not set") } return t.dbStateFunc(ctx, svc) } + +func (t *Task) Validate(ctx context.Context, svc *service.Services) (bool, error) { + if t.validateFunc == nil { + return false, fmt.Errorf("validateFunc is not set") + } + return t.validateFunc(ctx, svc) +}