diff --git a/app/Jobs/ProcessStmtEntryDataJob.php b/app/Jobs/ProcessStmtEntryDataJob.php index e76a560..3739204 100644 --- a/app/Jobs/ProcessStmtEntryDataJob.php +++ b/app/Jobs/ProcessStmtEntryDataJob.php @@ -10,6 +10,7 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; + use Modules\Webstatement\Models\StmtEntry; use Modules\Webstatement\Models\TempStmtEntry; class ProcessStmtEntryDataJob implements ShouldQueue @@ -67,22 +68,20 @@ $handle = fopen($tempFilePath, "r"); if ($handle !== false) { - $headers = (new TempStmtEntry())->getFillable(); + $headers = (new StmtEntry())->getFillable(); $rowCount = 0; - while (($row = fgetcsv($handle, 0, "/")) !== false) { + while (($row = fgetcsv($handle, 0, "~")) !== false) { $rowCount++; if (count($headers) === count($row)) { $data = array_combine($headers, $row); try { - if (isset($data['_id']) && $data['_id'] !== '_id') { - TempStmtEntry::updateOrCreate( - ['_id' => $data['_id']], - $data - ); - $processedCount++; - } + StmtEntry::updateOrCreate( + ['stmt_entry_id' => $data['stmt_entry_id']], + $data + ); + $processedCount++; } catch (Exception $e) { $errorCount++; Log::error("Error processing Statement Entry at row $rowCount in $filePath: " . $e->getMessage()); diff --git a/app/Models/StmtEntry.php b/app/Models/StmtEntry.php index 773d03f..4bb179e 100644 --- a/app/Models/StmtEntry.php +++ b/app/Models/StmtEntry.php @@ -56,4 +56,12 @@ class StmtEntry extends Model { return $this->belongsTo(Account::class, 'account_number', 'account_number'); } + + public function ft(){ + return $this->belongsTo(TempFundsTransfer::class, 'trans_reference', 'ref_no'); + } + + public function transaction(){ + return $this->belongsTo(TempTransaction::class, 'transaction_code', 'transaction_code'); + } }