commit14
This commit is contained in:
@@ -33,6 +33,7 @@ class FormalAdmission
|
||||
|
||||
private function process(User $actor, int $id): Requisition
|
||||
{
|
||||
abort_if(app(OrganizationAccess::class)->maintenanceOnly($actor), 403);
|
||||
$request = Requisition::query()->visibleTo($actor)->lockForUpdate()->findOrFail($id);
|
||||
if ($request->status !== 'approved' || PurchaseAward::query()->where('requisition_id', $id)->exists() || PurchaseOrder::query()->where('requisition_id', $id)->exists()) {
|
||||
$this->invalid('O regime e as decisões só podem ser registados num pedido aprovado, antes da adjudicação.');
|
||||
@@ -174,7 +175,40 @@ class FormalAdmission
|
||||
|
||||
public function eligible(User $actor, Requisition $request, AdmissionAdoption $adoption, AdmissionDecision $decision): bool
|
||||
{
|
||||
return $actor->tenant_id === $request->tenant_id && $actor->hasFunctions($adoption->snapshot['roles']) && ! in_array($actor->id, [$request->requester_id, $decision->created_by], true) && (! $actor->departmentScoped() || $actor->department_id === $request->department_id);
|
||||
return $actor->tenant_id === $request->tenant_id && $adoption->tenant_id === $request->tenant_id && $decision->tenant_id === $request->tenant_id
|
||||
&& $adoption->requisition_id === $request->id && ! app(OrganizationAccess::class)->maintenanceOnly($actor)
|
||||
&& $actor->hasFunctions($adoption->snapshot['roles']) && ! in_array($actor->id, [$request->requester_id, $decision->created_by], true) && (! $actor->departmentScoped() || $actor->department_id === $request->department_id);
|
||||
}
|
||||
|
||||
public function canParticipate(User $actor, Requisition $request): bool
|
||||
{
|
||||
return $actor->tenant_id === $request->tenant_id && $request->status === 'approved'
|
||||
&& ! app(OrganizationAccess::class)->maintenanceOnly($actor)
|
||||
&& Requisition::query()->visibleTo($actor)->whereKey($request->id)->exists()
|
||||
&& ! PurchaseAward::query()->where('requisition_id', $request->id)->exists()
|
||||
&& ! PurchaseOrder::query()->where('requisition_id', $request->id)->exists()
|
||||
&& ! app(ConflictGuard::class)->participationBlocked($actor, $request);
|
||||
}
|
||||
|
||||
/** Same immutable basis check used before a decision is recorded. */
|
||||
public function currentReviewBasis(Requisition $request, AdmissionAdoption $adoption, AdmissionDecision $decision): bool
|
||||
{
|
||||
if ($adoption->requisition_id !== $request->id || $decision->admission_adoption_id !== $adoption->id) {
|
||||
return false;
|
||||
}
|
||||
$latest = AdmissionDecision::query()->where('admission_adoption_id', $adoption->id)->where('quotation_id', $decision->quotation_id)->latest('revision')->first();
|
||||
$basis = $this->basis($request, $decision->quotation_id);
|
||||
|
||||
return $latest?->id === $decision->id && $basis !== null && $basis['hash'] === $decision->basis_hash;
|
||||
}
|
||||
|
||||
public function canReview(User $actor, Requisition $request, AdmissionDecision $decision): bool
|
||||
{
|
||||
$adoption = $this->adoption($request);
|
||||
|
||||
return $adoption !== null && $this->eligible($actor, $request, $adoption, $decision) && $this->canParticipate($actor, $request)
|
||||
&& $this->currentReviewBasis($request, $adoption, $decision) && $this->status($decision, $adoption) === 'pending'
|
||||
&& ! AdmissionReview::query()->where('admission_decision_id', $decision->id)->where('reviewed_by', $actor->id)->exists();
|
||||
}
|
||||
|
||||
public function review(User $actor, AdmissionDecision $decision, string $verdict, string $reason): void
|
||||
@@ -189,9 +223,7 @@ class FormalAdmission
|
||||
$request = $this->process($actor, $original->requisition_id);
|
||||
$adoption = $this->adoption($request);
|
||||
abort_unless($adoption && $this->eligible($actor, $request, $adoption, $decision), 403);
|
||||
$latest = AdmissionDecision::query()->where('admission_adoption_id', $adoption->id)->where('quotation_id', $decision->quotation_id)->latest('revision')->first();
|
||||
$basis = $this->basis($request, $decision->quotation_id);
|
||||
if ($decision->admission_adoption_id !== $adoption->id || $latest?->id !== $decision->id || ! $basis || $basis['hash'] !== $decision->basis_hash) {
|
||||
if (! $this->currentReviewBasis($request, $adoption, $decision)) {
|
||||
$this->invalid('A política do processo, tentativa ou base mudou. Registe outra tentativa e novas conferências.');
|
||||
}
|
||||
$existing = AdmissionReview::query()->where('admission_decision_id', $decision->id)->where('reviewed_by', $actor->id)->first();
|
||||
|
||||
Reference in New Issue
Block a user