feat(workflow): implement workflow system with steps terminology (#102)
This commit is contained in:
@@ -5,17 +5,68 @@ import (
|
||||
"fmt"
|
||||
|
||||
"github.com/kandev/kandev/internal/task/dto"
|
||||
"github.com/kandev/kandev/internal/task/models"
|
||||
"github.com/kandev/kandev/internal/task/service"
|
||||
workflowmodels "github.com/kandev/kandev/internal/workflow/models"
|
||||
)
|
||||
|
||||
// WorkflowStepLister provides access to workflow steps for boards with workflow templates.
|
||||
// This allows the board controller to return workflow steps in snapshots.
|
||||
type WorkflowStepLister interface {
|
||||
ListStepsByBoard(ctx context.Context, boardID string) ([]*workflowmodels.WorkflowStep, error)
|
||||
}
|
||||
|
||||
type BoardController struct {
|
||||
service *service.Service
|
||||
service *service.Service
|
||||
workflowStepLister WorkflowStepLister
|
||||
}
|
||||
|
||||
func NewBoardController(svc *service.Service) *BoardController {
|
||||
return &BoardController{service: svc}
|
||||
}
|
||||
|
||||
// SetWorkflowStepLister sets the workflow step lister for returning workflow steps.
|
||||
func (c *BoardController) SetWorkflowStepLister(lister WorkflowStepLister) {
|
||||
c.workflowStepLister = lister
|
||||
}
|
||||
|
||||
// toWorkflowStepDTO converts a workflow step to a WorkflowStepDTO.
|
||||
func toWorkflowStepDTO(step *workflowmodels.WorkflowStep) dto.WorkflowStepDTO {
|
||||
return dto.WorkflowStepDTO{
|
||||
ID: step.ID,
|
||||
BoardID: step.BoardID,
|
||||
Name: step.Name,
|
||||
StepType: string(step.StepType),
|
||||
Position: step.Position,
|
||||
State: step.TaskState,
|
||||
Color: step.Color,
|
||||
AutoStartAgent: step.AutoStartAgent,
|
||||
PlanMode: step.PlanMode,
|
||||
RequireApproval: step.RequireApproval,
|
||||
PromptPrefix: step.PromptPrefix,
|
||||
PromptSuffix: step.PromptSuffix,
|
||||
AllowManualMove: step.AllowManualMove,
|
||||
CreatedAt: step.CreatedAt,
|
||||
UpdatedAt: step.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
// getStepsForBoard returns workflow steps for a board.
|
||||
func (c *BoardController) getStepsForBoard(ctx context.Context, board *models.Board) ([]dto.WorkflowStepDTO, error) {
|
||||
if c.workflowStepLister == nil {
|
||||
return nil, fmt.Errorf("workflow step lister not configured")
|
||||
}
|
||||
steps, err := c.workflowStepLister.ListStepsByBoard(ctx, board.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result := make([]dto.WorkflowStepDTO, 0, len(steps))
|
||||
for _, step := range steps {
|
||||
result = append(result, toWorkflowStepDTO(step))
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (c *BoardController) ListBoards(ctx context.Context, req dto.ListBoardsRequest) (dto.ListBoardsResponse, error) {
|
||||
boards, err := c.service.ListBoards(ctx, req.WorkspaceID)
|
||||
if err != nil {
|
||||
@@ -41,9 +92,10 @@ func (c *BoardController) GetBoard(ctx context.Context, req dto.GetBoardRequest)
|
||||
|
||||
func (c *BoardController) CreateBoard(ctx context.Context, req dto.CreateBoardRequest) (dto.BoardDTO, error) {
|
||||
board, err := c.service.CreateBoard(ctx, &service.CreateBoardRequest{
|
||||
WorkspaceID: req.WorkspaceID,
|
||||
Name: req.Name,
|
||||
Description: req.Description,
|
||||
WorkspaceID: req.WorkspaceID,
|
||||
Name: req.Name,
|
||||
Description: req.Description,
|
||||
WorkflowTemplateID: req.WorkflowTemplateID,
|
||||
})
|
||||
if err != nil {
|
||||
return dto.BoardDTO{}, err
|
||||
@@ -69,66 +121,12 @@ func (c *BoardController) DeleteBoard(ctx context.Context, req dto.DeleteBoardRe
|
||||
return dto.SuccessResponse{Success: true}, nil
|
||||
}
|
||||
|
||||
func (c *BoardController) ListColumns(ctx context.Context, req dto.ListColumnsRequest) (dto.ListColumnsResponse, error) {
|
||||
columns, err := c.service.ListColumns(ctx, req.BoardID)
|
||||
if err != nil {
|
||||
return dto.ListColumnsResponse{}, err
|
||||
}
|
||||
resp := dto.ListColumnsResponse{
|
||||
Columns: make([]dto.ColumnDTO, 0, len(columns)),
|
||||
Total: len(columns),
|
||||
}
|
||||
for _, column := range columns {
|
||||
resp.Columns = append(resp.Columns, dto.FromColumn(column))
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func (c *BoardController) GetColumn(ctx context.Context, req dto.GetColumnRequest) (dto.ColumnDTO, error) {
|
||||
column, err := c.service.GetColumn(ctx, req.ID)
|
||||
if err != nil {
|
||||
return dto.ColumnDTO{}, err
|
||||
}
|
||||
return dto.FromColumn(column), nil
|
||||
}
|
||||
|
||||
func (c *BoardController) CreateColumn(ctx context.Context, req dto.CreateColumnRequest) (dto.ColumnDTO, error) {
|
||||
column, err := c.service.CreateColumn(ctx, &service.CreateColumnRequest{
|
||||
BoardID: req.BoardID,
|
||||
Name: req.Name,
|
||||
Position: req.Position,
|
||||
State: req.State,
|
||||
Color: req.Color,
|
||||
})
|
||||
if err != nil {
|
||||
return dto.ColumnDTO{}, err
|
||||
}
|
||||
return dto.FromColumn(column), nil
|
||||
}
|
||||
|
||||
func (c *BoardController) UpdateColumn(ctx context.Context, req dto.UpdateColumnRequest) (dto.ColumnDTO, error) {
|
||||
column, err := c.service.UpdateColumn(ctx, req.ID, &service.UpdateColumnRequest{
|
||||
Name: req.Name,
|
||||
Position: req.Position,
|
||||
State: req.State,
|
||||
Color: req.Color,
|
||||
})
|
||||
if err != nil {
|
||||
return dto.ColumnDTO{}, err
|
||||
}
|
||||
return dto.FromColumn(column), nil
|
||||
}
|
||||
|
||||
func (c *BoardController) DeleteColumn(ctx context.Context, req dto.GetColumnRequest) error {
|
||||
return c.service.DeleteColumn(ctx, req.ID)
|
||||
}
|
||||
|
||||
func (c *BoardController) GetSnapshot(ctx context.Context, req dto.GetBoardSnapshotRequest) (dto.BoardSnapshotDTO, error) {
|
||||
board, err := c.service.GetBoard(ctx, req.BoardID)
|
||||
if err != nil {
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
columns, err := c.service.ListColumns(ctx, req.BoardID)
|
||||
steps, err := c.getStepsForBoard(ctx, board)
|
||||
if err != nil {
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
@@ -137,18 +135,17 @@ func (c *BoardController) GetSnapshot(ctx context.Context, req dto.GetBoardSnaps
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
|
||||
resp := dto.BoardSnapshotDTO{
|
||||
Board: dto.FromBoard(board),
|
||||
Columns: make([]dto.ColumnDTO, 0, len(columns)),
|
||||
Tasks: make([]dto.TaskDTO, 0, len(tasks)),
|
||||
// Fetch primary session IDs for all tasks in one query
|
||||
taskDTOs, err := c.convertTasksWithPrimarySessions(ctx, tasks)
|
||||
if err != nil {
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
for _, column := range columns {
|
||||
resp.Columns = append(resp.Columns, dto.FromColumn(column))
|
||||
}
|
||||
for _, task := range tasks {
|
||||
resp.Tasks = append(resp.Tasks, dto.FromTask(task))
|
||||
}
|
||||
return resp, nil
|
||||
|
||||
return dto.BoardSnapshotDTO{
|
||||
Board: dto.FromBoard(board),
|
||||
Steps: steps,
|
||||
Tasks: taskDTOs,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (c *BoardController) GetWorkspaceSnapshot(ctx context.Context, req dto.GetWorkspaceBoardSnapshotRequest) (dto.BoardSnapshotDTO, error) {
|
||||
@@ -172,7 +169,7 @@ func (c *BoardController) GetWorkspaceSnapshot(ctx context.Context, req dto.GetW
|
||||
return dto.BoardSnapshotDTO{}, fmt.Errorf("board does not belong to workspace: %s", req.WorkspaceID)
|
||||
}
|
||||
|
||||
columns, err := c.service.ListColumns(ctx, boardID)
|
||||
steps, err := c.getStepsForBoard(ctx, board)
|
||||
if err != nil {
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
@@ -181,16 +178,45 @@ func (c *BoardController) GetWorkspaceSnapshot(ctx context.Context, req dto.GetW
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
|
||||
resp := dto.BoardSnapshotDTO{
|
||||
Board: dto.FromBoard(board),
|
||||
Columns: make([]dto.ColumnDTO, 0, len(columns)),
|
||||
Tasks: make([]dto.TaskDTO, 0, len(tasks)),
|
||||
// Fetch primary session IDs for all tasks in one query
|
||||
taskDTOs, err := c.convertTasksWithPrimarySessions(ctx, tasks)
|
||||
if err != nil {
|
||||
return dto.BoardSnapshotDTO{}, err
|
||||
}
|
||||
for _, column := range columns {
|
||||
resp.Columns = append(resp.Columns, dto.FromColumn(column))
|
||||
}
|
||||
for _, task := range tasks {
|
||||
resp.Tasks = append(resp.Tasks, dto.FromTask(task))
|
||||
}
|
||||
return resp, nil
|
||||
|
||||
return dto.BoardSnapshotDTO{
|
||||
Board: dto.FromBoard(board),
|
||||
Steps: steps,
|
||||
Tasks: taskDTOs,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// convertTasksWithPrimarySessions converts task models to DTOs with primary session IDs.
|
||||
func (c *BoardController) convertTasksWithPrimarySessions(ctx context.Context, tasks []*models.Task) ([]dto.TaskDTO, error) {
|
||||
if len(tasks) == 0 {
|
||||
return []dto.TaskDTO{}, nil
|
||||
}
|
||||
|
||||
// Collect all task IDs
|
||||
taskIDs := make([]string, len(tasks))
|
||||
for i, task := range tasks {
|
||||
taskIDs[i] = task.ID
|
||||
}
|
||||
|
||||
// Fetch primary session IDs in bulk
|
||||
primarySessionMap, err := c.service.GetPrimarySessionIDsForTasks(ctx, taskIDs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Convert tasks to DTOs with primary session IDs
|
||||
result := make([]dto.TaskDTO, 0, len(tasks))
|
||||
for _, task := range tasks {
|
||||
var primarySessionID *string
|
||||
if sid, ok := primarySessionMap[task.ID]; ok {
|
||||
primarySessionID = &sid
|
||||
}
|
||||
result = append(result, dto.FromTaskWithPrimarySession(task, primarySessionID))
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
@@ -79,16 +79,16 @@ func (c *TaskController) CreateTask(ctx context.Context, req dto.CreateTaskReque
|
||||
}
|
||||
|
||||
task, err := c.service.CreateTask(ctx, &service.CreateTaskRequest{
|
||||
WorkspaceID: req.WorkspaceID,
|
||||
BoardID: req.BoardID,
|
||||
ColumnID: req.ColumnID,
|
||||
Title: req.Title,
|
||||
Description: req.Description,
|
||||
Priority: req.Priority,
|
||||
State: req.State,
|
||||
Repositories: repos,
|
||||
Position: req.Position,
|
||||
Metadata: req.Metadata,
|
||||
WorkspaceID: req.WorkspaceID,
|
||||
BoardID: req.BoardID,
|
||||
WorkflowStepID: req.WorkflowStepID,
|
||||
Title: req.Title,
|
||||
Description: req.Description,
|
||||
Priority: req.Priority,
|
||||
State: req.State,
|
||||
Repositories: repos,
|
||||
Position: req.Position,
|
||||
Metadata: req.Metadata,
|
||||
})
|
||||
if err != nil {
|
||||
return dto.TaskDTO{}, err
|
||||
@@ -131,12 +131,35 @@ func (c *TaskController) DeleteTask(ctx context.Context, req dto.DeleteTaskReque
|
||||
return dto.SuccessResponse{Success: true}, nil
|
||||
}
|
||||
|
||||
func (c *TaskController) MoveTask(ctx context.Context, req dto.MoveTaskRequest) (dto.TaskDTO, error) {
|
||||
task, err := c.service.MoveTask(ctx, req.ID, req.BoardID, req.ColumnID, req.Position)
|
||||
func (c *TaskController) MoveTask(ctx context.Context, req dto.MoveTaskRequest) (dto.MoveTaskResponse, error) {
|
||||
result, err := c.service.MoveTask(ctx, req.ID, req.BoardID, req.WorkflowStepID, req.Position)
|
||||
if err != nil {
|
||||
return dto.TaskDTO{}, err
|
||||
return dto.MoveTaskResponse{}, err
|
||||
}
|
||||
return dto.FromTask(task), nil
|
||||
|
||||
response := dto.MoveTaskResponse{
|
||||
Task: dto.FromTask(result.Task),
|
||||
}
|
||||
|
||||
// Include workflow step info if available
|
||||
if result.WorkflowStep != nil {
|
||||
response.WorkflowStep = dto.WorkflowStepDTO{
|
||||
ID: result.WorkflowStep.ID,
|
||||
BoardID: result.WorkflowStep.BoardID,
|
||||
Name: result.WorkflowStep.Name,
|
||||
StepType: result.WorkflowStep.StepType,
|
||||
Position: result.WorkflowStep.Position,
|
||||
Color: result.WorkflowStep.Color,
|
||||
AutoStartAgent: result.WorkflowStep.AutoStartAgent,
|
||||
PlanMode: result.WorkflowStep.PlanMode,
|
||||
RequireApproval: result.WorkflowStep.RequireApproval,
|
||||
PromptPrefix: result.WorkflowStep.PromptPrefix,
|
||||
PromptSuffix: result.WorkflowStep.PromptSuffix,
|
||||
AllowManualMove: result.WorkflowStep.AllowManualMove,
|
||||
}
|
||||
}
|
||||
|
||||
return response, nil
|
||||
}
|
||||
|
||||
func (c *TaskController) UpdateTaskState(ctx context.Context, req dto.UpdateTaskStateRequest) (dto.TaskDTO, error) {
|
||||
@@ -161,3 +184,36 @@ func (c *TaskController) GetSessionCommits(ctx context.Context, sessionID string
|
||||
func (c *TaskController) GetCumulativeDiff(ctx context.Context, sessionID string) (*models.CumulativeDiff, error) {
|
||||
return c.service.GetCumulativeDiff(ctx, sessionID)
|
||||
}
|
||||
|
||||
// ApproveSession approves a session's current step and moves it to the on_approval_step_id
|
||||
func (c *TaskController) ApproveSession(ctx context.Context, req dto.ApproveSessionRequest) (dto.ApproveSessionResponse, error) {
|
||||
result, err := c.service.ApproveSession(ctx, req.SessionID)
|
||||
if err != nil {
|
||||
return dto.ApproveSessionResponse{}, err
|
||||
}
|
||||
|
||||
resp := dto.ApproveSessionResponse{
|
||||
Success: true,
|
||||
Session: dto.FromTaskSession(result.Session),
|
||||
}
|
||||
|
||||
// Include the new workflow step if present
|
||||
if result.WorkflowStep != nil {
|
||||
resp.WorkflowStep = dto.WorkflowStepDTO{
|
||||
ID: result.WorkflowStep.ID,
|
||||
BoardID: result.WorkflowStep.BoardID,
|
||||
Name: result.WorkflowStep.Name,
|
||||
StepType: result.WorkflowStep.StepType,
|
||||
Position: result.WorkflowStep.Position,
|
||||
Color: result.WorkflowStep.Color,
|
||||
AutoStartAgent: result.WorkflowStep.AutoStartAgent,
|
||||
PlanMode: result.WorkflowStep.PlanMode,
|
||||
RequireApproval: result.WorkflowStep.RequireApproval,
|
||||
PromptPrefix: result.WorkflowStep.PromptPrefix,
|
||||
PromptSuffix: result.WorkflowStep.PromptSuffix,
|
||||
AllowManualMove: result.WorkflowStep.AllowManualMove,
|
||||
}
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user