refactor(jobs): simplify jobs and controllers by replacing period array with single period parameter
- 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
@@ -17,117 +17,116 @@
|
||||
{
|
||||
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 account data processing');
|
||||
if (empty($this->period)) {
|
||||
Log::warning('No period provided for account 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.ACCOUNT.csv";
|
||||
$filePath = "$period/$filename";
|
||||
// Construct the filename based on the period folder name
|
||||
$filename = "{$this->period}.ST.ACCOUNT.csv";
|
||||
$filePath = "{$this->period}/$filename";
|
||||
|
||||
Log::info("Processing account file: $filePath");
|
||||
Log::info("Processing account 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 Account())->getFillable();
|
||||
Log::info('Headers: ' . implode(", ", $headers));
|
||||
$rowCount = 0;
|
||||
if ($handle !== false) {
|
||||
$headers = (new Account())->getFillable();
|
||||
Log::info('Headers: ' . implode(", ", $headers));
|
||||
$rowCount = 0;
|
||||
|
||||
while (($row = fgetcsv($handle, 0, "~")) !== false) {
|
||||
$rowCount++;
|
||||
while (($row = fgetcsv($handle, 0, "~")) !== false) {
|
||||
$rowCount++;
|
||||
|
||||
if (count($headers) === count($row)) {
|
||||
$data = array_combine($headers, $row);
|
||||
if (count($headers) === count($row)) {
|
||||
$data = array_combine($headers, $row);
|
||||
|
||||
// Check if start_year_bal is empty and set it to 0 if so
|
||||
if (empty($data['start_year_bal']) || $data['start_year_bal'] == "" || $data['start_year_bal'] == null) {
|
||||
$data['start_year_bal'] = 0;
|
||||
}
|
||||
|
||||
if (empty($data['closure_date']) || $data['closure_date'] == "" || $data['closure_date'] == null) {
|
||||
$data['closure_date'] = null;
|
||||
}
|
||||
|
||||
try {
|
||||
if ($data['account_number'] !== 'account_number') {
|
||||
// Use firstOrNew instead of updateOrCreate
|
||||
$account = Account::firstOrNew(['account_number' => $data['account_number']]);
|
||||
$account->fill($data);
|
||||
$account->save();
|
||||
|
||||
// Store the opening balances in the AccountBalance model for this period
|
||||
if (isset($data['open_actual_bal']) || isset($data['open_cleared_bal'])) {
|
||||
$accountBalance = AccountBalance::firstOrNew([
|
||||
'account_number' => $data['account_number'],
|
||||
'period' => $period
|
||||
]);
|
||||
|
||||
// Set the balances
|
||||
$accountBalance->actual_balance = $data['open_actual_bal'] ?? 0;
|
||||
$accountBalance->cleared_balance = $data['open_cleared_bal'] ?? 0;
|
||||
|
||||
$accountBalance->save();
|
||||
Log::info("Saved balance for account {$data['account_number']} for period $period");
|
||||
}
|
||||
|
||||
$processedCount++;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
$errorCount++;
|
||||
Log::error("Error processing Account at row $rowCount in $filePath: " . $e->getMessage());
|
||||
}
|
||||
} else {
|
||||
Log::warning("Row $rowCount in $filePath has incorrect column count. Expected: " . count($headers) . ", Got: " . count($row));
|
||||
// Check if start_year_bal is empty and set it to 0 if so
|
||||
if (empty($data['start_year_bal']) || $data['start_year_bal'] == "" || $data['start_year_bal'] == null) {
|
||||
$data['start_year_bal'] = 0;
|
||||
}
|
||||
|
||||
if (empty($data['closure_date']) || $data['closure_date'] == "" || $data['closure_date'] == null) {
|
||||
$data['closure_date'] = null;
|
||||
}
|
||||
|
||||
try {
|
||||
if ($data['account_number'] !== 'account_number') {
|
||||
// Use firstOrNew instead of updateOrCreate
|
||||
$account = Account::firstOrNew(['account_number' => $data['account_number']]);
|
||||
$account->fill($data);
|
||||
$account->save();
|
||||
|
||||
// Store the opening balances in the AccountBalance model for this period
|
||||
if (isset($data['open_actual_bal']) || isset($data['open_cleared_bal'])) {
|
||||
$accountBalance = AccountBalance::firstOrNew([
|
||||
'account_number' => $data['account_number'],
|
||||
'period' => $this->period
|
||||
]);
|
||||
|
||||
// Set the balances
|
||||
$accountBalance->actual_balance = $data['open_actual_bal'] ?? 0;
|
||||
$accountBalance->cleared_balance = $data['open_cleared_bal'] ?? 0;
|
||||
|
||||
$accountBalance->save();
|
||||
Log::info("Saved balance for account {$data['account_number']} for period {$this->period}");
|
||||
}
|
||||
|
||||
$processedCount++;
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
$errorCount++;
|
||||
Log::error("Error processing Account 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");
|
||||
}
|
||||
|
||||
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("Account data processing completed. Total processed: $processedCount, Total errors: $errorCount");
|
||||
|
||||
Reference in New Issue
Block a user