From 336ef8cf3a19cf356bd945f80f1d45236abd023f Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 4 Jun 2025 18:55:29 +0700 Subject: [PATCH] feat(webstatement): perbarui logika pemrosesan combine PDF dan parameter periode - Memperbarui fungsi `combinePdfs` di `CombinePdfController`: - Menghapus penggunaan parameter dari request dan mengganti dengan parameter langsung `$period`. - Menambahkan filter `branch_code` `ID0010001` pada pemanggilan data akun untuk memastikan hanya akun tertentu yang diproses. - Mengubah jalur pencarian file PDF ke direktori baru: `app/STMT/r14` dan `app/STMT/r23` untuk menyelaraskan struktur penyimpanan file. - Memperbarui command `webstatement:combine-pdf`: - Menambahkan opsi baru `--period` untuk menyederhanakan pengaturan periode penggabungan PDF melalui format `Ym` (contoh: 202506). - Menghapus penggunaan `request()` pada command untuk memaksimalkan pengelolaan periode langsung dari opsi command-line. - Tujuan pembaruan ini: - Memastikan proses combine PDF hanya memproses data relevan berdasarkan filter branch dan struktur direktori baru. - Menyempurnakan fleksibilitas parameter periode pada command-line untuk mengurangi dependensi terhadap input request. - Meningkatkan konsistensi dan efisiensi dalam pengelolaan file PDF sesuai periode dan filter branch tertentu. Signed-off-by: Daeng Deni Mardaeni --- app/Console/CombinePdf.php | 5 +++-- app/Http/Controllers/CombinePdfController.php | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Console/CombinePdf.php b/app/Console/CombinePdf.php index 97719d4..d5dc007 100644 --- a/app/Console/CombinePdf.php +++ b/app/Console/CombinePdf.php @@ -13,7 +13,7 @@ * * @var string */ - protected $signature = 'webstatement:combine-pdf'; + protected $signature = 'webstatement:combine-pdf {--period= : Period to process migration format Ym contoh. 202506}'; /** * The console command description. @@ -30,7 +30,8 @@ public function handle() { $this->info('Starting combine pdf process...'); - $period = request()->set(['period' => $this->argument('period')]); + $period = $this->option('period'); + try { $controller = app(CombinePdfController::class); $response = $controller->combinePdfs($period); diff --git a/app/Http/Controllers/CombinePdfController.php b/app/Http/Controllers/CombinePdfController.php index 4998c61..f05eebe 100644 --- a/app/Http/Controllers/CombinePdfController.php +++ b/app/Http/Controllers/CombinePdfController.php @@ -25,13 +25,13 @@ class CombinePdfController extends Controller * @param Request $request * @return \Illuminate\Http\JsonResponse */ - public function combinePdfs(Request $request) + public function combinePdfs($period) { // Get period from request or use current period - $period = $request->input('period', date('Ym')); + $period = $period ?? date('Ym'); // Get all accounts - $accounts = Account::all(); + $accounts = Account::where('branch_code','ID0010001')->get(); $processedCount = 0; $skippedCount = 0; $errorCount = 0; @@ -41,8 +41,8 @@ class CombinePdfController extends Controller $accountNumber = $account->account_number; // Define file paths - $r14Path = storage_path("app/r14/{$period}/{$branchCode}/{$accountNumber}_{$period}.pdf"); - $r23Path = storage_path("app/r23/{$period}/{$branchCode}/{$accountNumber}_{$period}.pdf"); + $r14Path = storage_path("app/STMT/r14/{$period}/{$branchCode}/{$accountNumber}_{$period}.pdf"); + $r23Path = storage_path("app/STMT/r23/{$period}/{$branchCode}/{$accountNumber}_{$period}.pdf"); $outputDir = storage_path("app/combine/{$period}/{$branchCode}"); $outputFilename = "{$accountNumber}_{$period}.pdf";