From 48a340d684636945ee8086ae58bac2486a27f8eb Mon Sep 17 00:00:00 2001 From: arifal hidayat Date: Fri, 15 Aug 2025 03:58:17 +0700 Subject: [PATCH] revised --- .../Api/RequestAssignmentController.php | 25 +------------------ app/Models/BigdataResume.php | 4 +-- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/Api/RequestAssignmentController.php b/app/Http/Controllers/Api/RequestAssignmentController.php index 5b8bee3..a661c36 100644 --- a/app/Http/Controllers/Api/RequestAssignmentController.php +++ b/app/Http/Controllers/Api/RequestAssignmentController.php @@ -68,30 +68,7 @@ class RequestAssignmentController extends Controller break; case 'potention': - $potentionStatuses = PbgTaskStatus::getPotention(); - $rejectedStatuses = PbgTaskStatus::getRejected(); - $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() - ]); + $query->whereIn("status", PbgTaskStatus::getPotention()); break; case 'issuance-realization-pbg': $query->whereIn("status", PbgTaskStatus::getIssuanceRealizationPbg()); diff --git a/app/Models/BigdataResume.php b/app/Models/BigdataResume.php index 28c1ec1..8bd2466 100644 --- a/app/Models/BigdataResume.php +++ b/app/Models/BigdataResume.php @@ -69,8 +69,8 @@ class BigdataResume extends Model SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getIssuanceRealizationPbg()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS issuance_realization_pbg_total, COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getProcessInTechnicalOffice()).") THEN pbg_task.uuid END) AS process_in_technical_office_count, SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getProcessInTechnicalOffice()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS process_in_technical_office_total, - COUNT(CASE WHEN (pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getRejected()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getNonVerified()).")) OR (pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") AND ptr.pbg_task_uid IS NOT NULL) THEN pbg_task.uuid END) AS potention_count, - SUM(CASE WHEN (pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getRejected()).") AND pbg_task.status not in (".implode(',', PbgTaskStatus::getNonVerified()).")) OR (pbg_task.status in (".implode(',', PbgTaskStatus::getNonVerified()).") AND ptr.pbg_task_uid IS NOT NULL) THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS potention_total + COUNT(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") THEN pbg_task.uuid END) AS potention_count, + SUM(CASE WHEN pbg_task.status in (".implode(',', PbgTaskStatus::getPotention()).") THEN ptr.nilai_retribusi_bangunan ELSE 0 END) AS potention_total ") ->first();