daengdeni/webstatement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(webstatement): tambah dukungan queue name pada StagingController dan WebstatementController

Browse Source 
Menambahkan parameter queue_name untuk mengatur queue spesifik pada job processing:

- Menambahkan parameter queueName pada StagingController.processData() dan index()
- Menggunakan onQueue() method saat dispatch job di StagingController
- Memperbarui ProcessDailyStaging untuk mengirim queue_name ke controller
- Menambahkan parameter Request pada WebstatementController untuk menerima queue_name
- Menggunakan onQueue() method saat dispatch job di WebstatementController
- Menambahkan logging untuk queue_name di semua proses
- Memperbarui response JSON untuk menyertakan informasi queue_name
- Menambahkan komentar fungsi yang menjelaskan parameter queue_name
- Mempertahankan backward compatibility dengan default queue 'default'
- Meningkatkan fleksibilitas dalam manajemen queue untuk berbagai environment
- Memungkinkan pemisahan job berdasarkan prioritas atau resource yang tersedia
This commit is contained in:
Daeng Deni Mardaeni
2025-07-31 08:13:02 +07:00
parent e1740c0850
commit ca92f32ccb
2 changed files with 460 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
app/Http/Controllers/StagingController.php
View File

@@ -1,14 +1,14 @@
<?php
namespace Modules\Webstatement\Http\Controllers;
namespace Modules\Webstatement\Http\Controllers;
use App\Http\Controllers\Controller;
use BadMethodCallException;
use Exception;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Log;
use Modules\Webstatement\Jobs\{ProcessAccountDataJob,
use App\Http\Controllers\Controller;
use BadMethodCallException;
use Exception;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Log;
use Modules\Webstatement\Jobs\{ProcessAccountDataJob,
ProcessArrangementDataJob,
ProcessAtmTransactionJob,
ProcessBillDetailDataJob,
@@ -27,8 +27,8 @@
ProcessProvinceDataJob,
ProcessStmtEntryDetailDataJob};
class StagingController extends Controller
{
class StagingController extends Controller
{
private const PROCESS_TYPES = [
'transaction' => ProcessTransactionDataJob::class,
'stmtNarrParam' => ProcessStmtNarrParamDataJob::class,
@@ -39,7 +39,7 @@
'customer' => ProcessCustomerDataJob::class,
'account' => ProcessAccountDataJob::class,
'stmtEntry' => ProcessStmtEntryDataJob::class,
'stmtEntryDetail' => ProcessStmtEntryDetailDataJob::class, // Tambahan baru
'stmtEntryDetail' => ProcessStmtEntryDetailDataJob::class,
'dataCapture' => ProcessDataCaptureDataJob::class,
'fundsTransfer' => ProcessFundsTransferDataJob::class,
'teller' => ProcessTellerDataJob::class,
@@ -65,7 +65,7 @@
'customer',
'account',
'stmtEntry',
'stmtEntryDetail', // Tambahan baru
'stmtEntryDetail',
'dataCapture',
'fundsTransfer',
'teller',
@@ -79,83 +79,124 @@
if (strpos($method, 'process') === 0) {
$type = lcfirst(substr($method, 7));
if (isset(self::PROCESS_TYPES[$type])) {
return $this->processData($type, $parameters[0] ?? '');
return $this->processData($type, $parameters[0] ?? '', $parameters[1] ?? 'default');
}
}
throw new BadMethodCallException("Method {$method} does not exist.");
}
private function processData(string $type, string $period)
: JsonResponse
/**
* Memproses data dengan queue name yang dapat dikustomisasi
*
* @param string $type Tipe proses yang akan dijalankan
* @param string $period Periode data yang akan diproses
* @param string $queueName Nama queue untuk menjalankan job
* @return JsonResponse
*/
private function processData(string $type, string $period, string $queueName = 'default'): JsonResponse
{
try {
$jobClass = self::PROCESS_TYPES[$type];
$jobClass::dispatch($period);
$message = sprintf('%s data processing job has been queued successfully', ucfirst($type));
Log::info($message);
// Dispatch job dengan queue name yang spesifik
$jobClass::dispatch($period)->onQueue($queueName);
return response()->json(['message' => $message]);
$message = sprintf('%s data processing job has been queued successfully on queue: %s', ucfirst($type), $queueName);
Log::info($message, [
'type' => $type,
'period' => $period,
'queue_name' => $queueName
]);
return response()->json([
'message' => $message,
'queue_name' => $queueName
]);
} catch (Exception $e) {
Log::error(sprintf('Error in %s processing: %s', $type, $e->getMessage()));
Log::error(sprintf('Error in %s processing: %s', $type, $e->getMessage()), [
'type' => $type,
'period' => $period,
'queue_name' => $queueName,
'error' => $e->getMessage()
]);
return response()->json(['error' => $e->getMessage()], 500);
}
}
/**
* Proses migrasi data dengan parameter dan periode yang dapat dikustomisasi
* Proses migrasi data dengan parameter, periode, dan queue name yang dapat dikustomisasi
*
* @param bool|string $processParameter Flag untuk memproses parameter
* @param string|null $period Periode yang akan diproses (default: -1 day)
* @param string $queueName Nama queue untuk menjalankan job (default: default)
* @return JsonResponse
*/
public function index($processParameter = false, $period = null)
public function index($processParameter = false, $period = null, $queueName = 'default')
{
try {
Log::info('Starting migration process', [
'process_parameter' => $processParameter,
'period' => $period
'period' => $period,
'queue_name' => $queueName
]);
$disk = Storage::disk('staging');
if ($processParameter) {
Log::info('Processing parameter data');
Log::info('Processing parameter data', ['queue_name' => $queueName]);
foreach (self::PARAMETER_PROCESSES as $process) {
$this->processData($process, '_parameter');
$this->processData($process, '_parameter', $queueName);
}
Log::info('Parameter processes completed successfully');
return response()->json(['message' => 'Parameter processes completed successfully']);
Log::info('Parameter processes completed successfully', ['queue_name' => $queueName]);
return response()->json([
'message' => 'Parameter processes completed successfully',
'queue_name' => $queueName
]);
}
// Tentukan periode yang akan diproses
$targetPeriod = $this->determinePeriod($period);
Log::info('Processing data for period', ['period' => $targetPeriod]);
Log::info('Processing data for period', [
'period' => $targetPeriod,
'queue_name' => $queueName
]);
if (!$disk->exists($targetPeriod)) {
$errorMessage = "Period {$targetPeriod} folder not found in SFTP storage";
Log::warning($errorMessage);
Log::warning($errorMessage, ['queue_name' => $queueName]);
return response()->json([
"message" => $errorMessage
"message" => $errorMessage,
'queue_name' => $queueName
], 404);
}
foreach (self::DATA_PROCESSES as $process) {
$this->processData($process, $targetPeriod);
$this->processData($process, $targetPeriod, $queueName);
}
$successMessage = "Data processing for period {$targetPeriod} has been queued successfully";
Log::info($successMessage);
$successMessage = "Data processing for period {$targetPeriod} has been queued successfully on queue: {$queueName}";
Log::info($successMessage, [
'period' => $targetPeriod,
'queue_name' => $queueName
]);
return response()->json([
'message' => $successMessage
'message' => $successMessage,
'queue_name' => $queueName
]);
} catch (Exception $e) {
Log::error('Error in migration index method: ' . $e->getMessage());
return response()->json(['error' => $e->getMessage()], 500);
Log::error('Error in migration index method: ' . $e->getMessage(), [
'queue_name' => $queueName,
'error' => $e->getMessage()
]);
return response()->json([
'error' => $e->getMessage(),
'queue_name' => $queueName
], 500);
}
}
@@ -196,4 +237,4 @@
return date('Ymd', strtotime('-1 day'));
}
}
}
}

