Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

fix: nordigen transaction id should be string

Browse Source
This commit is contained in:
paulwer 2024-01-10 14:20:56 +01:00
parent d53cc4c8c6
commit 27d105d6ff
4 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php
View File

@ -110,7 +110,7 @@ class TransactionTransformer implements BankRevenueInterface
$transaction['creditorName'] : null);
return [
'transaction_id' => $transaction["transactionId"],
'nordigen_transaction_id' => $transaction["transactionId"],
'amount' => abs((int) $transaction["transactionAmount"]["amount"]),
'currency_id' => $this->convertCurrency($transaction["transactionAmount"]["currency"]),
'category_id' => null, // nordigen has no categories

3
app/Jobs/Bank/ProcessBankTransactionsNordigen.php
View File

@ -155,12 +155,13 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
foreach ($transactions as $transaction) {
if (BankTransaction::where('transaction_id', $transaction['transaction_id'])->where('company_id', $this->company->id)->where('bank_integration_id', $this->bank_integration->id)->withTrashed()->exists())
if (BankTransaction::where('nordigen_transaction_id', $transaction['nordigen_transaction_id'])->where('company_id', $this->company->id)->where('bank_integration_id', $this->bank_integration->id)->withTrashed()->exists())
continue;
//this should be much faster to insert than using ::create()
\DB::table('bank_transactions')->insert(
array_merge($transaction, [
'transaction_id' => 0,
'company_id' => $this->company->id,
'user_id' => $user_id,
'bank_integration_id' => $this->bank_integration->id,

1
app/Models/BankTransaction.php
View File

@ -23,6 +23,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int $user_id
* @property int $bank_integration_id
* @property int $transaction_id
* @property string $nordigen_transaction_id
* @property string $amount
* @property string|null $currency_code
* @property int|null $currency_id

34
database/migrations/2024_01_10_155555_add_bank_transaction_nordigen_field.php Normal file
View File

@ -0,0 +1,34 @@
<?php
use App\Models\Account;
use App\Models\BankIntegration;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
// FIX: used column transaction_id was int and resulted in wrong value in field
Schema::table('bank_transactions', function (Blueprint $table) {
$table->string('nordigen_transaction_id')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
};