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

refactor(jobs): simplify jobs and controllers by replacing period array with single period parameter

Browse Source 
- Mengganti parameter `$periods` (array) menjadi `$period` (string) pada semua Job terkait: `ProcessCustomerDataJob`, `ProcessFundsTransferDataJob, etc`.
- Menyederhanakan operasi loop dalam proses data dengan hanya memproses satu periode per eksekusi Job.
- Memodifikasi fungsi controller di `MigrasiController` agar sesuai dengan perubahan parameter dari array ke string.
- Menambahkan pengamanan jika `$period` kosong atau bernilai '_parameter' untuk mencegah proses yang tidak diperlukan.
- Mengurangi duplikasi kode dengan mengeliminasi metode yang mengelola array periode dan menggantinya dengan pendekatan tunggal.

Signed-off-by: Daeng Deni Mardaeni <ddeni05@gmail.com>
This commit is contained in:
Daeng Deni Mardaeni
2025-05-24 19:40:40 +07:00
parent 85b8bfa07b
commit cd447eb019
9 changed files with 761 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
app/Jobs/ProcessFundsTransferDataJob.php
View File

@@ -16,95 +16,94 @@
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $periods;
protected $period;
/**
* Create a new job instance.
*/
public function __construct(array $periods = [])
public function __construct(string $period = '')
{
$this->periods = $periods;
$this->period = $period;
}
/**
* Execute the job.
*/
public function handle(): void
public function handle()
: void
{
try {
set_time_limit(24 * 60 * 60);
$disk = Storage::disk('sftpStatement');
$disk = Storage::disk('sftpStatement');
$processedCount = 0;
$errorCount = 0;
$errorCount = 0;
if (empty($this->periods)) {
Log::warning('No periods provided for funds transfer data processing');
if (empty($this->period)) {
Log::warning('No period provided for funds transfer data processing');
return;
}
foreach ($this->periods as $period) {
// Skip the _parameter folder
if ($period === '_parameter') {
Log::info("Skipping _parameter folder");
continue;
}
// Skip the _parameter folder
if ($this->period === '_parameter') {
Log::info("Skipping _parameter folder");
return;
}
// Construct the filename based on the period folder name
$filename = "$period.ST.FUNDS.TRANSFER.csv";
$filePath = "$period/$filename";
// Construct the filename based on the period folder name
$filename = "{$this->period}.ST.FUNDS.TRANSFER.csv";
$filePath = "{$this->period}/$filename";
Log::info("Processing funds transfer file: $filePath");
Log::info("Processing funds transfer file: $filePath");
if (!$disk->exists($filePath)) {
Log::warning("File not found: $filePath");
continue;
}
if (!$disk->exists($filePath)) {
Log::warning("File not found: $filePath");
return;
}
// Create a temporary local copy of the file
$tempFilePath = storage_path("app/temp_$filename");
file_put_contents($tempFilePath, $disk->get($filePath));
// Create a temporary local copy of the file
$tempFilePath = storage_path("app/temp_$filename");
file_put_contents($tempFilePath, $disk->get($filePath));
$handle = fopen($tempFilePath, "r");
$handle = fopen($tempFilePath, "r");
if ($handle !== false) {
$headers = (new TempFundsTransfer())->getFillable();
$rowCount = 0;
if ($handle !== false) {
$headers = (new TempFundsTransfer())->getFillable();
$rowCount = 0;
while (($row = fgetcsv($handle, 0, "~")) !== false) {
$rowCount++;
while (($row = fgetcsv($handle, 0, "~")) !== false) {
$rowCount++;
// Handle case where row has more columns than headers
if (count($row) > count($headers)) {
$row = array_slice($row, 0, count($headers));
}
if (count($headers) === count($row)) {
$data = array_combine($headers, $row);
try {
if (isset($data['_id']) && $data['_id'] !== '_id') {
TempFundsTransfer::updateOrCreate(
['_id' => $data['_id']],
$data
);
$processedCount++;
}
} catch (Exception $e) {
$errorCount++;
Log::error("Error processing Funds Transfer at row $rowCount in $filePath: " . $e->getMessage());
}
} else {
Log::warning("Row $rowCount in $filePath has incorrect column count. Expected: " . count($headers) . ", Got: " . count($row));
}
// Handle case where row has more columns than headers
if (count($row) > count($headers)) {
$row = array_slice($row, 0, count($headers));
}
fclose($handle);
Log::info("Completed processing $filePath. Processed $processedCount records with $errorCount errors.");
// Clean up the temporary file
unlink($tempFilePath);
} else {
Log::error("Unable to open file: $filePath");
if (count($headers) === count($row)) {
$data = array_combine($headers, $row);
try {
if (isset($data['_id']) && $data['_id'] !== '_id') {
TempFundsTransfer::updateOrCreate(
['_id' => $data['_id']],
$data
);
$processedCount++;
}
} catch (Exception $e) {
$errorCount++;
Log::error("Error processing Funds Transfer at row $rowCount in $filePath: " . $e->getMessage());
}
} else {
Log::warning("Row $rowCount in $filePath has incorrect column count. Expected: " . count($headers) . ", Got: " . count($row));
}
}
fclose($handle);
Log::info("Completed processing $filePath. Processed $processedCount records with $errorCount errors.");
// Clean up the temporary file
unlink($tempFilePath);
} else {
Log::error("Unable to open file: $filePath");
}
Log::info("Funds Transfer data processing completed. Total processed: $processedCount, Total errors: $errorCount");