Refactor models.

This commit is contained in:
James Cole
2025-09-14 09:00:01 +02:00
parent 935453796e
commit 9d9483e20f
46 changed files with 688 additions and 676 deletions

View File

@@ -23,12 +23,11 @@ declare(strict_types=1);
namespace FireflyIII\Models;
use FireflyIII\Handlers\Observer\AccountObserver;
use Carbon\Carbon;
use FireflyIII\Handlers\Observer\TransactionObserver;
use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
use Illuminate\Database\Eloquent\Attributes\ObservedBy;
use Illuminate\Database\Eloquent\Attributes\Scope;
use Carbon\Carbon;
use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -45,7 +44,7 @@ class Transaction extends Model
use SoftDeletes;
protected $fillable
= [
= [
'account_id',
'transaction_journal_id',
'description',
@@ -93,6 +92,31 @@ class Transaction extends Model
return $this->belongsTo(TransactionCurrency::class, 'foreign_currency_id');
}
/**
* @param mixed $value
*/
public function setAmountAttribute($value): void
{
$this->attributes['amount'] = (string)$value;
}
public function transactionCurrency(): BelongsTo
{
return $this->belongsTo(TransactionCurrency::class);
}
public function transactionJournal(): BelongsTo
{
return $this->belongsTo(TransactionJournal::class);
}
protected function accountId(): Attribute
{
return Attribute::make(
get: static fn($value) => (int)$value,
);
}
/**
* Check for transactions AFTER a specified date.
*/
@@ -121,6 +145,23 @@ class Transaction extends Model
return false;
}
/**
* Get the amount
*/
protected function amount(): Attribute
{
return Attribute::make(
get: static fn($value) => (string)$value,
);
}
protected function balanceDirty(): Attribute
{
return Attribute::make(
get: static fn($value) => 1 === (int)$value,
);
}
/**
* Check for transactions BEFORE the specified date.
*/
@@ -133,78 +174,6 @@ class Transaction extends Model
$query->where('transaction_journals.date', '<=', $date->format('Y-m-d 23:59:59'));
}
#[Scope]
protected function transactionTypes(Builder $query, array $types): void
{
if (!self::isJoined($query, 'transaction_journals')) {
$query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id');
}
if (!self::isJoined($query, 'transaction_types')) {
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
}
$query->whereIn('transaction_types.type', $types);
}
/**
* @param mixed $value
*/
public function setAmountAttribute($value): void
{
$this->attributes['amount'] = (string) $value;
}
public function transactionCurrency(): BelongsTo
{
return $this->belongsTo(TransactionCurrency::class);
}
public function transactionJournal(): BelongsTo
{
return $this->belongsTo(TransactionJournal::class);
}
protected function accountId(): Attribute
{
return Attribute::make(
get: static fn ($value) => (int) $value,
);
}
/**
* Get the amount
*/
protected function amount(): Attribute
{
return Attribute::make(
get: static fn ($value) => (string) $value,
);
}
protected function balanceDirty(): Attribute
{
return Attribute::make(
get: static fn ($value) => 1 === (int) $value,
);
}
/**
* Get the foreign amount
*/
protected function foreignAmount(): Attribute
{
return Attribute::make(
get: static fn ($value) => (string) $value,
);
}
protected function transactionJournalId(): Attribute
{
return Attribute::make(
get: static fn ($value) => (int) $value,
);
}
protected function casts(): array
{
return [
@@ -225,4 +194,34 @@ class Transaction extends Model
'native_foreign_amount' => 'string',
];
}
/**
* Get the foreign amount
*/
protected function foreignAmount(): Attribute
{
return Attribute::make(
get: static fn($value) => (string)$value,
);
}
protected function transactionJournalId(): Attribute
{
return Attribute::make(
get: static fn($value) => (int)$value,
);
}
#[Scope]
protected function transactionTypes(Builder $query, array $types): void
{
if (!self::isJoined($query, 'transaction_journals')) {
$query->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id');
}
if (!self::isJoined($query, 'transaction_types')) {
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
}
$query->whereIn('transaction_types.type', $types);
}
}