refactor survery cmd

move package files to pkg

cmd/survey/tasks/createIssue.go

@@ -4,25 +4,26 @@ import (
 	"context"
 	"errors"
 
-	"github.com/LazyBachelor/LazyPM/cmd/survey/ui"
 	"github.com/LazyBachelor/LazyPM/internal/models"
 	"github.com/LazyBachelor/LazyPM/internal/service"
+	"github.com/LazyBachelor/LazyPM/pkg/task"
+	ui "github.com/LazyBachelor/LazyPM/pkg/task/ui"
 	"github.com/charmbracelet/huh"
 )
 
-func NewCreateIssueTask() *Task {
+func NewCreateIssueTask() *task.Task {
 	aboutScreen := ui.NewTaskModel(createIssueDetails())
 	questionnaire := ui.NewQuestionnaireModel(createIssueQuestionnaire())
 
-	task := NewTask(aboutScreen, questionnaire)
+	task := task.NewTask(aboutScreen, questionnaire)
 	task.SetConfigFunc(createIssueConfig)
 	task.SetDbStateFunc(createIssueDbState)
 	task.SetValidateFunc(createIssueValidate)
 	return task
 }
 
-func createIssueConfig() TaskConfig {
-	return TaskConfig{
+func createIssueConfig() task.TaskConfig {
+	return task.TaskConfig{
 		IssuePrefix:           "pm",
 		BeadsDBPath:           "./.pm/db.db",
 		StatisticsStoragePath: "./.pm/task-1-stats.json",

cmd/survey/tasks/runner.go

@@ -1,33 +0,0 @@
-package tasks
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/LazyBachelor/LazyPM/internal/service"
-	tea "github.com/charmbracelet/bubbletea"
-)
-
-func (t *Task) IntroduceTask() error {
-	if t.aboutScreen == nil {
-		return fmt.Errorf("aboutScreen is not set")
-	}
-	_, err := tea.NewProgram(t.aboutScreen, tea.WithAltScreen()).Run()
-	return err
-}
-
-func (t *Task) StartInterface(ctx context.Context, cfg service.Config) error {
-	if t.interfaceType == nil {
-		return fmt.Errorf("interfaceType is not set")
-	}
-
-	return t.interfaceType.Run(ctx, cfg)
-}
-
-func (t *Task) StartQuestionnaire() error {
-	if t.questionnaire == nil {
-		return fmt.Errorf("questionnaire is not set")
-	}
-	_, err := tea.NewProgram(t.questionnaire, tea.WithAltScreen()).Run()
-	return err
-}

cmd/survey/tasks/task.go

@@ -1,57 +0,0 @@
-// task.go
-package tasks
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/LazyBachelor/LazyPM/internal/service"
-	tea "github.com/charmbracelet/bubbletea"
-)
-
-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{
-		aboutScreen:   aboutScreen,
-		questionnaire: questionnaire,
-	}
-}
-
-func (t *Task) SetConfigFunc(fn ConfigFunc) {
-	t.Config = fn()
-}
-
-func (t *Task) SetInterface(interfaceType Interface) {
-	t.interfaceType = interfaceType
-}
-
-func (t *Task) SetDbStateFunc(fn DbStateFunc) {
-	t.dbStateFunc = fn
-}
-
-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 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)
-}

cmd/survey/tasks/types.go

@@ -1,17 +0,0 @@
-package tasks
-
-import (
-	"context"
-
-	"github.com/LazyBachelor/LazyPM/internal/service"
-)
-
-type TaskConfig = service.Config
-
-type Interface interface {
-	Run(context.Context, TaskConfig) error
-}
-
-type ConfigFunc func() TaskConfig
-type ValidateFunc func(context.Context, *service.Services) (ok bool, err error)
-type DbStateFunc func(context.Context, *service.Services) error