Refactor: Create shared AttachmentService and AttachmentModel
- Created common AttachmentService for all modules (app/Services/) - Created common AttachmentModel (app/Models/) - Created common migration (app/Database/Migrations/) - Updated Tasks module to use shared AttachmentService - Added Twig functions: format_filesize(), get_file_icon() - Removed duplicate TaskAttachmentModel and task_attachments migration - AttachmentService can be used by any module: task, deal, contact, etc.
This commit is contained in:
@@ -706,10 +706,10 @@ class TasksController extends BaseController
|
||||
throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound('Задача не найдена');
|
||||
}
|
||||
|
||||
$attachmentModel = new \App\Modules\Tasks\Models\TaskAttachmentModel();
|
||||
$attachment = $attachmentModel->find($attachmentId);
|
||||
$attachmentModel = new \App\Models\AttachmentModel();
|
||||
$attachment = $attachmentModel->getById($attachmentId);
|
||||
|
||||
if (!$attachment || $attachment['task_id'] != $taskId) {
|
||||
if (!$attachment || $attachment['entity_type'] !== 'task' || $attachment['entity_id'] != $taskId) {
|
||||
throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound('Вложение не найдено');
|
||||
}
|
||||
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Modules\Tasks\Models;
|
||||
|
||||
use CodeIgniter\Model;
|
||||
use App\Models\Traits\TenantScopedModel;
|
||||
|
||||
class TaskAttachmentModel extends Model
|
||||
{
|
||||
use TenantScopedModel;
|
||||
|
||||
protected $table = 'task_attachments';
|
||||
protected $primaryKey = 'id';
|
||||
protected $useAutoIncrement = true;
|
||||
protected $returnType = 'array';
|
||||
protected $useSoftDeletes = false;
|
||||
protected $tenantField = 'task.organization_id';
|
||||
protected $allowedFields = [
|
||||
'task_id',
|
||||
'file_name',
|
||||
'file_path',
|
||||
'file_size',
|
||||
'file_type',
|
||||
'uploaded_by',
|
||||
];
|
||||
protected $useTimestamps = true;
|
||||
protected $createdField = 'created_at';
|
||||
protected $updatedField = 'updated_at';
|
||||
|
||||
/**
|
||||
* Получить вложения задачи
|
||||
*/
|
||||
public function getByTask(int $taskId): array
|
||||
{
|
||||
return $this->where('task_id', $taskId)
|
||||
->orderBy('created_at', 'DESC')
|
||||
->findAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить вложение по ID
|
||||
*/
|
||||
public function getById(int $attachmentId): ?array
|
||||
{
|
||||
return $this->find($attachmentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Удалить вложение
|
||||
*/
|
||||
public function deleteAttachment(int $attachmentId, int $userId): bool
|
||||
{
|
||||
$attachment = $this->find($attachmentId);
|
||||
if (!$attachment) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Удаляем файл с диска
|
||||
$filePath = $attachment['file_path'];
|
||||
if (file_exists($filePath)) {
|
||||
unlink($filePath);
|
||||
}
|
||||
|
||||
return $this->delete($attachmentId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить размер файла в человекочитаемом формате
|
||||
*/
|
||||
public function formatSize(int $bytes): string
|
||||
{
|
||||
if ($bytes >= 1073741824) {
|
||||
return number_format($bytes / 1073741824, 2) . ' GB';
|
||||
} elseif ($bytes >= 1048576) {
|
||||
return number_format($bytes / 1048576, 2) . ' MB';
|
||||
} elseif ($bytes >= 1024) {
|
||||
return number_format($bytes / 1024, 2) . ' KB';
|
||||
}
|
||||
|
||||
return $bytes . ' B';
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить иконку для типа файла
|
||||
*/
|
||||
public function getFileIcon(string $fileType): string
|
||||
{
|
||||
$icons = [
|
||||
'image' => 'fa-file-image',
|
||||
'pdf' => 'fa-file-pdf',
|
||||
'word' => 'fa-file-word',
|
||||
'excel' => 'fa-file-excel',
|
||||
'powerpoint' => 'fa-file-powerpoint',
|
||||
'zip' => 'fa-file-zipper',
|
||||
'text' => 'fa-file-lines',
|
||||
'video' => 'fa-file-video',
|
||||
'audio' => 'fa-file-audio',
|
||||
];
|
||||
|
||||
foreach ($icons as $key => $icon) {
|
||||
if (stripos($fileType, $key) !== false) {
|
||||
return $icon;
|
||||
}
|
||||
}
|
||||
|
||||
return 'fa-file';
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@ 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 App\Modules\Tasks\Models\TaskAttachmentModel;
|
||||
use App\Services\AttachmentService;
|
||||
use CodeIgniter\Events\Events;
|
||||
|
||||
class TaskService
|
||||
@@ -15,7 +15,7 @@ class TaskService
|
||||
protected TaskAssigneeModel $assigneeModel;
|
||||
protected TaskColumnModel $columnModel;
|
||||
protected TaskSubtaskModel $subtaskModel;
|
||||
protected TaskAttachmentModel $attachmentModel;
|
||||
protected AttachmentService $attachmentService;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
@@ -23,7 +23,7 @@ class TaskService
|
||||
$this->assigneeModel = new TaskAssigneeModel();
|
||||
$this->columnModel = new TaskColumnModel();
|
||||
$this->subtaskModel = new TaskSubtaskModel();
|
||||
$this->attachmentModel = new TaskAttachmentModel();
|
||||
$this->attachmentService = new AttachmentService();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -183,8 +183,8 @@ class TaskService
|
||||
$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']));
|
||||
$task['attachments'] = $this->attachmentModel->getByTask($taskId);
|
||||
$task['attachments_count'] = count($task['attachments']);
|
||||
$task['attachments'] = $this->attachmentService->getByEntity('task', $taskId);
|
||||
$task['attachments_count'] = $this->attachmentService->count('task', $taskId);
|
||||
|
||||
return $task;
|
||||
}
|
||||
@@ -355,45 +355,14 @@ class TaskService
|
||||
return $result;
|
||||
}
|
||||
|
||||
// ========== Вложения (Attachments) ==========
|
||||
// ========== Вложения (Attachments) - используем общий AttachmentService ==========
|
||||
|
||||
/**
|
||||
* Загрузить вложение
|
||||
*/
|
||||
public function uploadAttachment(int $taskId, array $file, int $userId): ?int
|
||||
{
|
||||
$uploadPath = WRITEPATH . 'uploads/tasks/' . $taskId . '/';
|
||||
|
||||
// Создаём директорию если не существует
|
||||
if (!is_dir($uploadPath)) {
|
||||
mkdir($uploadPath, 0755, true);
|
||||
}
|
||||
|
||||
// Генерируем уникальное имя файла
|
||||
$originalName = $file['name'];
|
||||
$extension = pathinfo($originalName, PATHINFO_EXTENSION);
|
||||
$newFileName = uniqid() . '_' . time() . '.' . $extension;
|
||||
$filePath = $uploadPath . $newFileName;
|
||||
|
||||
// Перемещаем загруженный файл
|
||||
if (!move_uploaded_file($file['tmp_name'], $filePath)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$attachmentId = $this->attachmentModel->insert([
|
||||
'task_id' => $taskId,
|
||||
'file_name' => $originalName,
|
||||
'file_path' => $filePath,
|
||||
'file_size' => $file['size'],
|
||||
'file_type' => $file['type'] ?? '',
|
||||
'uploaded_by' => $userId,
|
||||
]);
|
||||
|
||||
if ($attachmentId) {
|
||||
Events::trigger('task.attachment_uploaded', $taskId, $attachmentId, $userId);
|
||||
}
|
||||
|
||||
return $attachmentId;
|
||||
return $this->attachmentService->upload('task', $taskId, $file, $userId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -401,17 +370,6 @@ class TaskService
|
||||
*/
|
||||
public function deleteAttachment(int $taskId, int $attachmentId, int $userId): bool
|
||||
{
|
||||
$attachment = $this->attachmentModel->find($attachmentId);
|
||||
if (!$attachment || $attachment['task_id'] != $taskId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$result = $this->attachmentModel->deleteAttachment($attachmentId, $userId);
|
||||
|
||||
if ($result) {
|
||||
Events::trigger('task.attachment_deleted', $taskId, $attachmentId, $userId);
|
||||
}
|
||||
|
||||
return $result;
|
||||
return $this->attachmentService->delete('task', $taskId, $attachmentId, $userId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,13 +155,13 @@
|
||||
<ul class="list-group list-group-flush mb-3" id="attachments-list">
|
||||
{% for attachment in task.attachments %}
|
||||
<li class="list-group-item d-flex align-items-center gap-2" data-attachment-id="{{ attachment.id }}">
|
||||
<i class="fa-solid fa-file text-muted"></i>
|
||||
<i class="fa-solid {{ get_file_icon(attachment.file_type) }} text-muted"></i>
|
||||
<a href="{{ base_url('/tasks/' ~ task.id ~ '/attachments/' ~ attachment.id ~ '/download') }}"
|
||||
target="_blank" class="flex-grow-1 text-decoration-none">
|
||||
{{ attachment.file_name }}
|
||||
</a>
|
||||
<small class="text-muted">
|
||||
{{ attachment.file_size|filesize }}
|
||||
{{ format_filesize(attachment.file_size) }}
|
||||
</small>
|
||||
<button type="button" class="btn btn-outline-danger btn-sm"
|
||||
onclick="deleteAttachment({{ task.id }}, {{ attachment.id }})"
|
||||
|
||||
Reference in New Issue
Block a user