feat(issues): notificaciones, plantillas de checklist, alertas de vencimiento y reporte desde el mapa
- Notificaciones (DB): asignación de incidencia (IssueAssigned), asignación de tarea (IssueTaskAssigned), comentario (IssueCommented) y cambio de estado (IssueStatusChanged) a reporter+asignado excluyendo al actor. - Plantillas de checklist: tabla issue_checklist_templates + modelo, gestor CRUD (IssueChecklistManager, ruta projects.issues.checklists) y "Aplicar plantilla" en el detalle (alta masiva de tareas). - Alertas de vencimiento: columna overdue_notified_at + scope overdue, comando issues:notify-overdue (programado a diario) que avisa al asignado una sola vez; badge "vencidas" en la tabla y resaltado por tarea en el detalle. - Reporte desde el mapa: botón "Incidencia" en el panel del feature seleccionado → formulario con feature pre-vinculado (IssueForm lee ?feature=). Tests: IssuesEnhancementsTest (7). Suite 57 passing (solo 2 pre-existentes sqlite). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Models\IssueTask;
|
||||
use App\Notifications\IssueTaskOverdueNotification;
|
||||
use Illuminate\Console\Command;
|
||||
|
||||
class NotifyOverdueIssueTasks extends Command
|
||||
{
|
||||
protected $signature = 'issues:notify-overdue';
|
||||
|
||||
protected $description = 'Notify assignees of issue tasks that are overdue (one notification per task)';
|
||||
|
||||
public function handle(): int
|
||||
{
|
||||
$tasks = IssueTask::overdue()
|
||||
->whereNull('overdue_notified_at')
|
||||
->whereNotNull('assigned_to')
|
||||
->with(['assignee', 'issue'])
|
||||
->get();
|
||||
|
||||
$sent = 0;
|
||||
foreach ($tasks as $task) {
|
||||
if ($task->assignee) {
|
||||
$task->assignee->notify(new IssueTaskOverdueNotification($task));
|
||||
$sent++;
|
||||
}
|
||||
$task->forceFill(['overdue_notified_at' => now()])->save();
|
||||
}
|
||||
|
||||
$this->info("Tareas vencidas notificadas: {$sent}");
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
<?php
|
||||
|
||||
namespace App\Livewire;
|
||||
|
||||
use App\Models\IssueChecklistTemplate;
|
||||
use App\Models\Project;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Livewire\Attributes\Layout;
|
||||
use Livewire\Component;
|
||||
|
||||
#[Layout('layouts.app')]
|
||||
class IssueChecklistManager extends Component
|
||||
{
|
||||
public Project $project;
|
||||
public $templates = [];
|
||||
|
||||
public bool $showForm = false;
|
||||
public $editingId = null;
|
||||
public string $name = '';
|
||||
public array $items = [''];
|
||||
|
||||
public function mount(Project $project)
|
||||
{
|
||||
$this->project = $project;
|
||||
abort_unless($this->canAccessProject() && Auth::user()->can('edit issues'), 403);
|
||||
$this->loadTemplates();
|
||||
}
|
||||
|
||||
private function canAccessProject(): bool
|
||||
{
|
||||
$user = Auth::user();
|
||||
return $user->can('manage all')
|
||||
|| $this->project->users()->where('user_id', $user->id)->exists();
|
||||
}
|
||||
|
||||
public function loadTemplates(): void
|
||||
{
|
||||
$this->templates = IssueChecklistTemplate::where('project_id', $this->project->id)
|
||||
->orderBy('name')->get();
|
||||
}
|
||||
|
||||
public function newTemplate(): void
|
||||
{
|
||||
$this->reset(['editingId', 'name']);
|
||||
$this->items = [''];
|
||||
$this->resetErrorBag();
|
||||
$this->showForm = true;
|
||||
}
|
||||
|
||||
public function edit($id): void
|
||||
{
|
||||
$t = IssueChecklistTemplate::where('project_id', $this->project->id)->findOrFail($id);
|
||||
$this->editingId = $t->id;
|
||||
$this->name = $t->name;
|
||||
$this->items = array_values($t->items ?: ['']) ?: [''];
|
||||
$this->resetErrorBag();
|
||||
$this->showForm = true;
|
||||
}
|
||||
|
||||
public function addItemLine(): void
|
||||
{
|
||||
$this->items[] = '';
|
||||
}
|
||||
|
||||
public function removeItemLine(int $i): void
|
||||
{
|
||||
unset($this->items[$i]);
|
||||
$this->items = array_values($this->items);
|
||||
if (empty($this->items)) {
|
||||
$this->items = [''];
|
||||
}
|
||||
}
|
||||
|
||||
public function save(): void
|
||||
{
|
||||
$this->validate([
|
||||
'name' => 'required|string|max:255',
|
||||
'items' => 'required|array',
|
||||
'items.*' => 'nullable|string|max:255',
|
||||
]);
|
||||
|
||||
$items = array_values(array_filter(array_map('trim', $this->items), fn ($v) => $v !== ''));
|
||||
if (empty($items)) {
|
||||
$this->addError('items', 'Añade al menos una tarea.');
|
||||
return;
|
||||
}
|
||||
|
||||
IssueChecklistTemplate::updateOrCreate(
|
||||
['id' => $this->editingId, 'project_id' => $this->project->id],
|
||||
['name' => $this->name, 'items' => $items, 'project_id' => $this->project->id],
|
||||
);
|
||||
|
||||
$this->showForm = false;
|
||||
$this->loadTemplates();
|
||||
$this->dispatch('notify', 'Plantilla guardada');
|
||||
}
|
||||
|
||||
public function delete($id): void
|
||||
{
|
||||
IssueChecklistTemplate::where('project_id', $this->project->id)->findOrFail($id)->delete();
|
||||
$this->loadTemplates();
|
||||
$this->dispatch('notify', 'Plantilla eliminada');
|
||||
}
|
||||
|
||||
public function render()
|
||||
{
|
||||
return view('livewire.issues.issue-checklist-manager');
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,13 @@
|
||||
namespace App\Livewire;
|
||||
|
||||
use App\Models\Issue;
|
||||
use App\Models\IssueChecklistTemplate;
|
||||
use App\Models\IssueComment;
|
||||
use App\Models\IssueTask;
|
||||
use App\Models\Project;
|
||||
use App\Notifications\IssueCommentedNotification;
|
||||
use App\Notifications\IssueStatusChangedNotification;
|
||||
use App\Notifications\IssueTaskAssignedNotification;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Livewire\Attributes\Layout;
|
||||
@@ -25,6 +29,10 @@ class IssueDetail extends Component
|
||||
public $newTaskAssignee = '';
|
||||
public $newTaskDue = '';
|
||||
|
||||
// Checklist templates
|
||||
public $checklistTemplates = [];
|
||||
public $applyTemplateId = '';
|
||||
|
||||
// New comment form
|
||||
public string $newComment = '';
|
||||
public $commentPhoto = null; // single optional photo on a comment
|
||||
@@ -46,6 +54,7 @@ class IssueDetail extends Component
|
||||
|
||||
$this->resolutionNotes = $issue->resolution_notes ?? '';
|
||||
$this->projectUsers = $project->users()->orderBy('name')->get();
|
||||
$this->checklistTemplates = IssueChecklistTemplate::where('project_id', $project->id)->orderBy('name')->get();
|
||||
$this->refreshIssue();
|
||||
}
|
||||
|
||||
@@ -61,6 +70,17 @@ class IssueDetail extends Component
|
||||
return Auth::user()->can('edit issues');
|
||||
}
|
||||
|
||||
/** Notify the issue's stakeholders (reporter + assignee), excluding the current actor. */
|
||||
private function notifyStakeholders($notification): void
|
||||
{
|
||||
$this->issue->loadMissing(['reporter', 'assignee']);
|
||||
collect([$this->issue->reporter, $this->issue->assignee])
|
||||
->filter()
|
||||
->unique('id')
|
||||
->reject(fn ($u) => $u->id === Auth::id())
|
||||
->each(fn ($u) => $u->notify($notification));
|
||||
}
|
||||
|
||||
public function refreshIssue(): void
|
||||
{
|
||||
$this->issue->load([
|
||||
@@ -82,7 +102,7 @@ class IssueDetail extends Component
|
||||
'newTaskDue' => 'nullable|date',
|
||||
]);
|
||||
|
||||
$this->issue->tasks()->create([
|
||||
$task = $this->issue->tasks()->create([
|
||||
'title' => $this->newTaskTitle,
|
||||
'assigned_to' => $this->newTaskAssignee ?: null,
|
||||
'due_date' => $this->newTaskDue ?: null,
|
||||
@@ -90,11 +110,39 @@ class IssueDetail extends Component
|
||||
'uuid' => (string) \Illuminate\Support\Str::uuid(),
|
||||
]);
|
||||
|
||||
// Notify the assignee (unless they assigned it to themselves).
|
||||
if ($task->assigned_to && $task->assigned_to !== Auth::id()) {
|
||||
$task->loadMissing('issue');
|
||||
$task->assignee?->notify(new IssueTaskAssignedNotification($task));
|
||||
}
|
||||
|
||||
$this->reset(['newTaskTitle', 'newTaskAssignee', 'newTaskDue']);
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Tarea añadida');
|
||||
}
|
||||
|
||||
public function applyTemplate(): void
|
||||
{
|
||||
abort_unless($this->canEdit(), 403);
|
||||
$this->validate(['applyTemplateId' => 'required|exists:issue_checklist_templates,id']);
|
||||
|
||||
$template = IssueChecklistTemplate::where('project_id', $this->project->id)
|
||||
->findOrFail($this->applyTemplateId);
|
||||
|
||||
$order = (int) $this->issue->tasks()->max('order');
|
||||
foreach ($template->items ?: [] as $title) {
|
||||
$this->issue->tasks()->create([
|
||||
'title' => $title,
|
||||
'order' => ++$order,
|
||||
'uuid' => (string) \Illuminate\Support\Str::uuid(),
|
||||
]);
|
||||
}
|
||||
|
||||
$this->applyTemplateId = '';
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Plantilla aplicada');
|
||||
}
|
||||
|
||||
public function toggleTask($taskId): void
|
||||
{
|
||||
abort_unless($this->canEdit(), 403);
|
||||
@@ -143,6 +191,9 @@ class IssueDetail extends Component
|
||||
$this->storeUpload($this->commentPhoto, $comment, 'comment');
|
||||
}
|
||||
|
||||
$comment->setRelation('issue', $this->issue)->setRelation('user', Auth::user());
|
||||
$this->notifyStakeholders(new IssueCommentedNotification($comment));
|
||||
|
||||
$this->reset(['newComment', 'commentPhoto']);
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Comentario añadido');
|
||||
@@ -196,6 +247,7 @@ class IssueDetail extends Component
|
||||
{
|
||||
abort_unless($this->canEdit(), 403);
|
||||
$this->issue->update(['status' => 'in_review']);
|
||||
$this->notifyStakeholders(new IssueStatusChangedNotification($this->issue, 'in_review'));
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Incidencia enviada a revisión');
|
||||
}
|
||||
@@ -208,6 +260,7 @@ class IssueDetail extends Component
|
||||
'resolved_at' => $this->issue->resolved_at ?? now(),
|
||||
'resolution_notes' => $this->resolutionNotes ?: null,
|
||||
]);
|
||||
$this->notifyStakeholders(new IssueStatusChangedNotification($this->issue, 'resolved'));
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Incidencia validada y resuelta');
|
||||
}
|
||||
@@ -219,6 +272,7 @@ class IssueDetail extends Component
|
||||
'status' => 'closed',
|
||||
'resolved_at' => $this->issue->resolved_at ?? now(),
|
||||
]);
|
||||
$this->notifyStakeholders(new IssueStatusChangedNotification($this->issue, 'closed'));
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Incidencia cerrada');
|
||||
}
|
||||
@@ -227,6 +281,7 @@ class IssueDetail extends Component
|
||||
{
|
||||
abort_unless($this->canEdit(), 403);
|
||||
$this->issue->update(['status' => 'open', 'resolved_at' => null]);
|
||||
$this->notifyStakeholders(new IssueStatusChangedNotification($this->issue, 'open'));
|
||||
$this->refreshIssue();
|
||||
$this->dispatch('notify', 'Incidencia reabierta');
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ namespace App\Livewire;
|
||||
|
||||
use App\Models\Issue;
|
||||
use App\Models\Project;
|
||||
use App\Notifications\IssueAssignedNotification;
|
||||
use App\Notifications\IssueReportedNotification;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Livewire\Attributes\Layout;
|
||||
@@ -28,6 +29,7 @@ class IssueForm extends Component
|
||||
// Optional context (e.g. when reporting from a map feature)
|
||||
public $featureId = null;
|
||||
public $inspectionId = null;
|
||||
public $featureName = null; // shown when the issue is pre-linked to a map element
|
||||
|
||||
public function mount(Project $project, ?Issue $issue = null)
|
||||
{
|
||||
@@ -50,6 +52,14 @@ class IssueForm extends Component
|
||||
$this->resolutionNotes = $issue->resolution_notes ?? '';
|
||||
$this->featureId = $issue->feature_id;
|
||||
$this->inspectionId = $issue->inspection_id;
|
||||
$this->featureName = $issue->feature?->name;
|
||||
} elseif ($featureId = request()->integer('feature')) {
|
||||
// Pre-link to a map element when reporting from the project map.
|
||||
$feature = \App\Models\Feature::with('layer.phase')->find($featureId);
|
||||
if ($feature && $feature->layer?->phase?->project_id === $project->id) {
|
||||
$this->featureId = $feature->id;
|
||||
$this->featureName = $feature->name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,12 +102,18 @@ class IssueForm extends Component
|
||||
$payload['resolved_at'] = in_array($this->status, ['resolved', 'closed']) ? now() : null;
|
||||
|
||||
if ($this->issue) {
|
||||
$previousAssignee = $this->issue->assigned_to;
|
||||
// Don't overwrite an existing resolved date
|
||||
if ($this->issue->resolved_at && in_array($this->status, ['resolved', 'closed'])) {
|
||||
unset($payload['resolved_at']);
|
||||
}
|
||||
$this->issue->update($payload);
|
||||
$issue = $this->issue;
|
||||
|
||||
// Notify a newly assigned user (when it changed and isn't the current actor).
|
||||
if ($issue->assigned_to && $issue->assigned_to !== $previousAssignee && $issue->assigned_to !== Auth::id()) {
|
||||
$issue->assignee?->notify(new IssueAssignedNotification($issue));
|
||||
}
|
||||
} else {
|
||||
$issue = Issue::create(array_merge($payload, [
|
||||
'project_id' => $this->project->id,
|
||||
|
||||
@@ -43,6 +43,9 @@ class IssueTable extends DataTableComponent
|
||||
'media',
|
||||
'tasks',
|
||||
'tasks as tasks_done_count' => fn (Builder $q) => $q->where('is_done', true),
|
||||
'tasks as overdue_tasks_count' => fn (Builder $q) => $q->where('is_done', false)
|
||||
->whereNotNull('due_date')
|
||||
->whereDate('due_date', '<', now()->toDateString()),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -81,6 +84,9 @@ class IssueTable extends DataTableComponent
|
||||
<span class="text-xs text-base-content/50">'.$row->tasks_done_count.'/'.$row->tasks_count.' tareas</span>
|
||||
</div>';
|
||||
}
|
||||
if ($row->overdue_tasks_count) {
|
||||
$html .= '<div class="mt-1"><span class="badge badge-error badge-sm gap-1">⏰ '.$row->overdue_tasks_count.' vencida'.($row->overdue_tasks_count > 1 ? 's' : '').'</span></div>';
|
||||
}
|
||||
return $html;
|
||||
})
|
||||
->html(),
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
class IssueChecklistTemplate extends Model
|
||||
{
|
||||
use SoftDeletes;
|
||||
|
||||
protected $fillable = ['project_id', 'name', 'items'];
|
||||
|
||||
protected $casts = ['items' => 'array'];
|
||||
|
||||
public function project()
|
||||
{
|
||||
return $this->belongsTo(Project::class);
|
||||
}
|
||||
}
|
||||
@@ -11,16 +11,25 @@ class IssueTask extends Model
|
||||
|
||||
protected $fillable = [
|
||||
'issue_id', 'title', 'is_done', 'done_at', 'done_by',
|
||||
'assigned_to', 'due_date', 'order',
|
||||
'assigned_to', 'due_date', 'order', 'overdue_notified_at',
|
||||
'uuid', 'client_updated_at',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'is_done' => 'boolean',
|
||||
'done_at' => 'datetime',
|
||||
'due_date' => 'date',
|
||||
'is_done' => 'boolean',
|
||||
'done_at' => 'datetime',
|
||||
'due_date' => 'date',
|
||||
'overdue_notified_at' => 'datetime',
|
||||
];
|
||||
|
||||
/** Tasks that are past their due date and not yet completed. */
|
||||
public function scopeOverdue($q)
|
||||
{
|
||||
return $q->where('is_done', false)
|
||||
->whereNotNull('due_date')
|
||||
->whereDate('due_date', '<', now()->toDateString());
|
||||
}
|
||||
|
||||
public function issue() { return $this->belongsTo(Issue::class); }
|
||||
public function assignee() { return $this->belongsTo(User::class, 'assigned_to'); }
|
||||
public function completer() { return $this->belongsTo(User::class, 'done_by'); }
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\Issue;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class IssueAssignedNotification extends Notification
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public function __construct(public Issue $issue) {}
|
||||
|
||||
public function via($notifiable): array
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function toArray($notifiable): array
|
||||
{
|
||||
return [
|
||||
'type' => 'issue_assigned',
|
||||
'issue_id' => $this->issue->id,
|
||||
'project_id' => $this->issue->project_id,
|
||||
'priority' => $this->issue->priority,
|
||||
'message' => "Se te ha asignado la incidencia '{$this->issue->title}'",
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\IssueComment;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class IssueCommentedNotification extends Notification
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public function __construct(public IssueComment $comment) {}
|
||||
|
||||
public function via($notifiable): array
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function toArray($notifiable): array
|
||||
{
|
||||
$issue = $this->comment->issue;
|
||||
|
||||
return [
|
||||
'type' => 'issue_commented',
|
||||
'issue_id' => $this->comment->issue_id,
|
||||
'project_id' => $issue?->project_id,
|
||||
'author' => $this->comment->user?->name,
|
||||
'message' => "{$this->comment->user?->name} comentó en '{$issue?->title}': " . Str::limit($this->comment->body, 60),
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\Issue;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class IssueStatusChangedNotification extends Notification
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public function __construct(public Issue $issue, public string $status) {}
|
||||
|
||||
public function via($notifiable): array
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function toArray($notifiable): array
|
||||
{
|
||||
$label = [
|
||||
'open' => 'reabierta',
|
||||
'in_review' => 'enviada a revisión',
|
||||
'resolved' => 'resuelta',
|
||||
'closed' => 'cerrada',
|
||||
][$this->status] ?? $this->status;
|
||||
|
||||
return [
|
||||
'type' => 'issue_status_changed',
|
||||
'issue_id' => $this->issue->id,
|
||||
'project_id' => $this->issue->project_id,
|
||||
'status' => $this->status,
|
||||
'message' => "La incidencia '{$this->issue->title}' ha sido {$label}",
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\IssueTask;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class IssueTaskAssignedNotification extends Notification
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public function __construct(public IssueTask $task) {}
|
||||
|
||||
public function via($notifiable): array
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function toArray($notifiable): array
|
||||
{
|
||||
return [
|
||||
'type' => 'issue_task_assigned',
|
||||
'issue_id' => $this->task->issue_id,
|
||||
'task_id' => $this->task->id,
|
||||
'project_id' => $this->task->issue?->project_id,
|
||||
'due_date' => $this->task->due_date?->toDateString(),
|
||||
'message' => "Se te ha asignado la tarea '{$this->task->title}'",
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace App\Notifications;
|
||||
|
||||
use App\Models\IssueTask;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Notifications\Notification;
|
||||
|
||||
class IssueTaskOverdueNotification extends Notification
|
||||
{
|
||||
use Queueable;
|
||||
|
||||
public function __construct(public IssueTask $task) {}
|
||||
|
||||
public function via($notifiable): array
|
||||
{
|
||||
return ['database'];
|
||||
}
|
||||
|
||||
public function toArray($notifiable): array
|
||||
{
|
||||
return [
|
||||
'type' => 'issue_task_overdue',
|
||||
'issue_id' => $this->task->issue_id,
|
||||
'task_id' => $this->task->id,
|
||||
'project_id' => $this->task->issue?->project_id,
|
||||
'due_date' => $this->task->due_date?->toDateString(),
|
||||
'message' => "Tarea vencida: '{$this->task->title}' (venció el {$this->task->due_date?->format('d/m/Y')})",
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user