commit5

app/Services/PurchaseWorkflow.php

@@ -29,7 +29,7 @@ class PurchaseWorkflow
             $this->guard->lockCompany($user);
             $user = app(CurrentActor::class)->lock($user, [PurchasingRole::Procurement]);
             $requisition = Requisition::query()->lockForUpdate()->findOrFail($requisition->id);
-            abort_unless($user->purchasing_role === PurchasingRole::Procurement && $user->id !== $requisition->requester_id, 403);
+            abort_unless($user->hasFunctions([PurchasingRole::Procurement]) && $user->id !== $requisition->requester_id, 403);
             if (PurchaseAward::query()->where('requisition_id', $requisition->id)->exists()) {
                 throw ValidationException::withMessages(['award' => 'Este processo já tem uma adjudicação. Não é permitida uma segunda selecção.']);
             }
@@ -70,7 +70,7 @@ class PurchaseWorkflow
         $steps = $award->approvals()->get();
         $next = $steps->firstWhere('decision', 'pending');
 
-        return $next !== null && $next->role === $user->purchasing_role->value &&
+        return $next !== null && $user->hasFunctions([$next->role]) &&
             ($next->role !== 'department_head' || $user->department_id === $requisition->department_id) &&
             ! $steps->contains('approver_id', $user->id) && ! $this->guard->participationBlocked($user, $requisition);
     }
@@ -103,7 +103,7 @@ class PurchaseWorkflow
         return DB::transaction(function () use ($user, $award) {
             $this->guard->lockCompany($user);
             $user = app(CurrentActor::class)->lock($user, [PurchasingRole::Procurement]);
-            abort_unless($user->purchasing_role === PurchasingRole::Procurement, 403);
+            abort_unless($user->hasFunctions([PurchasingRole::Procurement]), 403);
             $requisition = Requisition::query()->lockForUpdate()->findOrFail($award->requisition_id);
             $award = PurchaseAward::query()->lockForUpdate()->findOrFail($award->id);
             // An already committed issue is returned, never re-created or re-snapshotted.
@@ -281,7 +281,7 @@ class PurchaseWorkflow
         }
         foreach ($steps as $index => $step) {
             $user = User::query()->where('tenant_id', $requisition->tenant_id)->lockForUpdate()->find($step->approver_id);
-            if (! $user || $step->decision !== 'approved' || $step->decided_at === null || $step->role !== $roles[$index] || $user->purchasing_role->value !== $step->role ||
+            if (! $user || $step->decision !== 'approved' || $step->decided_at === null || $step->role !== $roles[$index] || ! $user->hasFunctions([$step->role]) ||
                 ($step->role === 'department_head' && $user->department_id !== $requisition->department_id) || in_array($user->id, $seen, true)) {
                 throw ValidationException::withMessages(['approvals' => 'As aprovações do valor final devem continuar elegíveis e ser de pessoas distintas.']);
             }