Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-12-29 15:20:15 +05:30
commit c5eaeb1833
2 changed files with 208 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Routes.php
View File

@ -528,6 +528,7 @@ $routes->cli('cli/update-emp-policy-status', 'ClientController::updateEmpAndPoli
$routes->cli('cli/insurerRFQRemainder', 'LeadsController::remainderForQcr'); $routes->cli('cli/insurerRFQRemainder', 'LeadsController::remainderForQcr');
$routes->cli('cli/sendMailWithAutoQuery','TicketController::sendMailWithAutoQuery'); $routes->cli('cli/sendMailWithAutoQuery','TicketController::sendMailWithAutoQuery');
$routes->cli('cli/ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate'); $routes->cli('cli/ClaimStatusUpdate','MediAssistApiController::ClaimStatusUpdate');
$routes->cli('cli/syncTpaClaimToNhance','MediAssistApiController::syncTpaClaimToNhance');

370
app/Controllers/EmployeeController.php
View File

@ -1502,14 +1502,14 @@ class EmployeeController extends AdminController
} }
// exit(); // exit();
} }
else // else
{ // {
if($mode !== 2) // if($mode !== 2)
{ // {
$data['message'] = 'Inprogress... Comeback later! or Contact support'; // $data['message'] = 'Inprogress... Comeback later! or Contact support';
return view('errors/404', $data); // return view('errors/404', $data);
} // }
} // }
//in else generate PDF and upload it in s3 //in else generate PDF and upload it in s3
// echo 'else'; // echo 'else';
@ -1646,20 +1646,27 @@ class EmployeeController extends AdminController
// echo '<br>PDF generated and uploaded to S3 successfully.<br>'; // echo '<br>PDF generated and uploaded to S3 successfully.<br>';
unlink($temp_local_path); unlink($temp_local_path);
// exit(); if($s3->exists($s3_key)) //2 => for bulk generate so skip s3 check and generate PDF
// if ($mode == 1) { {
// // Inline view //get pre signed url & make it download
// return $this->response $s3_url = $s3->getPresignedUrl($s3_key );
// ->setHeader('Content-Type', 'application/pdf')
// ->setHeader('Content-Disposition', 'inline; filename="' . $filename . '"') $pdf = file_get_contents($s3_url['url']);
// ->setBody($dompdf->output()); if ($mode == 1) {
// } else { // Inline view
// // Force download return $this->response
// return $this->response ->setHeader('Content-Type', 'application/pdf')
// ->setHeader('Content-Type', 'application/pdf') ->setHeader('Content-Disposition', 'inline; filename="' . $s3_key . '"')
// ->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"') ->setBody($pdf);
// ->setBody($dompdf->output()); } else if($mode == 0){
// } // echo 'Force download';//die();
return $this->response
->setHeader('Content-Type', 'application/pdf')
->setHeader('Content-Disposition', 'attachment; filename="' . $s3_key . '"')
->setBody($pdf);
}
// exit();
}
// $this->myLogger->logme('error', 'generateIDCardForEmployee function completed successfully.'); // $this->myLogger->logme('error', 'generateIDCardForEmployee function completed successfully.');
@ -1671,6 +1678,20 @@ class EmployeeController extends AdminController
} }
public function sanitizeFilePart(string $value): string
{
// Trim spaces
$value = trim($value);
// Replace ANY unsafe character (including /) with underscore
$value = preg_replace('/[^A-Za-z0-9._()-]/', '_', $value);
// Collapse multiple underscores
$value = preg_replace('/_+/', '_', $value);
return $value;
}
// -------------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------------
public function viewECard() public function viewECard()
@ -4019,187 +4040,206 @@ class EmployeeController extends AdminController
exit; exit;
} }
public function bulkGenerateEcardAndStoreinS3(array $params = []) public function bulkGenerateEcardAndStoreinS3(array $params = [])
{ {
/** $request = \Config\Services::request();
* --------------------------- $isCli = is_cli();
* 1. Detect mode + collect inputs
* ---------------------------
*/
$client_policy_id = $params['client_policy_id'] ?? null; /* ---------------------------------------------------------
$emp_code = $params['emp_code'] ?? null; * 1. INPUTS (shared for WEB + CLI)
$emp_pk = $params['emp_pk'] ?? null; * --------------------------------------------------------- */
$batch_size = $params['batch_size'] ?? null; $client_policy_id = $params['client_policy_id'] ?? (!$isCli ? $request->getGet('client_policy_id') : null);
$batch_no = $params['batch_no'] ?? null; $emp_code = $params['emp_code'] ?? (!$isCli ? $request->getGet('emp_code') : null);
$execution_mode = $params['execution_mode'] ?? 'sequential';//parallel $emp_pk = $params['emp_pk'] ?? (!$isCli ? $request->getGet('emp_pk') : null);
$total_batches = $params['total_batches'] ?? 0;//parallel
if (is_cli()) { $batch_size = (int) ($params['batch_size'] ?? (!$isCli ? $request->getGet('batch_size') : 100));
$mode = 'CLI'; $batch_size = $batch_size > 0 ? $batch_size : 100;
$batch_no = isset($params['batch_no']) ? (int) $params['batch_no'] : null;
$total_batches = (int) ($params['total_batches'] ?? 0);
$execution_mode = $params['execution_mode'] ?? (!$isCli ? $request->getGet('execution_mode') : 'sequential');
$execution_mode = in_array($execution_mode, ['sequential', 'parallel']) ? $execution_mode : 'sequential';
$is_dry_run = $params['is_dry_run'] ?? (!$isCli ? $request->getGet('is_dry_run') : false);
} elseif (empty($params) && $this->request->getMethod() === 'get') { $log_search_context = 'ECARD_BULK_TO_S3';
$mode = 'WEB'; if($is_dry_run)
{
$log_search_context = 'ECARD_BULK_TO_S3_DRY_RUN';
}
$client_policy_id = $this->request->getGet('client_policy_id'); // Cursor (KEY FIX: avoids OFFSET issues)
$emp_code = $this->request->getGet('emp_code'); $last_emp_id = (int) ($params['last_emp_id'] ?? 0);
$emp_pk = $this->request->getGet('emp_pk');
$execution_mode = $this->request->getGet('execution_mode') ?? 'sequential'; $this->myLogger->logme('error', "$log_search_context"." INIT - ". json_encode([
$batch_size = (int) ($this->request->getGet('batch_size') ?? 100); 'cli' => $isCli,
if($client_policy_id == null || empty($client_policy_id) || $client_policy_id == '') 'policy' => $client_policy_id,
{ 'batch_no' => $batch_no,
return $this->respond(['status' => false, 'code' => 200, 'message' => 'client_policy_id is necessary'], 200); 'last_emp_id' => $last_emp_id,
'mode' => $execution_mode
'is_dry_run' => $is_dry_run
]));
/* ---------------------------------------------------------
* 2. WEB DISPATCHER (QUEUE CREATOR)
* --------------------------------------------------------- */
if (!$isCli && empty($params)) {
if (empty($client_policy_id)) {
return $this->respond(['status' => false, 'message' => 'client_policy_id required'], 200);
} }
/**
* --------------------------- // COUNT QUERY (same filters as worker)
* 2. Calculate total records $countBuilder = $this->employeePolicyModel->builder()
* ---------------------------
*/
$total = $this->employeePolicyModel
->join('employees', 'employees.id = employee_polices.employee_id') ->join('employees', 'employees.id = employee_polices.employee_id')
->where('employees.emp_status', 'active') ->where([
->where('employees.is_active', '1') 'employees.emp_status' => 'active',
->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''") 'employees.is_active' => '1',
->where('employee_polices.status', 'active') 'employee_polices.status' => 'active',
->where('employee_polices.is_active', '1') 'employee_polices.is_active' => '1',
->where('employee_polices.client_policy_id', $client_policy_id) 'employee_polices.client_policy_id' => $client_policy_id
->countAllResults(); ])
->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''");
if ($emp_code) $countBuilder->where('employees.emp_code', $emp_code);
if ($emp_pk) $countBuilder->where('employees.id', $emp_pk);
$total = (int) $countBuilder->countAllResults();
if ($total === 0) {
$this->myLogger->logme('error', "$log_search_context". 'No records found. Queue skipped.');
return $this->respond(['status' => 'NO_RECORDS'], 200);
}
$total_batches = (int) ceil($total / $batch_size); $total_batches = (int) ceil($total / $batch_size);
// echo $total_batches;die();
$this->myLogger->logme('error', "$log_search_context".'Queueing jobs - '. json_encode([
'total' => $total,
'batches' => $total_batches,
'mode' => $execution_mode
]));
$basePayload = [
'client_policy_id' => $client_policy_id,
'batch_size' => $batch_size,
'total_batches' => $total_batches,
'execution_mode' => $execution_mode,
'emp_code' => $emp_code,
'emp_pk' => $emp_pk,
'last_emp_id' => 0,
'is_dry_run' => $is_dry_run
];
/**
* ---------------------------
* 3. Push JOB per batch
* ---------------------------
*/
if ($execution_mode === 'parallel') { if ($execution_mode === 'parallel') {
for ($batch_no = 1; $batch_no <= $total_batches; $batch_no++) { for ($i = 1; $i <= $total_batches; $i++) {
Jobs::addJob([ Jobs::addJob([
'job_name' => 'bulkGenerateEcardAndStoreinS3', 'job_name' => 'bulkGenerateEcardAndStoreinS3',
'payload' => [ 'payload' => array_merge($basePayload, ['batch_no' => $i])
'client_policy_id' => $client_policy_id,
'emp_code' => $emp_code,
'emp_pk' => $emp_pk,
'batch_size' => $batch_size,
'batch_no' => $batch_no,
'total_batches' => $total_batches,
'execution_mode' => 'parallel',
],
]); ]);
} }
} else {
Jobs::addJob([
'job_name' => 'bulkGenerateEcardAndStoreinS3',
'payload' => array_merge($basePayload, ['batch_no' => 1])
]);
} }
if ($execution_mode === 'sequential') { return $this->respond([
Jobs::addJob([ 'status' => 'ECARD_BULK_TO_S3 Job queued',
'job_name' => 'bulkGenerateEcardAndStoreinS3', 'total' => $total,
'payload' => [ 'batches' => $total_batches
'client_policy_id' => $client_policy_id, ], 200);
'batch_size' => $batch_size, }
'batch_no' => $batch_no ?? 1,
'total_batches' => $total_batches,
'execution_mode' => 'sequential',
],
]);
}
return $this->respond(['status' => true, 'code' => 200, 'message' => 'E-card generation started', /* ---------------------------------------------------------
'total' => $total, * 3. CLI WORKER (ACTUAL PROCESSOR)
'batches' => $total_batches,], 200); * --------------------------------------------------------- */
// return [ if ($batch_no === null) {
// 'status' => true, $this->myLogger->logme('error', "$log_search_context".'Worker called without batch_no');
// 'message' => 'E-card generation started', return;
// 'total' => $total, }
// 'batches' => $total_batches,
// ];
}
//else {
// return true;
// }
/** $this->myLogger->logme('error', "$log_search_context"."START Batch {$batch_no}");
* ---------------------------
* 4. Build query (CLI execution) $builder = $this->employeePolicyModel->builder();
* --------------------------- $builder->select('
*/
$builder = $this->employeePolicyModel
->select('
employee_polices.client_policy_id, employee_polices.client_policy_id,
employees.emp_code, employees.emp_code,
employees.id as emp_id,
tpa.short_name, tpa.short_name,
employees.client_id, employees.client_id,
employee_polices.rand_string, employee_polices.rand_string
employees.id as emp_id
') ')
->join('client_policy', 'client_policy.id = employee_polices.client_policy_id') ->join('client_policy', 'client_policy.id = employee_polices.client_policy_id')
->join('employees', 'employees.id = employee_polices.employee_id') ->join('employees', 'employees.id = employee_polices.employee_id')
->join('tpa', 'tpa.id = client_policy.tpa_id') ->join('tpa', 'tpa.id = client_policy.tpa_id')
->where('employees.emp_status', 'active') ->where([
->where('employees.is_active', '1') 'employees.emp_status' => 'active',
'employees.is_active' => '1',
'employee_polices.status' => 'active',
'employee_polices.is_active' => '1',
'employee_polices.client_policy_id' => $client_policy_id
])
->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''") ->where("employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id <> ''")
->where('employee_polices.status', 'active') ->orderBy('employees.id', 'ASC');
->where('employee_polices.is_active', '1')
->where('employee_polices.client_policy_id', $client_policy_id);
if (!empty($emp_code)) { if ($emp_code) $builder->where('employees.emp_code', $emp_code);
$builder->where('employees.emp_code', $emp_code); if ($emp_pk) $builder->where('employees.id', $emp_pk);
if ($last_emp_id) $builder->where('employees.id >', $last_emp_id);
$rows = $builder->get($batch_size)->getResultArray();
$rowCount = count($rows);
$this->myLogger->logme('error', "$log_search_context"." Batch {$batch_no} fetched {$rowCount} rows");
if ($rowCount === 0) {
$this->myLogger->logme('error', "$log_search_context"." Batch {$batch_no} empty. STOPPING.");
return;
} }
if (!empty($emp_pk)) { foreach ($rows as $row) {
$builder->where('employees.id', $emp_pk); $this->myLogger->logme('error', "$log_search_context".' Processing - '. json_encode([
'emp_id' => $row['emp_id'],
'emp_code' => $row['emp_code'],
'policy' => $row['client_policy_id']
]));
$ecard_gen_res = $this->generateIDCardForEmployee($row['rand_string'],0,2); // 2 means skip S3 check
$this->myLogger->logme('error', "$log_search_context".' processed - '. json_encode([
'emp_id' => $row['emp_id'],
'emp_code' => $row['emp_code'],
'policy' => $row['client_policy_id'],
// 'ecard_gen_res' => $ecard_gen_res
]));//check
} }
/** $new_last_emp_id = end($rows)['emp_id'];
* ---------------------------
* 5. Apply batching (only if provided) /* ---------------------------------------------------------
* --------------------------- * 4. SEQUENTIAL RE-QUEUE (SAFE)
*/ * --------------------------------------------------------- */
if (!empty($batch_size) && !empty($batch_no)) { if ($execution_mode === 'sequential' && $rowCount === $batch_size) {
$offset = ($batch_no - 1) * $batch_size; $this->myLogger->logme('info', "$log_search_context"."Re-queueing next batch - " . json_encode([
$builder->limit($batch_size, $offset); 'next_batch' => $batch_no + 1,
'last_emp_id' => $new_last_emp_id
]));
Jobs::addJob([
'job_name' => 'bulkGenerateEcardAndStoreinS3',
'payload' => [
'client_policy_id' => $client_policy_id,
'batch_size' => $batch_size,
'batch_no' => $batch_no + 1,
'execution_mode' => 'sequential',
'last_emp_id' => $new_last_emp_id,
'emp_code' => $emp_code,
'emp_pk' => $emp_pk,
'is_dry_run' => $is_dry_run
]
]);
} }
$res = $builder->findAll(); $this->myLogger->logme('error', "$log_search_context". "END Batch {$batch_no}");
/**
* ---------------------------
* 6. Process batch
* ---------------------------
*/
foreach ($res as $row) {
$ecard_gen_res = $this->generateIDCardForEmployee(
$row['rand_string'],
0,
2 // skip S3 check, force regenerate
);
// print_rr([
// 'batch' => $batch_no,
// 'emp' => $row['emp_code'],
// 'res' => $ecard_gen_res,
// ]);
// echo date('Y-m-d H:i:s') . PHP_EOL;
}
if ($execution_mode === 'sequential' && $batch_no < $total_batches) {
Jobs::addJob([
'job_name' => 'bulkGenerateEcardAndStoreinS3',
'payload' => [
'client_policy_id' => $client_policy_id,
'batch_size' => $batch_size,
'batch_no' => ($batch_no + 1),
'total_batches' => $total_batches,
'execution_mode' => 'sequential',
],
]);
}
// echo "BATCH {$batch_no} COMPLETED @ " . date('Y-m-d H:i:s') . PHP_EOL;
return array($batch_no);
} }