Tasks Module Stage 2: Subtasks
- Create task_subtasks table migration - Create TaskSubtaskModel with CRUD operations - Add subtask API methods: addSubtask, toggleSubtask, deleteSubtask - Update TaskService to include subtasks in getTask() - Add Routes for subtasks API - Update show.twig with subtasks UI and JavaScript
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Modules\Tasks\Services;
|
||||
use App\Modules\Tasks\Models\TaskModel;
|
||||
use App\Modules\Tasks\Models\TaskAssigneeModel;
|
||||
use App\Modules\Tasks\Models\TaskColumnModel;
|
||||
use App\Modules\Tasks\Models\TaskSubtaskModel;
|
||||
use CodeIgniter\Events\Events;
|
||||
|
||||
class TaskService
|
||||
@@ -12,12 +13,14 @@ class TaskService
|
||||
protected TaskModel $taskModel;
|
||||
protected TaskAssigneeModel $assigneeModel;
|
||||
protected TaskColumnModel $columnModel;
|
||||
protected TaskSubtaskModel $subtaskModel;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->taskModel = new TaskModel();
|
||||
$this->assigneeModel = new TaskAssigneeModel();
|
||||
$this->columnModel = new TaskColumnModel();
|
||||
$this->subtaskModel = new TaskSubtaskModel();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -174,6 +177,9 @@ class TaskService
|
||||
}
|
||||
|
||||
$task['assignees'] = $this->assigneeModel->getAssigneesByTask($taskId);
|
||||
$task['subtasks'] = $this->subtaskModel->getByTask($taskId);
|
||||
$task['subtasks_count'] = count($task['subtasks']);
|
||||
$task['subtasks_completed'] = count(array_filter($task['subtasks'], fn($s) => $s['is_completed']));
|
||||
|
||||
return $task;
|
||||
}
|
||||
@@ -264,4 +270,83 @@ class TaskService
|
||||
|
||||
return $columns[0]['id'] ?? 1;
|
||||
}
|
||||
|
||||
// ========== Подзадачи (Subtasks) ==========
|
||||
|
||||
/**
|
||||
* Добавить подзадачу
|
||||
*/
|
||||
public function addSubtask(int $taskId, string $title, int $userId): int
|
||||
{
|
||||
$orderIndex = $this->subtaskModel->getNextOrder($taskId);
|
||||
|
||||
$subtaskId = $this->subtaskModel->insert([
|
||||
'task_id' => $taskId,
|
||||
'title' => trim($title),
|
||||
'order_index' => $orderIndex,
|
||||
]);
|
||||
|
||||
if ($subtaskId) {
|
||||
Events::trigger('task.subtask_created', $taskId, $subtaskId, $userId);
|
||||
}
|
||||
|
||||
return $subtaskId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Переключить статус подзадачи
|
||||
*/
|
||||
public function toggleSubtask(int $taskId, int $subtaskId, int $userId): bool
|
||||
{
|
||||
$subtask = $this->subtaskModel->find($subtaskId);
|
||||
if (!$subtask || $subtask['task_id'] != $taskId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$result = $this->subtaskModel->toggle($subtaskId);
|
||||
|
||||
if ($result) {
|
||||
Events::trigger('task.subtask_toggled', $taskId, $subtaskId, !$subtask['is_completed'], $userId);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Удалить подзадачу
|
||||
*/
|
||||
public function deleteSubtask(int $taskId, int $subtaskId, int $userId): bool
|
||||
{
|
||||
$subtask = $this->subtaskModel->find($subtaskId);
|
||||
if (!$subtask || $subtask['task_id'] != $taskId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$result = $this->subtaskModel->delete($subtaskId);
|
||||
|
||||
if ($result) {
|
||||
Events::trigger('task.subtask_deleted', $taskId, $subtaskId, $userId);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Обновить подзадачу
|
||||
*/
|
||||
public function updateSubtask(int $taskId, int $subtaskId, array $data, int $userId): bool
|
||||
{
|
||||
$subtask = $this->subtaskModel->find($subtaskId);
|
||||
if (!$subtask || $subtask['task_id'] != $taskId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$result = $this->subtaskModel->update($subtaskId, $data);
|
||||
|
||||
if ($result) {
|
||||
Events::trigger('task.subtask_updated', $taskId, $subtaskId, $data, $userId);
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user