kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

chore: code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-05-29 13:56:55 +02:00
parent 7f7644c92f
commit 1b52147a05
295 changed files with 12418 additions and 12324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Models/Account.php
View File

@@ -153,11 +153,11 @@ class Account extends Model
}
/**
* @return BelongsTo
* @return HasMany
*/
public function user(): BelongsTo
public function accountMeta(): HasMany
{
return $this->belongsTo(User::class);
return $this->hasMany(AccountMeta::class);
}
/**
@@ -191,14 +191,6 @@ class Account extends Model
return $metaValue ? $metaValue->data : '';
}
/**
* @return HasMany
*/
public function accountMeta(): HasMany
{
return $this->hasMany(AccountMeta::class);
}
/**
* @return string
*/
@@ -282,6 +274,14 @@ class Account extends Model
return $this->hasMany(Transaction::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* Get the virtual balance
*

16
app/Models/Attachment.php
View File

@@ -124,14 +124,6 @@ class Attachment extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* Get all of the owning attachable models.
*
@@ -160,4 +152,12 @@ class Attachment extends Model
{
return $this->morphMany(Note::class, 'noteable');
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

5
app/Models/AutoBudget.php
View File

@@ -67,11 +67,10 @@ class AutoBudget extends Model
{
use SoftDeletes;
public const AUTO_BUDGET_ADJUSTED = 3;
public const AUTO_BUDGET_RESET = 1;
public const AUTO_BUDGET_ROLLOVER = 2;
public const AUTO_BUDGET_ADJUSTED = 3;
protected $fillable = ['budget_id','amount','period'];
protected $fillable = ['budget_id', 'amount', 'period'];
/**
* @return BelongsTo

8
app/Models/AvailableBudget.php
View File

@@ -113,17 +113,17 @@ class AvailableBudget extends Model
/**
* @return BelongsTo
*/
public function user(): BelongsTo
public function transactionCurrency(): BelongsTo
{
return $this->belongsTo(User::class);
return $this->belongsTo(TransactionCurrency::class);
}
/**
* @return BelongsTo
*/
public function transactionCurrency(): BelongsTo
public function user(): BelongsTo
{
return $this->belongsTo(TransactionCurrency::class);
return $this->belongsTo(User::class);
}
protected function amount(): Attribute

16
app/Models/Bill.php
View File

@@ -166,14 +166,6 @@ class Bill extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -233,6 +225,14 @@ class Bill extends Model
return $this->hasMany(TransactionJournal::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* Get the max amount
*

16
app/Models/Budget.php
View File

@@ -126,14 +126,6 @@ class Budget extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -181,4 +173,12 @@ class Budget extends Model
{
return $this->belongsToMany(Transaction::class, 'budget_transaction', 'budget_id');
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

8
app/Models/BudgetLimit.php
View File

@@ -73,22 +73,20 @@ class BudgetLimit extends Model
* @var array
*/
protected $casts
= [
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'start_date' => 'date',
'end_date' => 'date',
'auto_budget' => 'boolean',
];
/** @var array Fields that can be filled */
protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
protected $dispatchesEvents = [
'created' => Created::class,
'updated' => Updated::class,
'deleted' => Deleted::class,
];
/** @var array Fields that can be filled */
protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).

16
app/Models/Category.php
View File

@@ -116,14 +116,6 @@ class Category extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -155,4 +147,12 @@ class Category extends Model
{
return $this->belongsToMany(Transaction::class, 'category_transaction', 'category_id');
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/InvitedUser.php
View File

@@ -66,14 +66,6 @@ class InvitedUser extends Model
];
protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed'];
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
*
@@ -94,4 +86,12 @@ class InvitedUser extends Model
}
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/ObjectGroup.php
View File

@@ -101,14 +101,6 @@ class ObjectGroup extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphToMany
*/
@@ -132,4 +124,12 @@ class ObjectGroup extends Model
{
return $this->morphedByMany(PiggyBank::class, 'object_groupable');
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/Recurrence.php
View File

@@ -142,14 +142,6 @@ class Recurrence extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -205,4 +197,12 @@ class Recurrence extends Model
{
return $this->belongsTo(TransactionType::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/Rule.php
View File

@@ -124,14 +124,6 @@ class Rule extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return HasMany
*/
@@ -165,4 +157,12 @@ class Rule extends Model
{
$this->attributes['description'] = e($value);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/RuleGroup.php
View File

@@ -115,14 +115,6 @@ class RuleGroup extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return HasMany
*/
@@ -130,4 +122,12 @@ class RuleGroup extends Model
{
return $this->hasMany(Rule::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

16
app/Models/Tag.php
View File

@@ -126,14 +126,6 @@ class Tag extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -157,4 +149,12 @@ class Tag extends Model
{
return $this->belongsToMany(TransactionJournal::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

46
app/Models/Transaction.php
View File

@@ -123,6 +123,29 @@ class Transaction extends Model
/** @var array Hidden from view */
protected $hidden = ['encrypted'];
/**
* Check if a table is joined.
*
* @param Builder $query
* @param string $table
*
* @return bool
*/
public static function isJoined(Builder $query, string $table): bool
{
$joins = $query->getQuery()->joins;
if (null === $joins) {
return false;
}
foreach ($joins as $join) {
if ($join->table === $table) {
return true;
}
}
return false;
}
/**
* Get the account this object belongs to.
*
@@ -178,29 +201,6 @@ class Transaction extends Model
$query->where('transaction_journals.date', '>=', $date->format('Y-m-d 00:00:00'));
}
/**
* Check if a table is joined.
*
* @param Builder $query
* @param string $table
*
* @return bool
*/
public static function isJoined(Builder $query, string $table): bool
{
$joins = $query->getQuery()->joins;
if (null === $joins) {
return false;
}
foreach ($joins as $join) {
if ($join->table === $table) {
return true;
}
}
return false;
}
/**
* Check for transactions BEFORE the specified date.
*

16
app/Models/TransactionGroup.php
View File

@@ -115,14 +115,6 @@ class TransactionGroup extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return HasMany
*/
@@ -130,4 +122,12 @@ class TransactionGroup extends Model
{
return $this->hasMany(TransactionJournal::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

64
app/Models/TransactionJournal.php
View File

@@ -160,6 +160,30 @@ class TransactionJournal extends Model
/** @var array Hidden from view */
protected $hidden = ['encrypted'];
/**
* Checks if tables are joined.
*
*
* @param Builder $query
* @param string $table
*
* @return bool
*/
public static function isJoined(Builder $query, string $table): bool
{
$joins = $query->getQuery()->joins;
if (null === $joins) {
return false;
}
foreach ($joins as $join) {
if ($join->table === $table) {
return true;
}
}
return false;
}
/**
* Route binder. Converts the key in the URL to the specified object (or throw 404).
*
@@ -184,14 +208,6 @@ class TransactionJournal extends Model
throw new NotFoundHttpException();
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
/**
* @return MorphMany
*/
@@ -307,30 +323,6 @@ class TransactionJournal extends Model
}
}
/**
* Checks if tables are joined.
*
*
* @param Builder $query
* @param string $table
*
* @return bool
*/
public static function isJoined(Builder $query, string $table): bool
{
$joins = $query->getQuery()->joins;
if (null === $joins) {
return false;
}
foreach ($joins as $join) {
if ($join->table === $table) {
return true;
}
}
return false;
}
/**
* @return HasMany
*/
@@ -386,4 +378,12 @@ class TransactionJournal extends Model
{
return $this->hasMany(Transaction::class);
}
/**
* @return BelongsTo
*/
public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}
}

26
app/Models/UserGroup.php
View File

@@ -49,26 +49,17 @@ use Illuminate\Support\Carbon;
* @method static Builder|UserGroup whereId($value)
* @method static Builder|UserGroup whereTitle($value)
* @method static Builder|UserGroup whereUpdatedAt($value)
* @property-read Collection<int, \FireflyIII\Models\Account> $accounts
* @property-read Collection<int, Account> $accounts
* @property-read int|null $accounts_count
* @property-read Collection<int, \FireflyIII\Models\Account> $accounts
* @property-read Collection<int, \FireflyIII\Models\Account> $accounts
* @property-read Collection<int, \FireflyIII\Models\Account> $accounts
* @property-read Collection<int, Account> $accounts
* @property-read Collection<int, Account> $accounts
* @property-read Collection<int, Account> $accounts
* @mixin Eloquent
*/
class UserGroup extends Model
{
protected $fillable = ['title'];
/**
*
* @return HasMany
*/
public function groupMemberships(): HasMany
{
return $this->hasMany(GroupMembership::class);
}
/**
* Link to accounts.
*
@@ -78,4 +69,13 @@ class UserGroup extends Model
{
return $this->hasMany(Account::class);
}
/**
*
* @return HasMany
*/
public function groupMemberships(): HasMany
{
return $this->hasMany(GroupMembership::class);
}
}