fix verified
This commit is contained in:
@@ -70,11 +70,25 @@ class RequestAssignmentController extends Controller
|
||||
case 'potention':
|
||||
$potentionStatuses = PbgTaskStatus::getPotention();
|
||||
$rejectedStatuses = PbgTaskStatus::getRejected();
|
||||
$query->whereIn("status", $potentionStatuses)
|
||||
->whereNotIn("status", $rejectedStatuses);
|
||||
$nonVerifiedStatuses = PbgTaskStatus::getNonVerified();
|
||||
$query->where(function($q) use ($potentionStatuses, $rejectedStatuses, $nonVerifiedStatuses) {
|
||||
$q->where(function($q1) use ($potentionStatuses, $rejectedStatuses, $nonVerifiedStatuses) {
|
||||
// Verified potention (main logic)
|
||||
$q1->whereIn("status", $potentionStatuses)
|
||||
->whereNotIn("status", $rejectedStatuses)
|
||||
->whereNotIn("status", $nonVerifiedStatuses);
|
||||
})
|
||||
->orWhere(function($q2) use ($nonVerifiedStatuses) {
|
||||
// Add non-verified WITH retributions (business logic exception)
|
||||
$q2->whereIn("status", $nonVerifiedStatuses)
|
||||
->whereHas('pbg_task_retributions');
|
||||
});
|
||||
});
|
||||
Log::info('Potention filter applied', [
|
||||
'status_list' => $potentionStatuses,
|
||||
'excluded_rejected' => $rejectedStatuses,
|
||||
'excluded_non_verified_without_retributions' => $nonVerifiedStatuses,
|
||||
'included_non_verified_with_retributions' => true,
|
||||
'count_before_filter' => PbgTask::count(),
|
||||
'count_after_filter' => $query->count()
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user