feat: complete approval workflow
This commit is contained in:
@@ -3,8 +3,11 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Domain\Approvals\Services\ApprovalService;
|
||||
use App\Domain\Inventory\Models\SnipeAsset;
|
||||
use App\Domain\Reservations\Enums\ReservationStatus;
|
||||
use App\Domain\Reservations\Models\Reservation;
|
||||
use App\Domain\Reservations\Models\ReservationItem;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Inertia\Inertia;
|
||||
@@ -14,20 +17,46 @@ class ApprovalController extends Controller
|
||||
{
|
||||
public function index(Request $request): Response
|
||||
{
|
||||
$filters = $request->validate(['search' => ['nullable', 'string', 'max:100']]);
|
||||
$filters = $request->validate([
|
||||
'search' => ['nullable', 'string', 'max:100'],
|
||||
'category' => ['nullable', 'string', 'max:100'],
|
||||
'date_from' => ['nullable', 'date'],
|
||||
'date_to' => ['nullable', 'date', 'after_or_equal:date_from'],
|
||||
]);
|
||||
|
||||
return Inertia::render('approvals/index', [
|
||||
'reservations' => Reservation::query()
|
||||
->with(['requester:id,name,email,department', 'items.asset:id,name,asset_tag,category_name'])
|
||||
->with([
|
||||
'requester:id,name,email,department',
|
||||
'items.asset:id,name,asset_tag,category_id,category_name',
|
||||
'approvalActions.actor:id,name',
|
||||
])
|
||||
->whereIn('status', [ReservationStatus::PendingApproval, ReservationStatus::AwaitingInformation])
|
||||
->when($filters['search'] ?? null, fn ($query, string $search) => $query
|
||||
->where(fn ($query) => $query
|
||||
->where('reference', 'like', "%{$search}%")
|
||||
->orWhereHas('requester', fn ($query) => $query->where('name', 'like', "%{$search}%"))))
|
||||
->when($filters['category'] ?? null, fn ($query, string $category) => $query
|
||||
->whereHas('items.asset', fn ($query) => $query->where('category_name', $category)))
|
||||
->when($filters['date_from'] ?? null, fn ($query, string $date) => $query
|
||||
->where('ends_at', '>', CarbonImmutable::parse($date)->startOfDay()))
|
||||
->when($filters['date_to'] ?? null, fn ($query, string $date) => $query
|
||||
->where('starts_at', '<', CarbonImmutable::parse($date)->addDay()->startOfDay()))
|
||||
->oldest('starts_at')
|
||||
->paginate(20)
|
||||
->withQueryString(),
|
||||
'filters' => $filters,
|
||||
'categories' => SnipeAsset::query()
|
||||
->whereNotNull('category_name')
|
||||
->distinct()
|
||||
->orderBy('category_name')
|
||||
->pluck('category_name'),
|
||||
'replacementAssets' => SnipeAsset::query()
|
||||
->where('active', true)
|
||||
->where('requestable', true)
|
||||
->whereNull('assigned_id')
|
||||
->orderBy('name')
|
||||
->get(['id', 'name', 'asset_tag', 'category_id', 'category_name']),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -54,4 +83,17 @@ class ApprovalController extends Controller
|
||||
|
||||
return back()->with('success', "Pedido de esclarecimentos enviado para {$reservation->reference}.");
|
||||
}
|
||||
|
||||
public function substitute(Request $request, Reservation $reservation, ReservationItem $item, ApprovalService $service): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'replacement_asset_id' => ['required', 'integer', 'exists:snipe_assets,id'],
|
||||
'comment' => ['required', 'string', 'min:5', 'max:1000'],
|
||||
]);
|
||||
/** @var SnipeAsset $replacement */
|
||||
$replacement = SnipeAsset::query()->findOrFail($data['replacement_asset_id']);
|
||||
$service->substituteAsset($reservation, $item, $replacement, $request->user(), $data['comment']);
|
||||
|
||||
return back()->with('success', "Equipamento substituído na requisição {$reservation->reference}.");
|
||||
}
|
||||
}
|
||||
|
||||
35
app/Http/Controllers/NotificationController.php
Normal file
35
app/Http/Controllers/NotificationController.php
Normal file
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Inertia\Inertia;
|
||||
use Inertia\Response;
|
||||
|
||||
class NotificationController extends Controller
|
||||
{
|
||||
public function index(Request $request): Response
|
||||
{
|
||||
return Inertia::render('notifications/index', [
|
||||
'notifications' => $request->user()->notifications()->latest()->paginate(20),
|
||||
]);
|
||||
}
|
||||
|
||||
public function read(Request $request, string $notification): RedirectResponse
|
||||
{
|
||||
$item = $request->user()->notifications()->whereKey($notification)->firstOrFail();
|
||||
$item->markAsRead();
|
||||
|
||||
$url = is_string($item->data['url'] ?? null) ? $item->data['url'] : '/notificacoes';
|
||||
|
||||
return redirect()->to($url);
|
||||
}
|
||||
|
||||
public function readAll(Request $request): RedirectResponse
|
||||
{
|
||||
$request->user()->unreadNotifications->markAsRead();
|
||||
|
||||
return back()->with('success', 'Notificações marcadas como lidas.');
|
||||
}
|
||||
}
|
||||
@@ -95,4 +95,14 @@ class ReservationController extends Controller
|
||||
|
||||
return back()->with('success', "Requisição {$reservation->reference} cancelada. Os equipamentos ficaram novamente disponíveis.");
|
||||
}
|
||||
|
||||
public function respondToInformation(Request $request, Reservation $reservation, ReservationService $service): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'response' => ['required', 'string', 'min:5', 'max:2000'],
|
||||
]);
|
||||
$service->respondToInformation($reservation, $request->user(), $data['response']);
|
||||
|
||||
return back()->with('success', "Esclarecimentos enviados para a requisição {$reservation->reference}.");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user