88
app/Http/Controllers/WebstatementController.php
View File

@@ -1,21 +1,33 @@
<?php
namespace Modules\Webstatement\Http\Controllers;
namespace Modules\Webstatement\Http\Controllers;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use Illuminate\Contracts\Bus\Dispatcher;
use Modules\Webstatement\Jobs\ExportStatementJob;
use Modules\Webstatement\Models\AccountBalance;
use Modules\Webstatement\Jobs\ExportStatementPeriodJob;
use App\Http\Controllers\Controller;
use Carbon\Carbon;
use Illuminate\Contracts\Bus\Dispatcher;
use Illuminate\Http\Request;
use Modules\Webstatement\Jobs\ExportStatementJob;
use Modules\Webstatement\Models\AccountBalance;
use Modules\Webstatement\Jobs\ExportStatementPeriodJob;
use Illuminate\Support\Facades\Log;
class WebstatementController extends Controller
{
class WebstatementController extends Controller
{
/**
* Display a listing of the resource.
* Menjalankan export statement untuk semua akun dengan queue name yang dapat dikustomisasi
*
* @param Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function index()
public function index(Request $request)
{
$queueName = $request->get('queue_name', 'default');
Log::info('Starting statement export process', [
'queue_name' => $queueName
]);
$jobIds = [];
$data = [];
@@ -28,24 +40,34 @@
$this->getAccountBalance($accountNumber, $period),
$clientName // Pass the client name to the job
);
$jobIds[] = app(Dispatcher::class)->dispatch($job);
// Dispatch job dengan queue name yang spesifik
$jobIds[] = app(Dispatcher::class)->dispatch($job->onQueue($queueName));
$data[] = [
'client_name' => $clientName,
'account_number' => $accountNumber,
'period' => $period
'period' => $period,
'queue_name' => $queueName
];
}
}
}
Log::info('Statement export jobs queued successfully', [
'total_jobs' => count($jobIds),
'queue_name' => $queueName
]);
return response()->json([
'message' => 'Statement export jobs have been queued',
'queue_name' => $queueName,
'jobs' => array_map(function ($index, $jobId) use ($data) {
return [
'job_id' => $jobId,
'client_name' => $data[$index]['client_name'],
'account_number' => $data[$index]['account_number'],
'period' => $data[$index]['period'],
'queue_name' => $data[$index]['queue_name'],
'file_name' => "{$data[$index]['client_name']}_{$data[$index]['account_number']}_{$data[$index]['period']}.csv"
];
}, array_keys($jobIds), $jobIds)
@@ -142,8 +164,18 @@
}
function printStatementRekening($accountNumber, $period = null) {
/**
* Print statement rekening dengan queue name yang dapat dikustomisasi
*
* @param string $accountNumber
* @param string|null $period
* @param Request $request
* @return \Illuminate\Http\JsonResponse
*/
function printStatementRekening($accountNumber, $period = null, Request $request = null) {
$queueName = $request ? $request->get('queue_name', 'default') : 'default';
$period = $period ?? date('Ym');
$balance = AccountBalance::where('account_number', $accountNumber)
->when($period === '202505', function($query) {
return $query->where('period', '>=', '20250512')
@@ -159,21 +191,28 @@
$clientName = 'client1';
try {
\Log::info("Starting statement export for account: {$accountNumber}, period: {$period}, client: {$clientName}");
Log::info("Starting statement export for account: {$accountNumber}, period: {$period}, client: {$clientName}", [
'account_number' => $accountNumber,
'period' => $period,
'client_name' => $clientName,
'queue_name' => $queueName
]);
// Validate inputs
if (empty($accountNumber) || empty($period) || empty($clientName)) {
throw new \Exception('Required parameters missing');
}
// Dispatch the job
$job = ExportStatementPeriodJob::dispatch($accountNumber, $period, $balance, $clientName);
// Dispatch the job dengan queue name yang spesifik
$job = ExportStatementPeriodJob::dispatch($accountNumber, $period, $balance, $clientName)
->onQueue($queueName);
\Log::info("Statement export job dispatched successfully", [
Log::info("Statement export job dispatched successfully", [
'job_id' => $job->job_id ?? null,
'account' => $accountNumber,
'period' => $period,
'client' => $clientName
'client' => $clientName,
'queue_name' => $queueName
]);
return response()->json([
@@ -183,22 +222,25 @@
'job_id' => $job->job_id ?? null,
'account_number' => $accountNumber,
'period' => $period,
'client_name' => $clientName
'client_name' => $clientName,
'queue_name' => $queueName
]
]);
} catch (\Exception $e) {
\Log::error("Failed to export statement", [
Log::error("Failed to export statement", [
'error' => $e->getMessage(),
'account' => $accountNumber,
'period' => $period
'period' => $period,
'queue_name' => $queueName
]);
return response()->json([
'success' => false,
'message' => 'Failed to queue statement export job',
'error' => $e->getMessage()
'error' => $e->getMessage(),
'queue_name' => $queueName
]);
}
}
}
}