From ec047821a1cc33fe06dcb1fbfa31a727a47836de Mon Sep 17 00:00:00 2001 From: arifal hidayat Date: Fri, 15 Aug 2025 03:19:49 +0700 Subject: [PATCH] fix potention --- .../Api/RequestAssignmentController.php | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/RequestAssignmentController.php b/app/Http/Controllers/Api/RequestAssignmentController.php index 4d83527..b008c42 100644 --- a/app/Http/Controllers/Api/RequestAssignmentController.php +++ b/app/Http/Controllers/Api/RequestAssignmentController.php @@ -30,7 +30,10 @@ class RequestAssignmentController extends Controller ])->orderBy('id', 'desc'); if ($request->has('filter') && !empty($request->get('filter'))) { - $filter = strtolower($request->get('filter')); + $filter = strtolower(trim($request->get('filter'))); + + // Log filter for debugging + Log::info('RequestAssignmentController filter applied', ['filter' => $filter, 'original' => $request->get('filter')]); switch ($filter) { case 'non-business': @@ -65,7 +68,16 @@ class RequestAssignmentController extends Controller break; case 'potention': - $query->whereIn("status", PbgTaskStatus::getPotention()); + $potentionStatuses = PbgTaskStatus::getPotention(); + $rejectedStatuses = PbgTaskStatus::getRejected(); + $query->whereIn("status", $potentionStatuses) + ->whereNotIn("status", $rejectedStatuses); + Log::info('Potention filter applied', [ + 'status_list' => $potentionStatuses, + 'excluded_rejected' => $rejectedStatuses, + 'count_before_filter' => PbgTask::count(), + 'count_after_filter' => $query->count() + ]); break; case 'issuance-realization-pbg': $query->whereIn("status", PbgTaskStatus::getIssuanceRealizationPbg()); @@ -76,6 +88,10 @@ class RequestAssignmentController extends Controller case 'waiting-click-dpmptsp': $query->whereIn("status", PbgTaskStatus::getWaitingClickDpmptsp()); break; + default: + // Log unrecognized filter for debugging + Log::warning('Unrecognized filter value', ['filter' => $filter, 'original' => $request->get('filter')]); + break; } } @@ -88,6 +104,32 @@ class RequestAssignmentController extends Controller }); } + // Log final query count for debugging + $finalCount = $query->count(); + Log::info('RequestAssignmentController final result', [ + 'filter' => $request->get('filter'), + 'search' => $request->get('search'), + 'total_count' => $finalCount, + 'request_url' => $request->fullUrl(), + 'all_params' => $request->all() + ]); + + // Additional logging for potention filter + if ($request->get('filter') === 'potention') { + $rejectedCount = PbgTask::whereIn('status', PbgTaskStatus::getRejected())->count(); + Log::info('Potention filter details', [ + 'potention_count' => $finalCount, + 'rejected_count' => $rejectedCount, + 'total_all_records' => PbgTask::count(), + 'note' => 'Potention filter excludes rejected data' + ]); + } + + // Also log to console for immediate debugging + if ($request->has('filter')) { + error_log('RequestAssignment Filter Debug: ' . $request->get('filter') . ' -> Count: ' . $finalCount); + } + return RequestAssignmentResouce::collection($query->paginate()); }